p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

udp: Fix inverted NAPI_GRO_CB(skb)->flush test 

Commit 2abb7cdc0d ("udp: Add support for doing checksum unnecessary
conversion") caused napi_gro_cb structs with the "flush" field zero to
take the "udp_gro_receive" path rather than the "set flush to 1" path
that they would previously take.  As a result I saw booting from an NFS
root hang shortly after starting userspace, with "server not
responding" messages.

This change to the handling of "flush == 0" packets appears to be
incidental to the goal of adding new code in the case where
skb_gro_checksum_validate_zero_check() returns zero.  Based on that and
the fact that it breaks things, I'm assuming that it is unintentional.

Fixes: 2abb7cdc0d ("udp: Add support for doing checksum unnecessary conversion")
Cc: Tom Herbert <therbert@google.com>
Signed-off-by: Scott Wood <scottwood@freescale.com>
Acked-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Scott Wood 2014-09-10 21:23:18 -05:00 committed by David S. Miller
parent c5306726bc
commit 2d8f7e2c8a
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
net/ipv4/udp_offload.c
View File

@ -294,7 +294,7 @@ static struct sk_buff **udp4_gro_receive(struct sk_buff **head,
goto flush; goto flush;
/* Don't bother verifying checksum if we're going to flush anyway. */ /* Don't bother verifying checksum if we're going to flush anyway. */
if (!NAPI_GRO_CB(skb)->flush) if (NAPI_GRO_CB(skb)->flush)
goto skip; goto skip;
if (skb_gro_checksum_validate_zero_check(skb, IPPROTO_UDP, uh->check, if (skb_gro_checksum_validate_zero_check(skb, IPPROTO_UDP, uh->check,

2
net/ipv6/udp_offload.c
View File

@ -138,7 +138,7 @@ static struct sk_buff **udp6_gro_receive(struct sk_buff **head,
goto flush; goto flush;
/* Don't bother verifying checksum if we're going to flush anyway. */ /* Don't bother verifying checksum if we're going to flush anyway. */
if (!NAPI_GRO_CB(skb)->flush) if (NAPI_GRO_CB(skb)->flush)
goto skip; goto skip;
if (skb_gro_checksum_validate_zero_check(skb, IPPROTO_UDP, uh->check, if (skb_gro_checksum_validate_zero_check(skb, IPPROTO_UDP, uh->check,