* [PATCH RT] net: Have __napi_schedule_irqoff() disable interrupts on RT
@ 2016-12-06 22:50 Steven Rostedt
2016-12-07 9:10 ` Sebastian Andrzej Siewior
0 siblings, 1 reply; 5+ messages in thread
From: Steven Rostedt @ 2016-12-06 22:50 UTC (permalink / raw)
To: LKML, linux-rt-users
Cc: Thomas Gleixner, Sebastian Andrzej Siewior, Clark Williams,
Luis Claudio R. Goncalves, John Kacur
A customer hit a crash where the napi sd->poll_list became corrupted.
The customer had the bnx2x driver, which does a
__napi_schedule_irqoff() in its interrupt handler. Unfortunately, when
running with CONFIG_PREEMPT_RT_FULL, this interrupt handler is run as a
thread and is preemptable. The call to ____napi_schedule() must be done
with interrupts disabled to protect the per cpu softnet_data's
poll_list, which is protected by disabling interrupts (disabling
preemption is enough when all interrupts are threaded and
local_bh_disable() can't preempt).
As bnx2x isn't the only driver that does this, the safest thing to do
is to make __napi_schedule_irqoff() call __napi_schedule() instead when
CONFIG_PREEMPT_RT_FULL is enabled, which will call local_irq_save()
before calling ____napi_schedule().
Cc: stable-rt@vger.kernel.org
Signed-off-by: Steven Rostedt (Red Hat) <rostedt@goodmis.org>
---
include/linux/netdevice.h | 12 ++++++++++++
net/core/dev.c | 2 ++
2 files changed, 14 insertions(+)
Index: linux-rt.git/include/linux/netdevice.h
===================================================================
--- linux-rt.git.orig/include/linux/netdevice.h 2016-11-18 14:59:01.679547362 -0500
+++ linux-rt.git/include/linux/netdevice.h 2016-12-06 17:35:38.506672042 -0500
@@ -395,7 +395,19 @@ typedef enum rx_handler_result rx_handle
typedef rx_handler_result_t rx_handler_func_t(struct sk_buff **pskb);
void __napi_schedule(struct napi_struct *n);
+
+/*
+ * When PREEMPT_RT_FULL is defined, all device interrupt handlers
+ * run as threads, and they can also be preempted (without PREEMPT_RT
+ * interrupt threads can not be preempted). Which means that calling
+ * __napi_schedule_irqoff() from an interrupt handler can be preempted
+ * and can corrupt the napi->poll_list.
+ */
+#ifdef CONFIG_PREEMPT_RT_FULL
+#define __napi_schedule_irqoff(n) __napi_schedule(n)
+#else
void __napi_schedule_irqoff(struct napi_struct *n);
+#endif
static inline bool napi_disable_pending(struct napi_struct *n)
{
Index: linux-rt.git/net/core/dev.c
===================================================================
--- linux-rt.git.orig/net/core/dev.c 2016-11-18 14:59:02.876527251 -0500
+++ linux-rt.git/net/core/dev.c 2016-12-06 17:35:38.513672035 -0500
@@ -4910,6 +4910,7 @@ void __napi_schedule(struct napi_struct
}
EXPORT_SYMBOL(__napi_schedule);
+#ifndef CONFIG_PREEMPT_RT_FULL
/**
* __napi_schedule_irqoff - schedule for receive
* @n: entry to schedule
@@ -4921,6 +4922,7 @@ void __napi_schedule_irqoff(struct napi_
____napi_schedule(this_cpu_ptr(&softnet_data), n);
}
EXPORT_SYMBOL(__napi_schedule_irqoff);
+#endif
void __napi_complete(struct napi_struct *n)
{
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH RT] net: Have __napi_schedule_irqoff() disable interrupts on RT
2016-12-06 22:50 [PATCH RT] net: Have __napi_schedule_irqoff() disable interrupts on RT Steven Rostedt
@ 2016-12-07 9:10 ` Sebastian Andrzej Siewior
2016-12-07 12:53 ` Steven Rostedt
0 siblings, 1 reply; 5+ messages in thread
From: Sebastian Andrzej Siewior @ 2016-12-07 9:10 UTC (permalink / raw)
To: Steven Rostedt
Cc: LKML, linux-rt-users, Thomas Gleixner, Clark Williams,
Luis Claudio R. Goncalves, John Kacur
On 2016-12-06 17:50:30 [-0500], Steven Rostedt wrote:
> A customer hit a crash where the napi sd->poll_list became corrupted.
> The customer had the bnx2x driver, which does a
> __napi_schedule_irqoff() in its interrupt handler. Unfortunately, when
> running with CONFIG_PREEMPT_RT_FULL, this interrupt handler is run as a
> thread and is preemptable. The call to ____napi_schedule() must be done
> with interrupts disabled to protect the per cpu softnet_data's
> poll_list, which is protected by disabling interrupts (disabling
> preemption is enough when all interrupts are threaded and
> local_bh_disable() can't preempt).
>
> As bnx2x isn't the only driver that does this, the safest thing to do
> is to make __napi_schedule_irqoff() call __napi_schedule() instead when
> CONFIG_PREEMPT_RT_FULL is enabled, which will call local_irq_save()
> before calling ____napi_schedule().
It would work RT wise. But don't have the same problem if you boot the
kernel with threadirqs ?
Sebastian
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH RT] net: Have __napi_schedule_irqoff() disable interrupts on RT
2016-12-07 9:10 ` Sebastian Andrzej Siewior
@ 2016-12-07 12:53 ` Steven Rostedt
2016-12-07 15:28 ` Steven Rostedt
0 siblings, 1 reply; 5+ messages in thread
From: Steven Rostedt @ 2016-12-07 12:53 UTC (permalink / raw)
To: Sebastian Andrzej Siewior
Cc: LKML, linux-rt-users, Thomas Gleixner, Clark Williams,
Luis Claudio R. Goncalves, John Kacur
On Wed, 7 Dec 2016 10:10:40 +0100
Sebastian Andrzej Siewior <bigeasy@linutronix.de> wrote:
> On 2016-12-06 17:50:30 [-0500], Steven Rostedt wrote:
> > A customer hit a crash where the napi sd->poll_list became corrupted.
> > The customer had the bnx2x driver, which does a
> > __napi_schedule_irqoff() in its interrupt handler. Unfortunately, when
> > running with CONFIG_PREEMPT_RT_FULL, this interrupt handler is run as a
> > thread and is preemptable. The call to ____napi_schedule() must be done
> > with interrupts disabled to protect the per cpu softnet_data's
> > poll_list, which is protected by disabling interrupts (disabling
> > preemption is enough when all interrupts are threaded and
> > local_bh_disable() can't preempt).
> >
> > As bnx2x isn't the only driver that does this, the safest thing to do
> > is to make __napi_schedule_irqoff() call __napi_schedule() instead when
> > CONFIG_PREEMPT_RT_FULL is enabled, which will call local_irq_save()
> > before calling ____napi_schedule().
>
> It would work RT wise. But don't have the same problem if you boot the
> kernel with threadirqs ?
>
I thought the same at first, but looking into the code for forced
threaded interrupts, I saw this:
local_bh_disable();
ret = action->thread_fn(action->irq, action->dev_id);
irq_finalize_oneshot(desc, action);
local_bh_enable();
Where without CONFIG_PREEMPT_RT_FULL, local_bh_disable() also disables
preemption. Then all the handlers still can not be preempted by another
handler. So it appears to be safe as well.
-- Steve
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH RT] net: Have __napi_schedule_irqoff() disable interrupts on RT
2016-12-07 12:53 ` Steven Rostedt
@ 2016-12-07 15:28 ` Steven Rostedt
2016-12-07 15:32 ` Sebastian Andrzej Siewior
0 siblings, 1 reply; 5+ messages in thread
From: Steven Rostedt @ 2016-12-07 15:28 UTC (permalink / raw)
To: Sebastian Andrzej Siewior
Cc: LKML, linux-rt-users, Thomas Gleixner, Clark Williams,
Luis Claudio R. Goncalves, John Kacur
On Wed, 7 Dec 2016 07:53:26 -0500
Steven Rostedt <rostedt@goodmis.org> wrote:
> On Wed, 7 Dec 2016 10:10:40 +0100
> Sebastian Andrzej Siewior <bigeasy@linutronix.de> wrote:
>
> > On 2016-12-06 17:50:30 [-0500], Steven Rostedt wrote:
> > > A customer hit a crash where the napi sd->poll_list became corrupted.
> > > The customer had the bnx2x driver, which does a
> > > __napi_schedule_irqoff() in its interrupt handler. Unfortunately, when
> > > running with CONFIG_PREEMPT_RT_FULL, this interrupt handler is run as a
> > > thread and is preemptable. The call to ____napi_schedule() must be done
> > > with interrupts disabled to protect the per cpu softnet_data's
> > > poll_list, which is protected by disabling interrupts (disabling
> > > preemption is enough when all interrupts are threaded and
> > > local_bh_disable() can't preempt).
> > >
> > > As bnx2x isn't the only driver that does this, the safest thing to do
> > > is to make __napi_schedule_irqoff() call __napi_schedule() instead when
> > > CONFIG_PREEMPT_RT_FULL is enabled, which will call local_irq_save()
> > > before calling ____napi_schedule().
> >
> > It would work RT wise. But don't have the same problem if you boot the
> > kernel with threadirqs ?
> >
>
> I thought the same at first, but looking into the code for forced
> threaded interrupts, I saw this:
>
> local_bh_disable();
> ret = action->thread_fn(action->irq, action->dev_id);
> irq_finalize_oneshot(desc, action);
> local_bh_enable();
>
> Where without CONFIG_PREEMPT_RT_FULL, local_bh_disable() also disables
> preemption. Then all the handlers still can not be preempted by another
> handler. So it appears to be safe as well.
>
Actually, I was hoping that the change log explained this. Should I
reword it better?
"poll_list, which is protected by disabling interrupts (disabling
preemption is enough when all interrupts are threaded and
local_bh_disable() can't preempt)."
-- Steve
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH RT] net: Have __napi_schedule_irqoff() disable interrupts on RT
2016-12-07 15:28 ` Steven Rostedt
@ 2016-12-07 15:32 ` Sebastian Andrzej Siewior
0 siblings, 0 replies; 5+ messages in thread
From: Sebastian Andrzej Siewior @ 2016-12-07 15:32 UTC (permalink / raw)
To: Steven Rostedt
Cc: LKML, linux-rt-users, Thomas Gleixner, Clark Williams,
Luis Claudio R. Goncalves, John Kacur
On 2016-12-07 10:28:34 [-0500], Steven Rostedt wrote:
> Actually, I was hoping that the change log explained this. Should I
> reword it better?
>
> "poll_list, which is protected by disabling interrupts (disabling
> preemption is enough when all interrupts are threaded and
> local_bh_disable() can't preempt)."
That is fine, I merge it and add this piece. Thank you Steven.
> -- Steve
Sebastian
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2016-12-07 15:32 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-12-06 22:50 [PATCH RT] net: Have __napi_schedule_irqoff() disable interrupts on RT Steven Rostedt
2016-12-07 9:10 ` Sebastian Andrzej Siewior
2016-12-07 12:53 ` Steven Rostedt
2016-12-07 15:28 ` Steven Rostedt
2016-12-07 15:32 ` Sebastian Andrzej Siewior
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®