[PATCH] Fix napi_gro_frags vs netpoll path

[PATCH] Fix napi_gro_frags vs netpoll path

[Jarek Poplawski]

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>
---
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) &&

Re: [PATCH] Fix napi_gro_frags vs netpoll path

[Herbert Xu]

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,
-- 
Email: Herbert Xu <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt

Re: [PATCH] Fix napi_gro_frags vs netpoll path

[Jarek Poplawski]

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.

Re: [PATCH] Fix napi_gro_frags vs netpoll path

[David Miller]

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 :-)