From: Paolo Abeni <pabeni@redhat.com>
To: netdev@vger.kernel.org
Cc: Eric Dumazet <edumazet@google.com>, Wei Wang <weiwan@google.com>,
"David S. Miller" <davem@davemloft.net>,
Jakub Kicinski <kuba@kernel.org>
Subject: [PATCH net] net: fix hangup on napi_disable for threaded napi
Date: Thu, 1 Apr 2021 00:46:18 +0200 [thread overview]
Message-ID: <996c4bb33166b5cf8d881871ea8b61e54ad4da24.1617230551.git.pabeni@redhat.com> (raw)
I hit an hangup on napi_disable(), 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.
Address the issue explicitly clearing the SCHED_BIT on napi_thread
termination, if the thread is owns the napi.
Fixes: 29863d41bb6e ("net: implement threaded-able napi poll loop support")
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
---
net/core/dev.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/net/core/dev.c b/net/core/dev.c
index b4c67a5be606d..e2e716ba027b8 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -7059,6 +7059,14 @@ static int napi_thread_wait(struct napi_struct *napi)
set_current_state(TASK_INTERRUPTIBLE);
}
__set_current_state(TASK_RUNNING);
+
+ /* if the thread owns this napi, and the napi itself has been disabled
+ * in-between napi_schedule() and the above napi_disable_pending()
+ * check, we need to clear the SCHED bit here, or napi_disable
+ * will hang waiting for such bit being cleared
+ */
+ if (test_bit(NAPI_STATE_SCHED_THREADED, &napi->state) || woken)
+ clear_bit(NAPI_STATE_SCHED, &napi->state);
return -1;
}
--
2.26.2
next reply other threads:[~2021-03-31 22:47 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-31 22:46 Paolo Abeni [this message]
2021-04-01 1:41 ` [PATCH net] net: fix hangup on napi_disable for threaded napi Jakub Kicinski
2021-04-01 9:55 ` Paolo Abeni
2021-04-01 23:44 ` Jakub Kicinski
2021-04-07 14:54 ` Paolo Abeni
2021-04-07 18:13 ` Jakub Kicinski
2021-04-09 9:24 ` Paolo Abeni
2021-04-09 10:08 ` Eric Dumazet
2021-04-09 15:15 ` Jakub Kicinski
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=996c4bb33166b5cf8d881871ea8b61e54ad4da24.1617230551.git.pabeni@redhat.com \
--to=pabeni@redhat.com \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=kuba@kernel.org \
--cc=netdev@vger.kernel.org \
--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).