Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-23 12:42:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

genirq: Update irq stats from NMI handlers

Browse Source 
The NMI handlers handle_percpu_devid_fasteoi_nmi() and handle_fasteoi_nmi()
do not update the interrupt counts. Due to that the NMI interrupt count
does not show up correctly in /proc/interrupts.

Add the statistics and treat the NMI handlers in the same way as per cpu
interrupts and prevent them from updating irq_desc::tot_count as this might
be corrupted due to concurrency.

[ tglx: Massaged changelog ]

Fixes: 2dcf1fbcad ("genirq: Provide NMI handlers")
Signed-off-by: Shijith Thotton <sthotton@marvell.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Link: https://lkml.kernel.org/r/1562313336-11888-1-git-send-email-sthotton@marvell.com
This commit is contained in:
Shijith Thotton 2019-07-05 07:56:20 +00:00 committed by Thomas Gleixner
parent 9b979ac3ce
commit c09cb12935
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
kernel/irq/chip.c
View File

@ -748,6 +748,8 @@ void handle_fasteoi_nmi(struct irq_desc *desc)
unsigned int irq = irq_desc_get_irq(desc); unsigned int irq = irq_desc_get_irq(desc);
irqreturn_t res; irqreturn_t res;
__kstat_incr_irqs_this_cpu(desc);
trace_irq_handler_entry(irq, action); trace_irq_handler_entry(irq, action);
/* /*
* NMIs cannot be shared, there is only one action. * NMIs cannot be shared, there is only one action.
@ -962,6 +964,8 @@ void handle_percpu_devid_fasteoi_nmi(struct irq_desc *desc)
unsigned int irq = irq_desc_get_irq(desc); unsigned int irq = irq_desc_get_irq(desc);
irqreturn_t res; irqreturn_t res;
__kstat_incr_irqs_this_cpu(desc);
trace_irq_handler_entry(irq, action); trace_irq_handler_entry(irq, action);
res = action->handler(irq, raw_cpu_ptr(action->percpu_dev_id)); res = action->handler(irq, raw_cpu_ptr(action->percpu_dev_id));
trace_irq_handler_exit(irq, action, res); trace_irq_handler_exit(irq, action, res);

8
kernel/irq/irqdesc.c
View File

@ -946,6 +946,11 @@ unsigned int kstat_irqs_cpu(unsigned int irq, int cpu)
*per_cpu_ptr(desc->kstat_irqs, cpu) : 0; *per_cpu_ptr(desc->kstat_irqs, cpu) : 0;
} }
static bool irq_is_nmi(struct irq_desc *desc)
{
return desc->istate & IRQS_NMI;
}
/** /**
* kstat_irqs - Get the statistics for an interrupt * kstat_irqs - Get the statistics for an interrupt
* @irq: The interrupt number * @irq: The interrupt number
@ -963,7 +968,8 @@ unsigned int kstat_irqs(unsigned int irq)
if (!desc || !desc->kstat_irqs) if (!desc || !desc->kstat_irqs)
return 0; return 0;
if (!irq_settings_is_per_cpu_devid(desc) && if (!irq_settings_is_per_cpu_devid(desc) &&
!irq_settings_is_per_cpu(desc)) !irq_settings_is_per_cpu(desc) &&
!irq_is_nmi(desc))
return desc->tot_count; return desc->tot_count;
for_each_possible_cpu(cpu) for_each_possible_cpu(cpu)