* [PATCH v2] net: Fix napi_gro_frags vs netpoll path
@ 2010-08-05 11:19 Jarek Poplawski
2010-08-05 20:22 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Jarek Poplawski @ 2010-08-05 11:19 UTC (permalink / raw)
To: David Miller; +Cc: netdev@vger.kernel.org, Herbert Xu, Xin, Xiaohui
Slight changelog and subject fixes only, sorry.
Jarek P.
------------------>
The netpoll_rx_on() check in __napi_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) &&
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH v2] net: Fix napi_gro_frags vs netpoll path
2010-08-05 11:19 [PATCH v2] net: Fix napi_gro_frags vs netpoll path Jarek Poplawski
@ 2010-08-05 20:22 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2010-08-05 20:22 UTC (permalink / raw)
To: jarkao2; +Cc: netdev, herbert, xiaohui.xin
From: Jarek Poplawski <jarkao2@gmail.com>
Date: Thu, 5 Aug 2010 11:19:11 +0000
> Slight changelog and subject fixes only, sorry.
>
> Jarek P.
> ------------------>
>
> The netpoll_rx_on() check in __napi_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>
Applied, with Herbert's ACK to v1.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-08-05 20:21 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-08-05 11:19 [PATCH v2] net: Fix napi_gro_frags vs netpoll path Jarek Poplawski
2010-08-05 20:22 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).