Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 125943
b: refs/heads/master
c: 5d38a07
h: refs/heads/master
i:
  125941: b2a172d
  125939: 2e26700
  125935: d8678d9
v: v3
  • Loading branch information
Herbert Xu authored and David S. Miller committed Jan 5, 2009
1 parent 80c1d67 commit 5db63a6
Show file tree
Hide file tree
Showing 4 changed files with 115 additions and 8 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: b530256d2e0f1a75fab31f9821129fff1bb49faa
refs/heads/master: 5d38a079ce3971f932bbdc0dc5b887806fabd5dc
16 changes: 15 additions & 1 deletion trunk/include/linux/netdevice.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -313,10 +313,11 @@ struct napi_struct {
#ifdef CONFIG_NETPOLL
spinlock_t poll_lock;
int poll_owner;
struct net_device *dev;
#endif
struct net_device *dev;
struct list_head dev_list;
struct sk_buff *gro_list;
struct sk_buff *skb;
};

enum
Expand Down Expand Up @@ -990,6 +991,9 @@ struct napi_gro_cb {

/* Number of segments aggregated. */
int count;

/* Free the skb? */
int free;
};

#define NAPI_GRO_CB(skb) ((struct napi_gro_cb *)(skb)->cb)
Expand All @@ -1011,6 +1015,14 @@ struct packet_type {
struct list_head list;
};

struct napi_gro_fraginfo {
skb_frag_t frags[MAX_SKB_FRAGS];
unsigned int nr_frags;
unsigned int ip_summed;
unsigned int len;
__wsum csum;
};

#include <linux/interrupt.h>
#include <linux/notifier.h>

Expand Down Expand Up @@ -1363,6 +1375,8 @@ extern int netif_receive_skb(struct sk_buff *skb);
extern void napi_gro_flush(struct napi_struct *napi);
extern int napi_gro_receive(struct napi_struct *napi,
struct sk_buff *skb);
extern int napi_gro_frags(struct napi_struct *napi,
struct napi_gro_fraginfo *info);
extern void netif_nit_deliver(struct sk_buff *skb);
extern int dev_valid_name(const char *name);
extern int dev_ioctl(struct net *net, unsigned int cmd, void __user *);
Expand Down
91 changes: 86 additions & 5 deletions trunk/net/core/dev.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,9 @@
/* Instead of increasing this, you should create a hash table. */
#define MAX_GRO_SKBS 8

/* This should be increased if a protocol with a bigger head is added. */
#define GRO_MAX_HEAD (MAX_HEADER + 128)

