Skip to contentSkip to conversation

x86/irq: hide HYP in /proc/interrupts when not on Xen/Hyper-V

PATCH New Vitaly Kuznetsov 2 participants 2 messages Jul 7, 2015 – Jul 8, 2015 x86

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 x86/irq: hide HYP in /proc/interrupts when not on Xen/Hyper-V

Hypervisor callback interrupts are only accounted on Xen/Hyper-V. There is no point in having always-zero HYP: line on other hypervisors or bare metal. Print the line only if HYPERVISOR_CALLBACK_VECTOR was allocated.

---
Changes in v2:
- Check if hypervisor callback vector was allocated instead of checking x86_hyper against &x86_hyper_ms_hyperv/&x86_hyper_xen. [Ingo Molnar]

---
 arch/x86/kernel/irq.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)
arch/x86/kernel/irq.c +7 -4
index 88b36648..5b53747 100644
@@ -139,10 +139,13 @@ int arch_show_interrupts(struct seq_file *p, int prec)
 	seq_puts(p, "  Machine check polls\n");
 #endif
 #if IS_ENABLED(CONFIG_HYPERV) || defined(CONFIG_XEN)
-	seq_printf(p, "%*s: ", prec, "HYP");
-	for_each_online_cpu(j)
-		seq_printf(p, "%10u ", irq_stats(j)->irq_hv_callback_count);
-	seq_puts(p, "  Hypervisor callback interrupts\n");
+	if (test_bit(HYPERVISOR_CALLBACK_VECTOR, used_vectors)) {
+		seq_printf(p, "%*s: ", prec, "HYP");
+		for_each_online_cpu(j)
+			seq_printf(p, "%10u ",
+				   irq_stats(j)->irq_hv_callback_count);
+		seq_puts(p, "  Hypervisor callback interrupts\n");
+	}
 #endif
 	seq_printf(p, "%*s: %10u\n", prec, "ERR", atomic_read(&irq_err_count));
 #if defined(CONFIG_X86_IO_APIC)
Signature · 1 line
2.4.3
#1 lore raw

[tip:x86/irq] x86/irq: Hide 'HYP:' line in /proc/ interrupts when not on Xen/Hyper-V

x86/irq: Hide 'HYP:' line in /proc/interrupts when not on Xen/Hyper-V
Commit-ID:  9d87cd61a6b71ee00b7576a3ebc10208becdbea1
Gitweb:     http://git.kernel.org/tip/9d87cd61a6b71ee00b7576a3ebc10208becdbea1
Author:     Vitaly Kuznetsov <[email protected]>
AuthorDate: Tue, 7 Jul 2015 18:26:13 +0200
Committer:  Ingo Molnar <[email protected]>
CommitDate: Wed, 8 Jul 2015 11:18:34 +0200

x86/irq: Hide 'HYP:' line in /proc/interrupts when not on Xen/Hyper-V

Hypervisor callback interrupts are only accounted on Xen/Hyper-V. There is no point in having always-zero HYP: line on other hypervisors or bare metal. Print the line only if HYPERVISOR_CALLBACK_VECTOR was allocated.

---
 arch/x86/kernel/irq.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)
arch/x86/kernel/irq.c +7 -4
index 88b36648..5b53747 100644
@@ -139,10 +139,13 @@ int arch_show_interrupts(struct seq_file *p, int prec)
 	seq_puts(p, "  Machine check polls\n");
 #endif
 #if IS_ENABLED(CONFIG_HYPERV) || defined(CONFIG_XEN)
-	seq_printf(p, "%*s: ", prec, "HYP");
-	for_each_online_cpu(j)
-		seq_printf(p, "%10u ", irq_stats(j)->irq_hv_callback_count);
-	seq_puts(p, "  Hypervisor callback interrupts\n");
+	if (test_bit(HYPERVISOR_CALLBACK_VECTOR, used_vectors)) {
+		seq_printf(p, "%*s: ", prec, "HYP");
+		for_each_online_cpu(j)
+			seq_printf(p, "%10u ",
+				   irq_stats(j)->irq_hv_callback_count);
+		seq_puts(p, "  Hypervisor callback interrupts\n");
+	}
 #endif
 	seq_printf(p, "%*s: %10u\n", prec, "ERR", atomic_read(&irq_err_count));
 #if defined(CONFIG_X86_IO_APIC)