Skip to content

Commit

Permalink
Added patch from PR #5 and removed unnecessary initializations
Browse files Browse the repository at this point in the history
  • Loading branch information
@const-t
const-t committed Dec 30, 2022
1 parent 03f1d4f commit 279b397
Show file tree
Hide file tree
Showing 2 changed files with 39 additions and 34 deletions.
4 changes: 2 additions & 2 deletions fw/ss_skb.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -287,9 +287,9 @@ static int
__new_pgfrag(struct sk_buff *skb_head, struct sk_buff *skb, int size,
int i, int shift)
{
int off = 0;
int off;
void* addr;
struct page *page = NULL;
struct page *page;

BUG_ON(i > MAX_SKB_FRAGS);

Expand Down
69 changes: 37 additions & 32 deletions linux-5.10.35.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1279,7 +1279,7 @@ index f35c2e998..6ec40ac3c 100644
}
+EXPORT_SYMBOL(reqsk_fastopen_remove);
diff --git a/net/core/skbuff.c b/net/core/skbuff.c
index 1301ea694..9252fa7f0 100644
index 1301ea694..b36b9bde9 100644
--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
@@ -80,7 +80,9 @@
Expand All @@ -1300,18 +1300,18 @@ index 1301ea694..9252fa7f0 100644
/*
* kmalloc_reserve is a wrapper around kmalloc_node_track_caller that tells
* the caller if emergency pfmemalloc reserves are being used. If it is and
@@ -155,6 +158,219 @@ static void *__kmalloc_reserve(size_t size, gfp_t flags, int node,
@@ -155,6 +158,224 @@ static void *__kmalloc_reserve(size_t size, gfp_t flags, int node,

return obj;
}
+#else
+/*
+ * Chunks of size 512B, 1KB and 2KB.
+ * Chunks of size 128B, 256B, 512B, 1KB and 2KB.
+ * Typical sk_buff requires ~272B or ~552B (for fclone),
+ * skb_shared_info is ~320B.
+ */
+#define PG_LISTS_N 3
+#define PG_CHUNK_BITS (PAGE_SHIFT - 3)
+#define PG_LISTS_N 5
+#define PG_CHUNK_BITS (PAGE_SHIFT - 5)
+#define PG_CHUNK_SZ (1 << PG_CHUNK_BITS)
+#define PG_CHUNK_MASK (~(PG_CHUNK_SZ - 1))
+#define PG_ALLOC_SZ(s) (((s) + (PG_CHUNK_SZ - 1)) & PG_CHUNK_MASK)
Expand Down Expand Up @@ -1406,8 +1406,13 @@ index 1301ea694..9252fa7f0 100644
+
+ pools = this_cpu_ptr(pg_mpool);
+
+ for (o = (cn == 1) ? 0 : (cn == 2) ? 1 : (cn <= 4) ? 2 : PG_LISTS_N;
+ o < PG_LISTS_N; ++o)
+ o = (cn == 1) ? 0
+ : (cn == 2) ? 1
+ : (cn <= 4) ? 2
+ : (cn <= 8) ? 3
+ : (cn <= 16) ? 4 : PG_LISTS_N;
+
+ for (; o < PG_LISTS_N; ++o)
+ {
+ struct list_head *pc;
+ if (!__pg_pool_grow(&pools[o]))
Expand Down Expand Up @@ -1520,7 +1525,7 @@ index 1301ea694..9252fa7f0 100644

/* Allocate a new skbuff. We do this ourselves so we can fill in a few
* 'private' fields and also do memory statistics to find all the
@@ -179,11 +395,11 @@ static void *__kmalloc_reserve(size_t size, gfp_t flags, int node,
@@ -179,11 +400,11 @@ static void *__kmalloc_reserve(size_t size, gfp_t flags, int node,
* Buffers may only be allocated from interrupts using a @gfp_mask of
* %GFP_ATOMIC.
*/
Expand All @@ -1533,7 +1538,7 @@ index 1301ea694..9252fa7f0 100644
struct sk_buff *skb;
u8 *data;
bool pfmemalloc;
@@ -217,38 +433,7 @@ struct sk_buff *__alloc_skb(unsigned int size, gfp_t gfp_mask,
@@ -217,38 +438,7 @@ struct sk_buff *__alloc_skb(unsigned int size, gfp_t gfp_mask,
size = SKB_WITH_OVERHEAD(ksize(data));
prefetchw(data + size);

Expand Down Expand Up @@ -1573,7 +1578,7 @@ index 1301ea694..9252fa7f0 100644
out:
return skb;
nodata:
@@ -256,6 +441,63 @@ struct sk_buff *__alloc_skb(unsigned int size, gfp_t gfp_mask,
@@ -256,6 +446,63 @@ struct sk_buff *__alloc_skb(unsigned int size, gfp_t gfp_mask,
skb = NULL;
goto out;
}
Expand Down Expand Up @@ -1637,7 +1642,7 @@ index 1301ea694..9252fa7f0 100644
EXPORT_SYMBOL(__alloc_skb);

/* Caller must provide SKB that is memset cleared */
@@ -282,6 +524,10 @@ static struct sk_buff *__build_skb_around(struct sk_buff *skb,
@@ -282,6 +529,10 @@ static struct sk_buff *__build_skb_around(struct sk_buff *skb,
memset(shinfo, 0, offsetof(struct skb_shared_info, dataref));
atomic_set(&shinfo->dataref, 1);

Expand All @@ -1648,7 +1653,7 @@ index 1301ea694..9252fa7f0 100644
return skb;
}

@@ -628,7 +874,13 @@ static void kfree_skbmem(struct sk_buff *skb)
@@ -628,7 +879,13 @@ static void kfree_skbmem(struct sk_buff *skb)

switch (skb->fclone) {
case SKB_FCLONE_UNAVAILABLE:
Expand All @@ -1663,7 +1668,7 @@ index 1301ea694..9252fa7f0 100644
return;

case SKB_FCLONE_ORIG:
@@ -649,7 +901,13 @@ static void kfree_skbmem(struct sk_buff *skb)
@@ -649,7 +906,13 @@ static void kfree_skbmem(struct sk_buff *skb)
if (!refcount_dec_and_test(&fclones->fclone_ref))
return;
fastpath:
Expand All @@ -1677,7 +1682,7 @@ index 1301ea694..9252fa7f0 100644
}

void skb_release_head_state(struct sk_buff *skb)
@@ -867,6 +1125,9 @@ void __kfree_skb_flush(void)
@@ -867,6 +1130,9 @@ void __kfree_skb_flush(void)
if (nc->skb_count) {
kmem_cache_free_bulk(skbuff_head_cache, nc->skb_count,
nc->skb_cache);
Expand All @@ -1687,7 +1692,7 @@ index 1301ea694..9252fa7f0 100644
nc->skb_count = 0;
}
}
@@ -878,6 +1139,18 @@ static inline void _kfree_skb_defer(struct sk_buff *skb)
@@ -878,6 +1144,18 @@ static inline void _kfree_skb_defer(struct sk_buff *skb)
/* drop skb->head and call any destructors for packet */
skb_release_all(skb);

Expand All @@ -1706,7 +1711,7 @@ index 1301ea694..9252fa7f0 100644
/* record skb to CPU local list */
nc->skb_cache[nc->skb_count++] = skb;

@@ -891,6 +1164,9 @@ static inline void _kfree_skb_defer(struct sk_buff *skb)
@@ -891,6 +1169,9 @@ static inline void _kfree_skb_defer(struct sk_buff *skb)
kmem_cache_free_bulk(skbuff_head_cache, NAPI_SKB_CACHE_SIZE,
nc->skb_cache);
nc->skb_count = 0;
Expand All @@ -1716,7 +1721,7 @@ index 1301ea694..9252fa7f0 100644
}
}
void __kfree_skb_defer(struct sk_buff *skb)
@@ -1444,6 +1720,10 @@ struct sk_buff *skb_clone(struct sk_buff *skb, gfp_t gfp_mask)
@@ -1444,6 +1725,10 @@ struct sk_buff *skb_clone(struct sk_buff *skb, gfp_t gfp_mask)
refcount_read(&fclones->fclone_ref) == 1) {
n = &fclones->skb2;
refcount_set(&fclones->fclone_ref, 2);
Expand All @@ -1727,7 +1732,7 @@ index 1301ea694..9252fa7f0 100644
} else {
if (skb_pfmemalloc(skb))
gfp_mask |= __GFP_MEMALLOC;
@@ -1453,6 +1733,10 @@ struct sk_buff *skb_clone(struct sk_buff *skb, gfp_t gfp_mask)
@@ -1453,6 +1738,10 @@ struct sk_buff *skb_clone(struct sk_buff *skb, gfp_t gfp_mask)
return NULL;

n->fclone = SKB_FCLONE_UNAVAILABLE;
Expand All @@ -1738,7 +1743,7 @@ index 1301ea694..9252fa7f0 100644
}

return __skb_clone(n, skb);
@@ -1624,15 +1908,22 @@ int pskb_expand_head(struct sk_buff *skb, int nhead, int ntail,
@@ -1624,15 +1913,22 @@ int pskb_expand_head(struct sk_buff *skb, int nhead, int ntail,

BUG_ON(skb_shared(skb));

Expand All @@ -1764,7 +1769,7 @@ index 1301ea694..9252fa7f0 100644

/* Copy only real data... and, alas, header. This should be
* optimized for the cases when header is void.
@@ -1666,7 +1957,12 @@ int pskb_expand_head(struct sk_buff *skb, int nhead, int ntail,
@@ -1666,7 +1962,12 @@ int pskb_expand_head(struct sk_buff *skb, int nhead, int ntail,
off = (data + nhead) - skb->head;

skb->head = data;
Expand All @@ -1777,7 +1782,7 @@ index 1301ea694..9252fa7f0 100644
skb->data += off;
#ifdef NET_SKBUFF_DATA_USES_OFFSET
skb->end = size;
@@ -1693,7 +1989,11 @@ int pskb_expand_head(struct sk_buff *skb, int nhead, int ntail,
@@ -1693,7 +1994,11 @@ int pskb_expand_head(struct sk_buff *skb, int nhead, int ntail,
return 0;

nofrags:
Expand All @@ -1789,7 +1794,7 @@ index 1301ea694..9252fa7f0 100644
nodata:
return -ENOMEM;
}
@@ -1803,7 +2103,11 @@ int __skb_pad(struct sk_buff *skb, int pad, bool free_on_error)
@@ -1803,7 +2108,11 @@ int __skb_pad(struct sk_buff *skb, int pad, bool free_on_error)
return 0;
}

Expand All @@ -1801,7 +1806,7 @@ index 1301ea694..9252fa7f0 100644
if (likely(skb_cloned(skb) || ntail > 0)) {
err = pskb_expand_head(skb, 0, ntail, GFP_ATOMIC);
if (unlikely(err))
@@ -2062,7 +2366,13 @@ void *__pskb_pull_tail(struct sk_buff *skb, int delta)
@@ -2062,7 +2371,13 @@ void *__pskb_pull_tail(struct sk_buff *skb, int delta)
* plus 128 bytes for future expansions. If we have enough
* room at tail, reallocate without expansion only if skb is cloned.
*/
Expand All @@ -1816,7 +1821,7 @@ index 1301ea694..9252fa7f0 100644

if (eat > 0 || skb_cloned(skb)) {
if (pskb_expand_head(skb, 0, eat > 0 ? eat + 128 : 0,
@@ -4285,6 +4595,25 @@ static void skb_extensions_init(void) {}
@@ -4285,6 +4600,25 @@ static void skb_extensions_init(void) {}

void __init skb_init(void)
{
Expand All @@ -1842,7 +1847,7 @@ index 1301ea694..9252fa7f0 100644
skbuff_head_cache = kmem_cache_create_usercopy("skbuff_head_cache",
sizeof(struct sk_buff),
0,
@@ -4292,11 +4621,6 @@ void __init skb_init(void)
@@ -4292,11 +4626,6 @@ void __init skb_init(void)
offsetof(struct sk_buff, cb),
sizeof_field(struct sk_buff, cb),
NULL);
Expand All @@ -1854,7 +1859,7 @@ index 1301ea694..9252fa7f0 100644
skb_extensions_init();
}

@@ -5151,7 +5475,15 @@ void kfree_skb_partial(struct sk_buff *skb, bool head_stolen)
@@ -5151,7 +5480,15 @@ void kfree_skb_partial(struct sk_buff *skb, bool head_stolen)
{
if (head_stolen) {
skb_release_head_state(skb);
Expand All @@ -1870,7 +1875,7 @@ index 1301ea694..9252fa7f0 100644
} else {
__kfree_skb(skb);
}
@@ -5931,13 +6263,20 @@ static int pskb_carve_inside_header(struct sk_buff *skb, const u32 off,
@@ -5931,13 +6268,20 @@ static int pskb_carve_inside_header(struct sk_buff *skb, const u32 off,

if (skb_pfmemalloc(skb))
gfp_mask |= __GFP_MEMALLOC;
Expand All @@ -1892,7 +1897,7 @@ index 1301ea694..9252fa7f0 100644

/* Copy real data, and all frags */
skb_copy_from_linear_data_offset(skb, off, data, new_hlen);
@@ -5950,7 +6289,11 @@ static int pskb_carve_inside_header(struct sk_buff *skb, const u32 off,
@@ -5950,7 +6294,11 @@ static int pskb_carve_inside_header(struct sk_buff *skb, const u32 off,
if (skb_cloned(skb)) {
/* drop the old head gracefully */
if (skb_orphan_frags(skb, gfp_mask)) {
Expand All @@ -1904,7 +1909,7 @@ index 1301ea694..9252fa7f0 100644
return -ENOMEM;
}
for (i = 0; i < skb_shinfo(skb)->nr_frags; i++)
@@ -5967,7 +6310,11 @@ static int pskb_carve_inside_header(struct sk_buff *skb, const u32 off,
@@ -5967,7 +6315,11 @@ static int pskb_carve_inside_header(struct sk_buff *skb, const u32 off,

skb->head = data;
skb->data = data;
Expand All @@ -1916,7 +1921,7 @@ index 1301ea694..9252fa7f0 100644
#ifdef NET_SKBUFF_DATA_USES_OFFSET
skb->end = size;
#else
@@ -6055,6 +6402,13 @@ static int pskb_carve_inside_nonlinear(struct sk_buff *skb, const u32 off,
@@ -6055,6 +6407,13 @@ static int pskb_carve_inside_nonlinear(struct sk_buff *skb, const u32 off,

if (skb_pfmemalloc(skb))
gfp_mask |= __GFP_MEMALLOC;
Expand All @@ -1930,7 +1935,7 @@ index 1301ea694..9252fa7f0 100644
data = kmalloc_reserve(size +
SKB_DATA_ALIGN(sizeof(struct skb_shared_info)),
gfp_mask, NUMA_NO_NODE, NULL);
@@ -6062,11 +6416,16 @@ static int pskb_carve_inside_nonlinear(struct sk_buff *skb, const u32 off,
@@ -6062,11 +6421,16 @@ static int pskb_carve_inside_nonlinear(struct sk_buff *skb, const u32 off,
return -ENOMEM;

size = SKB_WITH_OVERHEAD(ksize(data));
Expand All @@ -1947,7 +1952,7 @@ index 1301ea694..9252fa7f0 100644
return -ENOMEM;
}
shinfo = (struct skb_shared_info *)(data + size);
@@ -6108,8 +6467,12 @@ static int pskb_carve_inside_nonlinear(struct sk_buff *skb, const u32 off,
@@ -6108,8 +6472,12 @@ static int pskb_carve_inside_nonlinear(struct sk_buff *skb, const u32 off,
skb_release_data(skb);

skb->head = data;
Expand Down

0 comments on commit 279b397

Please sign in to comment.