diff mbox series

[tip:,x86/irq] x86/irq: Add hardcoded hypervisor interrupts to /proc/stat

Message ID 168623976753.404.15778077002111483150.tip-bot2@tip-bot2
State New
Headers
Series [tip:,x86/irq] x86/irq: Add hardcoded hypervisor interrupts to /proc/stat |

Commit Message

tip-bot2 for Thomas Gleixner June 8, 2023, 3:56 p.m. UTC 
  The following commit has been merged into the x86/irq branch of tip:

Commit-ID:     504dba50b0c3fa02ec513d7d0405ddffba2d1c0a
Gitweb:        https://git.kernel.org/tip/504dba50b0c3fa02ec513d7d0405ddffba2d1c0a
Author:        Michael Kelley <mikelley@microsoft.com>
AuthorDate:    Mon, 27 Feb 2023 10:46:08 -08:00
Committer:     Dave Hansen <dave.hansen@linux.intel.com>
CommitterDate: Thu, 08 Jun 2023 08:28:08 -07:00

x86/irq: Add hardcoded hypervisor interrupts to /proc/stat

Some hypervisor interrupts (such as for Hyper-V VMbus and Hyper-V timers)
have hardcoded interrupt vectors on x86 and don't have Linux IRQs assigned.
These interrupts are shown in /proc/interrupts, but are not reported in
the first field of the "intr" line in /proc/stat because the x86 version
of arch_irq_stat_cpu() doesn't include them.

Fix this by adding code to arch_irq_stat_cpu() to include these interrupts,
similar to existing interrupts that don't have Linux IRQs.

Use #if IS_ENABLED() because unlike all the other nearby #ifdefs,
CONFIG_HYPERV can be built as a module.

Signed-off-by: Michael Kelley <mikelley@microsoft.com>
Signed-off-by: Dave Hansen <dave.hansen@linux.intel.com>
Link: https://lore.kernel.org/all/1677523568-50263-1-git-send-email-mikelley%40microsoft.com
---
 arch/x86/kernel/irq.c | 7 +++++++
 1 file changed, 7 insertions(+)
diff mbox series

Patch

diff --git a/arch/x86/kernel/irq.c b/arch/x86/kernel/irq.c
index 766ffe3..9f668d2 100644
--- a/arch/x86/kernel/irq.c
+++ b/arch/x86/kernel/irq.c
@@ -211,6 +211,13 @@  u64 arch_irq_stat_cpu(unsigned int cpu)
 #ifdef CONFIG_X86_MCE_THRESHOLD
 	sum += irq_stats(cpu)->irq_threshold_count;
 #endif
+#ifdef CONFIG_X86_HV_CALLBACK_VECTOR
+	sum += irq_stats(cpu)->irq_hv_callback_count;
+#endif
+#if IS_ENABLED(CONFIG_HYPERV)
+	sum += irq_stats(cpu)->irq_hv_reenlightenment_count;
+	sum += irq_stats(cpu)->hyperv_stimer0_count;
+#endif
 #ifdef CONFIG_X86_MCE
 	sum += per_cpu(mce_exception_count, cpu);
 	sum += per_cpu(mce_poll_count, cpu);