From: Vitaly Kuznetsov <vkuznets@redhat.com>
To: x86@kernel.org
Cc: "Thomas Gleixner" <tglx@linutronix.de>,
"Ingo Molnar" <mingo@redhat.com>,
"H. Peter Anvin" <hpa@zytor.com>,
linux-kernel@vger.kernel.org, "Radim Krčmář" <rkrcmar@redhat.com>,
"Andrew Jones" <drjones@redhat.com>
Subject: [PATCH] x86/irq: hide HYP in /proc/interrupts when not on Xen/Hyper-V
Date: Fri, 3 Jul 2015 13:27:14 +0200 [thread overview]
Message-ID: <1435922834-417-1-git-send-email-vkuznets@redhat.com> (raw)
Hypervisor callback interrupts are only accounted on Xen/Hyper-V and we
detect hypervisor's type in early boot. There is no point in having
always-zero HYP: line on other hypervisors or bare metal.
Suggested-by: Radim Krčmář <rkrcmar@redhat.com>
Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>
---
arch/x86/kernel/irq.c | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/arch/x86/kernel/irq.c b/arch/x86/kernel/irq.c
index 88b36648..0c82064 100644
--- a/arch/x86/kernel/irq.c
+++ b/arch/x86/kernel/irq.c
@@ -18,6 +18,7 @@
#include <asm/mce.h>
#include <asm/hw_irq.h>
#include <asm/desc.h>
+#include <asm/hypervisor.h>
#define CREATE_TRACE_POINTS
#include <asm/trace/irq_vectors.h>
@@ -139,10 +140,14 @@ 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 (x86_hyper == &x86_hyper_ms_hyperv ||
+ x86_hyper == &x86_hyper_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");
+ }
#endif
seq_printf(p, "%*s: %10u\n", prec, "ERR", atomic_read(&irq_err_count));
#if defined(CONFIG_X86_IO_APIC)
--
2.4.3
next reply other threads:[~2015-07-03 11:27 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-03 11:27 Vitaly Kuznetsov [this message]
2015-07-04 8:26 ` Ingo Molnar
2015-07-06 13:57 ` Andrew Jones
2015-07-06 14:24 ` Andrew Jones
2015-07-06 15:02 ` Boris Ostrovsky
2015-07-07 12:40 ` Vitaly Kuznetsov
2015-07-07 12:54 ` Ingo Molnar
2015-07-07 13:45 ` Vitaly Kuznetsov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1435922834-417-1-git-send-email-vkuznets@redhat.com \
--to=vkuznets@redhat.com \
--cc=drjones@redhat.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=rkrcmar@redhat.com \
--cc=tglx@linutronix.de \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome