| Message ID | 20100805110355.GA19965@ff.dom.local |
|---|---|
| State | Superseded, archived |
| Delegated to: | David Miller |
| Headers | show |
On Thu, Aug 05, 2010 at 11:03:55AM +0000, Jarek Poplawski wrote: > > The netpoll_rx_on() check in dev_gro_receive() skips part of the > "common" GRO_NORMAL path, especially "pull:" in dev_gro_receive(), > where at least eth header should be copied for entirely paged skbs. > > Signed-off-by: Jarek Poplawski <jarkao2@gmail.com> Acked-by: Herbert Xu <herbert@gondor.apana.org.au> Thanks,
On Thu, Aug 05, 2010 at 07:40:59PM +0800, Herbert Xu wrote: > On Thu, Aug 05, 2010 at 11:03:55AM +0000, Jarek Poplawski wrote: > > > > The netpoll_rx_on() check in dev_gro_receive() skips part of the > > "common" GRO_NORMAL path, especially "pull:" in dev_gro_receive(), > > where at least eth header should be copied for entirely paged skbs. > > > > Signed-off-by: Jarek Poplawski <jarkao2@gmail.com> > > Acked-by: Herbert Xu <herbert@gondor.apana.org.au> I hope, David will use it with a nearby v2 (the changelog fixed). Thanks, Jarek P. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
From: Jarek Poplawski <jarkao2@gmail.com> Date: Thu, 5 Aug 2010 11:49:44 +0000 > On Thu, Aug 05, 2010 at 07:40:59PM +0800, Herbert Xu wrote: >> On Thu, Aug 05, 2010 at 11:03:55AM +0000, Jarek Poplawski wrote: >> > >> > The netpoll_rx_on() check in dev_gro_receive() skips part of the >> > "common" GRO_NORMAL path, especially "pull:" in dev_gro_receive(), >> > where at least eth header should be copied for entirely paged skbs. >> > >> > Signed-off-by: Jarek Poplawski <jarkao2@gmail.com> >> >> Acked-by: Herbert Xu <herbert@gondor.apana.org.au> > > I hope, David will use it with a nearby v2 (the changelog fixed). I will :-) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/net/core/dev.c b/net/core/dev.c index e1c1cdc..2b50896 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -3072,7 +3072,7 @@ enum gro_result dev_gro_receive(struct napi_struct *napi, struct sk_buff *skb) int mac_len; enum gro_result ret; - if (!(skb->dev->features & NETIF_F_GRO)) + if (!(skb->dev->features & NETIF_F_GRO) || netpoll_rx_on(skb)) goto normal; if (skb_is_gso(skb) || skb_has_frags(skb)) @@ -3159,9 +3159,6 @@ __napi_gro_receive(struct napi_struct *napi, struct sk_buff *skb) { struct sk_buff *p; - if (netpoll_rx_on(skb)) - return GRO_NORMAL; - for (p = napi->gro_list; p; p = p->next) { NAPI_GRO_CB(p)->same_flow = (p->dev == skb->dev) &&
Hi, While looking at Xioahui's patch I noticed this "unless I miss something" bug. Jarek P. ------------------> The netpoll_rx_on() check in dev_gro_receive() skips part of the "common" GRO_NORMAL path, especially "pull:" in dev_gro_receive(), where at least eth header should be copied for entirely paged skbs. Signed-off-by: Jarek Poplawski <jarkao2@gmail.com> --- -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html