leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

x86/nmi: Remove irq_work from the long duration NMI handler

Browse Source 
First, printk() is NMI-context safe now since the safe printk() has been
implemented and it already has an irq_work to make NMI-context safe.

Second, this NMI irq_work actually does not work if a NMI handler causes
panic by watchdog timeout. It has no chance to run in such case, while
the safe printk() will flush its per-cpu buffers before panicking.

While at it, repurpose the irq_work callback into a function which
concentrates the NMI duration checking and makes the code easier to
follow.

 [ bp: Massage. ]

Signed-off-by: Changbin Du <changbin.du@gmail.com>
Signed-off-by: Borislav Petkov <bp@suse.de>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
Link: https://lkml.kernel.org/r/20200111125427.15662-1-changbin.du@gmail.com
This commit is contained in:
Changbin Du 2020-01-11 20:54:27 +08:00 committed by Borislav Petkov
parent 36209766ce
commit 248ed51048
2 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/x86/include/asm/nmi.h
View File

@ -41,7 +41,6 @@ struct nmiaction {
struct list_head list; struct list_head list;
nmi_handler_t handler; nmi_handler_t handler;
u64 max_duration; u64 max_duration;
struct irq_work irq_work;
unsigned long flags; unsigned long flags;
const char *name; const char *name;
}; };

20
arch/x86/kernel/nmi.c
View File

@ -104,18 +104,22 @@ static int __init nmi_warning_debugfs(void)
} }
fs_initcall(nmi_warning_debugfs); fs_initcall(nmi_warning_debugfs);
static void nmi_max_handler(struct irq_work *w) static void nmi_check_duration(struct nmiaction *action, u64 duration)
{ {
struct nmiaction *a = container_of(w, struct nmiaction, irq_work); u64 whole_msecs = READ_ONCE(action->max_duration);
int remainder_ns, decimal_msecs; int remainder_ns, decimal_msecs;
u64 whole_msecs = READ_ONCE(a->max_duration);
if (duration < nmi_longest_ns || duration < action->max_duration)
return;
action->max_duration = duration;
remainder_ns = do_div(whole_msecs, (1000 * 1000)); remainder_ns = do_div(whole_msecs, (1000 * 1000));
decimal_msecs = remainder_ns / 1000; decimal_msecs = remainder_ns / 1000;
printk_ratelimited(KERN_INFO printk_ratelimited(KERN_INFO
"INFO: NMI handler (%ps) took too long to run: %lld.%03d msecs\n", "INFO: NMI handler (%ps) took too long to run: %lld.%03d msecs\n",
a->handler, whole_msecs, decimal_msecs); action->handler, whole_msecs, decimal_msecs);
} }
static int nmi_handle(unsigned int type, struct pt_regs *regs) static int nmi_handle(unsigned int type, struct pt_regs *regs)
@ -142,11 +146,7 @@ static int nmi_handle(unsigned int type, struct pt_regs *regs)
delta = sched_clock() - delta; delta = sched_clock() - delta;
trace_nmi_handler(a->handler, (int)delta, thishandled); trace_nmi_handler(a->handler, (int)delta, thishandled);
if (delta < nmi_longest_ns || delta < a->max_duration) nmi_check_duration(a, delta);
continue;
a->max_duration = delta;
irq_work_queue(&a->irq_work);
} }
rcu_read_unlock(); rcu_read_unlock();
@ -164,8 +164,6 @@ int __register_nmi_handler(unsigned int type, struct nmiaction *action)
if (!action->handler) if (!action->handler)
return -EINVAL; return -EINVAL;
init_irq_work(&action->irq_work, nmi_max_handler);
raw_spin_lock_irqsave(&desc->lock, flags); raw_spin_lock_irqsave(&desc->lock, flags);
/* /*