Kernel/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2024-12-29 17:23:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

gro: decrease size of CB

Browse Source 
The GRO control block (NAPI_GRO_CB) is currently at its maximum size.
This commit reduces its size by putting two groups of fields that are
used only at different times into a union.

Specifically, the fields frag0 and frag0_len are the fields that make up
the frag0 optimisation mechanism, which is used during the initial
parsing of the SKB.

The fields last and age are used after the initial parsing, while the
SKB is stored in the GRO list, waiting for other packets to arrive.

There was one location in dev_gro_receive that modified the frag0 fields
after setting last and age. I changed this accordingly without altering
the code behaviour.

Signed-off-by: Richard Gobert <richardbgobert@gmail.com>
Reviewed-by: Eric Dumazet <edumazet@google.com>
Link: https://lore.kernel.org/r/20230601161407.GA9253@debian
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
This commit is contained in:
Richard Gobert 2023-06-01 18:14:09 +02:00 committed by Paolo Abeni
parent ddb8701dcb
commit 7b355b76e2
2 changed files with 28 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
include/net/gro.h
View File

@ -11,11 +11,23 @@
#include <net/udp.h> #include <net/udp.h>
struct napi_gro_cb { struct napi_gro_cb {
/* Virtual address of skb_shinfo(skb)->frags[0].page + offset. */ union {
void *frag0; struct {
/* Virtual address of skb_shinfo(skb)->frags[0].page + offset. */
void *frag0;
/* Length of frag0. */ /* Length of frag0. */
unsigned int frag0_len; unsigned int frag0_len;
};
struct {
/* used in skb_gro_receive() slow path */
struct sk_buff *last;
/* jiffies when first packet was created/queued */
unsigned long age;
};
};
/* This indicates where we are processing relative to skb->data. */ /* This indicates where we are processing relative to skb->data. */
int data_offset; int data_offset;
@ -32,9 +44,6 @@ struct napi_gro_cb {
/* Used in ipv6_gro_receive() and foo-over-udp */ /* Used in ipv6_gro_receive() and foo-over-udp */
u16 proto; u16 proto;
/* jiffies when first packet was created/queued */
unsigned long age;
/* Used in napi_gro_cb::free */ /* Used in napi_gro_cb::free */
#define NAPI_GRO_FREE 1 #define NAPI_GRO_FREE 1
#define NAPI_GRO_FREE_STOLEN_HEAD 2 #define NAPI_GRO_FREE_STOLEN_HEAD 2
@ -77,9 +86,6 @@ struct napi_gro_cb {
/* used to support CHECKSUM_COMPLETE for tunneling protocols */ /* used to support CHECKSUM_COMPLETE for tunneling protocols */
__wsum csum; __wsum csum;
/* used in skb_gro_receive() slow path */
struct sk_buff *last;
}; };
#define NAPI_GRO_CB(skb) ((struct napi_gro_cb *)(skb)->cb) #define NAPI_GRO_CB(skb) ((struct napi_gro_cb *)(skb)->cb)

19
net/core/gro.c
View File

@ -458,6 +458,14 @@ static void gro_pull_from_frag0(struct sk_buff *skb, int grow)
} }
} }
static void gro_try_pull_from_frag0(struct sk_buff *skb)
{
int grow = skb_gro_offset(skb) - skb_headlen(skb);
if (grow > 0)
gro_pull_from_frag0(skb, grow);
}
static void gro_flush_oldest(struct napi_struct *napi, struct list_head *head) static void gro_flush_oldest(struct napi_struct *napi, struct list_head *head)
{ {
struct sk_buff *oldest; struct sk_buff *oldest;
@ -487,7 +495,6 @@ static enum gro_result dev_gro_receive(struct napi_struct *napi, struct sk_buff
struct sk_buff *pp = NULL; struct sk_buff *pp = NULL;
enum gro_result ret; enum gro_result ret;
int same_flow; int same_flow;
int grow;
if (netif_elide_gro(skb->dev)) if (netif_elide_gro(skb->dev))
goto normal; goto normal;
@ -562,17 +569,14 @@ static enum gro_result dev_gro_receive(struct napi_struct *napi, struct sk_buff
else else
gro_list->count++; gro_list->count++;
/* Must be called before setting NAPI_GRO_CB(skb)->{age|last} */
gro_try_pull_from_frag0(skb);
NAPI_GRO_CB(skb)->age = jiffies; NAPI_GRO_CB(skb)->age = jiffies;
NAPI_GRO_CB(skb)->last = skb; NAPI_GRO_CB(skb)->last = skb;
if (!skb_is_gso(skb)) if (!skb_is_gso(skb))
skb_shinfo(skb)->gso_size = skb_gro_len(skb); skb_shinfo(skb)->gso_size = skb_gro_len(skb);
list_add(&skb->list, &gro_list->list); list_add(&skb->list, &gro_list->list);
ret = GRO_HELD; ret = GRO_HELD;
pull:
grow = skb_gro_offset(skb) - skb_headlen(skb);
if (grow > 0)
gro_pull_from_frag0(skb, grow);
ok: ok:
if (gro_list->count) { if (gro_list->count) {
if (!test_bit(bucket, &napi->gro_bitmask)) if (!test_bit(bucket, &napi->gro_bitmask))
@ -585,7 +589,8 @@ static enum gro_result dev_gro_receive(struct napi_struct *napi, struct sk_buff
normal: normal:
ret = GRO_NORMAL; ret = GRO_NORMAL;
goto pull; gro_try_pull_from_frag0(skb);
goto ok;
} }
struct packet_offload *gro_find_receive_by_type(__be16 type) struct packet_offload *gro_find_receive_by_type(__be16 type)