From: Heiner Kallweit <hkallweit1@gmail.com>
To: Paolo Abeni <pabeni@redhat.com>, netdev@vger.kernel.org
Cc: "David S. Miller" <davem@davemloft.net>,
Jakub Kicinski <kuba@kernel.org>,
Eric Dumazet <edumazet@google.com>, Wei Wang <weiwan@google.com>
Subject: Re: [PATCH net v2] net: fix hangup on napi_disable for threaded napi
Date: Fri, 9 Apr 2021 17:35:23 +0200 [thread overview]
Message-ID: <385f1818-911e-4c7d-1501-8710691d609a@gmail.com> (raw)
In-Reply-To: <883923fa22745a9589e8610962b7dc59df09fb1f.1617981844.git.pabeni@redhat.com>
On 09.04.2021 17:24, Paolo Abeni wrote:
> napi_disable() is subject to an hangup, when the threaded
> mode is enabled and the napi is under heavy traffic.
>
> If the relevant napi has been scheduled and the napi_disable()
> kicks in before the next napi_threaded_wait() completes - so
> that the latter quits due to the napi_disable_pending() condition,
> the existing code leaves the NAPI_STATE_SCHED bit set and the
> napi_disable() loop waiting for such bit will hang.
>
> This patch addresses the issue by dropping the NAPI_STATE_DISABLE
> bit test in napi_thread_wait(). The later napi_threaded_poll()
> iteration will take care of clearing the NAPI_STATE_SCHED.
>
> This also addresses a related problem reported by Jakub:
> before this patch a napi_disable()/napi_enable() pair killed
> the napi thread, effectively disabling the threaded mode.
> On the patched kernel napi_disable() simply stops scheduling
> the relevant thread.
>
> v1 -> v2:
> - let the main napi_thread_poll() loop clear the SCHED bit
>
> Reported-by: Jakub Kicinski <kuba@kernel.org>
> Fixes: 29863d41bb6e ("net: implement threaded-able napi poll loop support")
> Signed-off-by: Paolo Abeni <pabeni@redhat.com>
> ---
> net/core/dev.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/net/core/dev.c b/net/core/dev.c
> index 0f72ff5d34ba..af8c1ea040b9 100644
> --- a/net/core/dev.c
> +++ b/net/core/dev.c
> @@ -6992,7 +6992,7 @@ static int napi_thread_wait(struct napi_struct *napi)
>
> set_current_state(TASK_INTERRUPTIBLE);
>
> - while (!kthread_should_stop() && !napi_disable_pending(napi)) {
> + while (!kthread_should_stop()) {
> /* Testing SCHED_THREADED bit here to make sure the current
> * kthread owns this napi and could poll on this napi.
> * Testing SCHED bit is not enough because SCHED bit might be
> @@ -7010,6 +7010,7 @@ static int napi_thread_wait(struct napi_struct *napi)
> set_current_state(TASK_INTERRUPTIBLE);
> }
> __set_current_state(TASK_RUNNING);
> +
> return -1;
> }
>
>
Unrelated to the actual issue:
I wonder why -1 is returned, that's unusual in kernel. The return value
is used as bool, so why not return a bool?
next prev parent reply other threads:[~2021-04-09 15:35 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-09 15:24 [PATCH net v2] net: fix hangup on napi_disable for threaded napi Paolo Abeni
2021-04-09 15:28 ` Eric Dumazet
2021-04-09 15:35 ` Heiner Kallweit [this message]
2021-04-09 15:52 ` Eric Dumazet
2021-04-09 20:00 ` patchwork-bot+netdevbpf
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=385f1818-911e-4c7d-1501-8710691d609a@gmail.com \
--to=hkallweit1@gmail.com \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=kuba@kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=weiwan@google.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).