linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: David Miller <davem@davemloft.net>
To: oleksandr@natalenko.name
Cc: dave.taht@gmail.com, hkallweit1@gmail.com, toke@toke.dk,
	jhs@mojatatu.com, xiyou.wangcong@gmail.com, jiri@resnulli.us,
	netdev@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: CAKE and r8169 cause panic on upload in v4.19
Date: Sun, 28 Oct 2018 10:45:24 -0700 (PDT)	[thread overview]
Message-ID: <20181028.104524.345213764443487772.davem@davemloft.net> (raw)
In-Reply-To: <3d749bf1ec48ee9f4172b23bde84ec4b@natalenko.name>

From: Oleksandr Natalenko <oleksandr@natalenko.name>
Date: Sun, 28 Oct 2018 13:22:09 +0100

> Hi.
> 
> On 28.10.2018 05:44, David Miller wrote:
>> Does this fix it?
>> diff --git a/net/core/dev.c b/net/core/dev.c
>> index 022ad73d6253..77d43ae2a7bb 100644
>> --- a/net/core/dev.c
>> +++ b/net/core/dev.c
>> @@ -5457,7 +5457,7 @@ static void gro_flush_oldest(struct list_head
>> *head)
>>  	/* Do not adjust napi->gro_hash[].count, caller is adding a new
>>  	 * SKB to the chain.
>>  	 */
>> -	list_del(&oldest->list);
>> +	skb_list_del_init(oldest);
>>  	napi_gro_complete(oldest);
>>  }
> 
> Yes, but I had to apply both a8305bff6852 and 992cba7e276d too to get
> it compiled. With these 3 patches the panic is not triggered any more
> while having GRO enabled.
> 
> Thanks!

Thanks for testing, I'll queue this up for -stable too:

From ece23711dd956cd5053c9cb03e9fe0668f9c8894 Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Sun, 28 Oct 2018 10:35:12 -0700
Subject: [PATCH] net: Properly unlink GRO packets on overflow.

Just like with normal GRO processing, we have to initialize
skb->next to NULL when we unlink overflow packets from the
GRO hash lists.

Fixes: d4546c2509b1 ("net: Convert GRO SKB handling to list_head.")
Reported-by: Oleksandr Natalenko <oleksandr@natalenko.name>
Tested-by: Oleksandr Natalenko <oleksandr@natalenko.name>
Signed-off-by: David S. Miller <davem@davemloft.net>
---
 net/core/dev.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/core/dev.c b/net/core/dev.c
index 022ad73d6253..77d43ae2a7bb 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -5457,7 +5457,7 @@ static void gro_flush_oldest(struct list_head *head)
 	/* Do not adjust napi->gro_hash[].count, caller is adding a new
 	 * SKB to the chain.
 	 */
-	list_del(&oldest->list);
+	skb_list_del_init(oldest);
 	napi_gro_complete(oldest);
 }
 
-- 
2.17.2


      reply	other threads:[~2018-10-28 17:45 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-10-26 19:26 CAKE and r8169 cause panic on upload in v4.19 Oleksandr Natalenko
2018-10-26 20:21 ` Heiner Kallweit
2018-10-26 20:25   ` Dave Taht
2018-10-26 20:54     ` Oleksandr Natalenko
2018-10-26 23:08       ` Dave Taht
2018-10-27 11:04         ` Oleksandr Natalenko
2018-10-27 13:43       ` Heiner Kallweit
2018-10-27 15:37         ` Oleksandr Natalenko
2018-10-28  4:44       ` David Miller
2018-10-28 12:22         ` Oleksandr Natalenko
2018-10-28 17:45           ` David Miller [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20181028.104524.345213764443487772.davem@davemloft.net \
    --to=davem@davemloft.net \
    --cc=dave.taht@gmail.com \
    --cc=hkallweit1@gmail.com \
    --cc=jhs@mojatatu.com \
    --cc=jiri@resnulli.us \
    --cc=linux-kernel@vger.kernel.org \
    --cc=netdev@vger.kernel.org \
    --cc=oleksandr@natalenko.name \
    --cc=toke@toke.dk \
    --cc=xiyou.wangcong@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).