@@ -151,15 +151,14 @@ int nmi_active;
static void __init wait_for_nmis(void *p)
{
- unsigned int cpu = smp_processor_id();
- unsigned int start_count = nmi_count(cpu);
+ unsigned int start_count = this_cpu(nmi_count);
unsigned long ticks = 10 * 1000 * cpu_khz / nmi_hz;
unsigned long s, e;
s = rdtsc();
do {
cpu_relax();
- if ( nmi_count(cpu) >= start_count + 2 )
+ if ( this_cpu(nmi_count) >= start_count + 2 )
break;
e = rdtsc();
} while( e - s < ticks );
@@ -177,7 +176,7 @@ void __init check_nmi_watchdog(void)
printk("Testing NMI watchdog on all CPUs:");
for_each_online_cpu ( cpu )
- prev_nmi_count[cpu] = nmi_count(cpu);
+ prev_nmi_count[cpu] = per_cpu(nmi_count, cpu);
/*
* Wait at most 10 ticks for 2 watchdog NMIs on each CPU.
@@ -188,7 +187,7 @@ void __init check_nmi_watchdog(void)
for_each_online_cpu ( cpu )
{
- if ( nmi_count(cpu) - prev_nmi_count[cpu] < 2 )
+ if ( per_cpu(nmi_count, cpu) - prev_nmi_count[cpu] < 2 )
{
printk(" %d", cpu);
ok = false;
@@ -593,7 +592,7 @@ static void do_nmi_stats(unsigned char key)
printk("CPU\tNMI\n");
for_each_online_cpu ( i )
- printk("%3d\t%3d\n", i, nmi_count(i));
+ printk("%3d\t%3u\n", i, per_cpu(nmi_count, i));
if ( ((d = hardware_domain) == NULL) || (d->vcpu == NULL) ||
((v = d->vcpu[0]) == NULL) )
@@ -1683,13 +1683,15 @@ static int dummy_nmi_callback(const struct cpu_user_regs *regs, int cpu)
static nmi_callback_t *nmi_callback = dummy_nmi_callback;
+DEFINE_PER_CPU(unsigned int, nmi_count);
+
void do_nmi(const struct cpu_user_regs *regs)
{
unsigned int cpu = smp_processor_id();
unsigned char reason = 0;
bool handle_unknown = false;
- ++nmi_count(cpu);
+ this_cpu(nmi_count)++;
if ( nmi_callback(regs, cpu) )
return;
@@ -31,5 +31,7 @@ nmi_callback_t *set_nmi_callback(nmi_callback_t *callback);
* Remove the handler previously set.
*/
void unset_nmi_callback(void);
+
+DECLARE_PER_CPU(unsigned int, nmi_count);
#endif /* ASM_NMI_H */
This is modeled after the irq_count variable, and is used to account for all the NMIs handled by the system. This will allow to repurpose the nmi_count() helper so it can be used in a similar manner as local_irq_count(): account for the NMIs currently in service. Signed-off-by: Roger Pau Monné <roger.pau@citrix.com> --- xen/arch/x86/nmi.c | 11 +++++------ xen/arch/x86/traps.c | 4 +++- xen/include/asm-x86/nmi.h | 2 ++ 3 files changed, 10 insertions(+), 7 deletions(-)