| Message ID | 1399322864-22861-2-git-send-email-john.stultz@linaro.org |
|---|---|
| State | Accepted |
| Commit | 81954606265ab8f04b41154bd00576013affcf5b |
| Headers | show |
On Mon 05-05-14 13:47:41, John Stultz wrote: > An earlier change in -mm (printk: remove separate printk_sched > buffers...), removed the printk_sched irqsave/restore lines > since it was safe for current users. Since we may be expanding > usage of printk_sched(), disable preepmtion for this function > to make it more generally safe to call. Looks good to me. You can add: Reviewed-by: Jan Kara <jack@suse.cz> Honza > > Cc: Jan Kara <jack@suse.cz> > Cc: Peter Zijlstra <peterz@infradead.org> > Cc: Jiri Bohac <jbohac@suse.cz> > Cc: Thomas Gleixner <tglx@linutronix.de> > Cc: Ingo Molnar <mingo@redhat.com> > Cc: Andrew Morton <akpm@linux-foundation.org> > Cc: Steven Rostedt <rostedt@goodmis.org> > Signed-off-by: John Stultz <john.stultz@linaro.org> > --- > kernel/printk/printk.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c > index 82d19e6..57467df 100644 > --- a/kernel/printk/printk.c > +++ b/kernel/printk/printk.c > @@ -2589,12 +2589,14 @@ int printk_sched(const char *fmt, ...) > va_list args; > int r; > > + preempt_disable(); > va_start(args, fmt); > r = vprintk_emit(0, SCHED_MESSAGE_LOGLEVEL, NULL, 0, fmt, args); > va_end(args); > > __this_cpu_or(printk_pending, PRINTK_PENDING_OUTPUT); > irq_work_queue(&__get_cpu_var(wake_up_klogd_work)); > + preempt_enable(); > > return r; > } > -- > 1.9.1 >
diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c index 82d19e6..57467df 100644 --- a/kernel/printk/printk.c +++ b/kernel/printk/printk.c @@ -2589,12 +2589,14 @@ int printk_sched(const char *fmt, ...) va_list args; int r; + preempt_disable(); va_start(args, fmt); r = vprintk_emit(0, SCHED_MESSAGE_LOGLEVEL, NULL, 0, fmt, args); va_end(args); __this_cpu_or(printk_pending, PRINTK_PENDING_OUTPUT); irq_work_queue(&__get_cpu_var(wake_up_klogd_work)); + preempt_enable(); return r; }
An earlier change in -mm (printk: remove separate printk_sched buffers...), removed the printk_sched irqsave/restore lines since it was safe for current users. Since we may be expanding usage of printk_sched(), disable preepmtion for this function to make it more generally safe to call. Cc: Jan Kara <jack@suse.cz> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Jiri Bohac <jbohac@suse.cz> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Ingo Molnar <mingo@redhat.com> Cc: Andrew Morton <akpm@linux-foundation.org> Cc: Steven Rostedt <rostedt@goodmis.org> Signed-off-by: John Stultz <john.stultz@linaro.org> --- kernel/printk/printk.c | 2 ++ 1 file changed, 2 insertions(+)