From: Frederic Weisbecker <frederic@kernel.org>
To: LKML <linux-kernel@vger.kernel.org>
Cc: Frederic Weisbecker <frederic@kernel.org>,
"David S. Miller" <davem@davemloft.net>,
Eric Dumazet <edumazet@google.com>,
Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>,
Simon Horman <horms@kernel.org>,
Hayes Wang <hayeswang@realtek.com>,
linux-usb@vger.kernel.org, netdev@vger.kernel.org,
Paul Menzel <pmenzel@molgen.mpg.de>
Subject: [PATCH 2/2] r8152: Call napi_schedule() from proper context
Date: Wed, 12 Feb 2025 18:43:29 +0100 [thread overview]
Message-ID: <20250212174329.53793-3-frederic@kernel.org> (raw)
In-Reply-To: <20250212174329.53793-1-frederic@kernel.org>
napi_schedule() is expected to be called either:
* From an interrupt, where raised softirqs are handled on IRQ exit
* Fom a softirq disabled section, where raised softirqs are handled on
the next call to local_bh_enable().
* From a softirq handler, where raised softirqs are handled on the next
round in do_softirq(), or further deferred to a dedicated kthread.
r8152 may call napi_schedule() on device resume time from a bare task
context without disabling softirqs as the following trace shows:
__raise_softirq_irqoff
__napi_schedule
rtl8152_runtime_resume.isra.0
rtl8152_resume
usb_resume_interface.isra.0
usb_resume_both
__rpm_callback
rpm_callback
rpm_resume
__pm_runtime_resume
usb_autoresume_device
usb_remote_wakeup
hub_event
process_one_work
worker_thread
kthread
ret_from_fork
ret_from_fork_asm
This may result in the NET_RX softirq vector to be ignored until the
next interrupt or softirq handling. The delay can be long if the
above kthread leaves the CPU idle and the tick is stopped for a while,
as reported with the following message:
NOHZ tick-stop error: local softirq work is pending, handler #08!!!
Fix this with disabling softirqs while calling napi_schedule(). The
call to local_bh_enable() will take care of the NET_RX raised vector.
Reported-by: Paul Menzel <pmenzel@molgen.mpg.de>
Closes: 354a2690-9bbf-4ccb-8769-fa94707a9340@molgen.mpg.de
Signed-off-by: Frederic Weisbecker <frederic@kernel.org>
---
drivers/net/usb/r8152.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c
index 468c73974046..1325460ae457 100644
--- a/drivers/net/usb/r8152.c
+++ b/drivers/net/usb/r8152.c
@@ -8537,8 +8537,11 @@ static int rtl8152_runtime_resume(struct r8152 *tp)
clear_bit(SELECTIVE_SUSPEND, &tp->flags);
smp_mb__after_atomic();
- if (!list_empty(&tp->rx_done))
+ if (!list_empty(&tp->rx_done)) {
+ local_bh_disable();
napi_schedule(&tp->napi);
+ local_bh_enable();
+ }
usb_submit_urb(tp->intr_urb, GFP_NOIO);
} else {
--
2.46.0
next prev parent reply other threads:[~2025-02-12 17:43 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-02-12 17:43 [PATCH 0/2] net: Fix/prevent napi_schedule() call from bare task context Frederic Weisbecker
2025-02-12 17:43 ` [PATCH 1/2] net: Assert proper context while calling napi_schedule() Frederic Weisbecker
2025-02-13 3:48 ` Jakub Kicinski
2025-02-13 9:58 ` Breno Leitao
2025-02-13 15:14 ` Jakub Kicinski
2025-02-13 18:14 ` Breno Leitao
2025-02-13 19:04 ` Jakub Kicinski
2025-02-13 20:38 ` Frederic Weisbecker
2025-02-14 22:00 ` Jakub Kicinski
2025-02-15 21:16 ` Frederic Weisbecker
2025-02-14 13:05 ` Breno Leitao
2025-02-14 16:43 ` Breno Leitao
2025-02-14 22:10 ` Jakub Kicinski
2025-02-17 16:46 ` Breno Leitao
2025-02-17 17:37 ` Jakub Kicinski
2025-02-13 20:39 ` Frederic Weisbecker
2025-02-14 22:03 ` Jakub Kicinski
2025-02-12 17:43 ` Frederic Weisbecker [this message]
2025-02-12 20:49 ` [PATCH 2/2] r8152: Call napi_schedule() from proper context Francois Romieu
2025-02-12 20:58 ` Frederic Weisbecker
2025-02-18 20:12 ` Paul Menzel
2025-04-27 20:50 ` Tobias Jakobi
2025-04-28 17:49 ` Jakub Kicinski
2025-04-28 20:26 ` Tobias Jakobi
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=20250212174329.53793-3-frederic@kernel.org \
--to=frederic@kernel.org \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=hayeswang@realtek.com \
--cc=horms@kernel.org \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=pmenzel@molgen.mpg.de \
/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