/*
* The list of packet types we will receive (as opposed to discard)
* and the routines to invoke.
Expand Down Expand Up @@ -2345,7 +2348,7 @@ static int napi_gro_complete(struct sk_buff *skb)
struct list_head *head = &ptype_base[ntohs(type) & PTYPE_HASH_MASK];
int err = -ENOENT;

if (!skb_shinfo(skb)->frag_list)
if (NAPI_GRO_CB(skb)->count == 1)
goto out;

rcu_read_lock();
Expand Down Expand Up @@ -2384,7 +2387,7 @@ void napi_gro_flush(struct napi_struct *napi)
}
EXPORT_SYMBOL(napi_gro_flush);

int napi_gro_receive(struct napi_struct *napi, struct sk_buff *skb)
static int __napi_gro_receive(struct napi_struct *napi, struct sk_buff *skb)
{
struct sk_buff **pp = NULL;
struct packet_type *ptype;
Expand All @@ -2393,6 +2396,7 @@ int napi_gro_receive(struct napi_struct *napi, struct sk_buff *skb)
int count = 0;
int same_flow;
int mac_len;
int free;

if (!(skb->dev->features & NETIF_F_GRO))
goto normal;
Expand All @@ -2409,6 +2413,7 @@ int napi_gro_receive(struct napi_struct *napi, struct sk_buff *skb)
skb->mac_len = mac_len;
NAPI_GRO_CB(skb)->same_flow = 0;
NAPI_GRO_CB(skb)->flush = 0;
NAPI_GRO_CB(skb)->free = 0;

for (p = napi->gro_list; p; p = p->next) {
count++;
Expand All @@ -2428,6 +2433,7 @@ int napi_gro_receive(struct napi_struct *napi, struct sk_buff *skb)
goto normal;

same_flow = NAPI_GRO_CB(skb)->same_flow;
free = NAPI_GRO_CB(skb)->free;

if (pp) {
struct sk_buff *nskb = *pp;
Expand All @@ -2452,13 +2458,86 @@ int napi_gro_receive(struct napi_struct *napi, struct sk_buff *skb)
napi->gro_list = skb;

ok:
return NET_RX_SUCCESS;
return free;

normal:
return netif_receive_skb(skb);
return -1;
}

int napi_gro_receive(struct napi_struct *napi, struct sk_buff *skb)
{
switch (__napi_gro_receive(napi, skb)) {
case -1:
return netif_receive_skb(skb);

case 1:
kfree_skb(skb);
break;
}

return NET_RX_SUCCESS;
}
EXPORT_SYMBOL(napi_gro_receive);

int napi_gro_frags(struct napi_struct *napi, struct napi_gro_fraginfo *info)
{
struct net_device *dev = napi->dev;
struct sk_buff *skb = napi->skb;
int err = NET_RX_DROP;

napi->skb = NULL;

if (!skb) {
skb = netdev_alloc_skb(dev, GRO_MAX_HEAD + NET_IP_ALIGN);
if (!skb)
goto out;

skb_reserve(skb, NET_IP_ALIGN);
}

BUG_ON(info->nr_frags > MAX_SKB_FRAGS);
skb_shinfo(skb)->nr_frags = info->nr_frags;
memcpy(skb_shinfo(skb)->frags, info->frags, sizeof(info->frags));

skb->data_len = info->len;
skb->len += info->len;
skb->truesize += info->len;

if (!pskb_may_pull(skb, ETH_HLEN))
goto reuse;

err = NET_RX_SUCCESS;

skb->protocol = eth_type_trans(skb, dev);

skb->ip_summed = info->ip_summed;
skb->csum = info->csum;

switch (__napi_gro_receive(napi, skb)) {
case -1:
return netif_receive_skb(skb);

case 0:
goto out;
}

reuse:
skb_shinfo(skb)->nr_frags = 0;

skb->len -= skb->data_len;
skb->truesize -= skb->data_len;
skb->data_len = 0;

__skb_pull(skb, skb_headlen(skb));
skb_reserve(skb, NET_IP_ALIGN - skb_headroom(skb));

napi->skb = skb;

out:
return err;
}
EXPORT_SYMBOL(napi_gro_frags);

static int process_backlog(struct napi_struct *napi, int quota)
{
int work = 0;
Expand Down Expand Up @@ -2537,11 +2616,12 @@ void netif_napi_add(struct net_device *dev, struct napi_struct *napi,
{
INIT_LIST_HEAD(&napi->poll_list);
napi->gro_list = NULL;
napi->skb = NULL;
napi->poll = poll;
napi->weight = weight;
list_add(&napi->dev_list, &dev->napi_list);
#ifdef CONFIG_NETPOLL
napi->dev = dev;
#ifdef CONFIG_NETPOLL
spin_lock_init(&napi->poll_lock);
napi->poll_owner = -1;
#endif
Expand All @@ -2554,6 +2634,7 @@ void netif_napi_del(struct napi_struct *napi)
struct sk_buff *skb, *next;

list_del_init(&napi->dev_list);
kfree(napi->skb);

for (skb = napi->gro_list; skb; skb = next) {
next = skb->next;
Expand Down
14 changes: 13 additions & 1 deletion trunk/net/core/skbuff.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2594,6 +2594,17 @@ int skb_gro_receive(struct sk_buff **head, struct sk_buff *skb)

if (skb_shinfo(p)->frag_list)
goto merge;
else if (!skb_headlen(p) && !skb_headlen(skb) &&
skb_shinfo(p)->nr_frags + skb_shinfo(skb)->nr_frags <
MAX_SKB_FRAGS) {
memcpy(skb_shinfo(p)->frags + skb_shinfo(p)->nr_frags,
skb_shinfo(skb)->frags,
skb_shinfo(skb)->nr_frags * sizeof(skb_frag_t));

skb_shinfo(p)->nr_frags += skb_shinfo(skb)->nr_frags;
NAPI_GRO_CB(skb)->free = 1;
goto done;
}

headroom = skb_headroom(p);
nskb = netdev_alloc_skb(p->dev, headroom);
Expand Down Expand Up @@ -2628,11 +2639,12 @@ int skb_gro_receive(struct sk_buff **head, struct sk_buff *skb)
p = nskb;

merge:
NAPI_GRO_CB(p)->count++;
p->prev->next = skb;
p->prev = skb;
skb_header_release(skb);

done:
NAPI_GRO_CB(p)->count++;
p->data_len += skb->len;
p->truesize += skb->len;
p->len += skb->len;
Expand Down

0 comments on commit 5db63a6

Please sign in to comment.