From: Jonathan Adams <jwadams@google.com>
To: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org
Cc: netdev@vger.kernel.org, kvm@vger.kernel.org,
Paolo Bonzini <pbonzini@redhat.com>,
Greg KH <gregkh@linuxfoundation.org>,
Jim Mattson <jmattson@google.com>,
David Rientjes <rientjes@google.com>,
Jonathan Adams <jwadams@google.com>
Subject: [RFC PATCH 6/7] core/metricfs: expose x86-specific irq information through metricfs
Date: Fri, 7 Aug 2020 14:29:15 -0700 [thread overview]
Message-ID: <20200807212916.2883031-7-jwadams@google.com> (raw)
In-Reply-To: <20200807212916.2883031-1-jwadams@google.com>
Add metricfs support for displaying percpu irq counters for x86.
The top directory is /sys/kernel/debug/metricfs/irq_x86.
Then there is a subdirectory for each x86-specific irq counter.
For example:
cat /sys/kernel/debug/metricfs/irq_x86/TLB/values
Signed-off-by: Jonathan Adams <jwadams@google.com>
---
jwadams@google.com: rebased to 5.8-pre6
This is work originally done by another engineer at
google, who would rather not have their name associated with
this patchset. They're okay with me sending it under my name.
---
arch/x86/kernel/irq.c | 80 +++++++++++++++++++++++++++++++++++++++++++
1 file changed, 80 insertions(+)
diff --git a/arch/x86/kernel/irq.c b/arch/x86/kernel/irq.c
index 181060247e3c..ffacbbc4066c 100644
--- a/arch/x86/kernel/irq.c
+++ b/arch/x86/kernel/irq.c
@@ -12,6 +12,7 @@
#include <linux/delay.h>
#include <linux/export.h>
#include <linux/irq.h>
+#include <linux/metricfs.h>
#include <asm/irq_stack.h>
#include <asm/apic.h>
@@ -374,3 +375,82 @@ void fixup_irqs(void)
}
}
#endif
+
+#ifdef CONFIG_METRICFS
+#define METRICFS_ITEM(name, field, desc) \
+static void \
+metricfs_##name(struct metric_emitter *e, int cpu) \
+{ \
+ int64_t v = irq_stats(cpu)->field; \
+ METRIC_EMIT_PERCPU_INT(e, cpu, v); \
+} \
+METRIC_EXPORT_PERCPU_COUNTER(name, desc, metricfs_##name)
+
+METRICFS_ITEM(NMI, __nmi_count, "Non-maskable interrupts");
+#ifdef CONFIG_X86_LOCAL_APIC
+METRICFS_ITEM(LOC, apic_timer_irqs, "Local timer interrupts");
+METRICFS_ITEM(SPU, irq_spurious_count, "Spurious interrupts");
+METRICFS_ITEM(PMI, apic_perf_irqs, "Performance monitoring interrupts");
+METRICFS_ITEM(IWI, apic_irq_work_irqs, "IRQ work interrupts");
+METRICFS_ITEM(RTR, icr_read_retry_count, "APIC ICR read retries");
+#endif
+METRICFS_ITEM(PLT, x86_platform_ipis, "Platform interrupts");
+#ifdef CONFIG_SMP
+METRICFS_ITEM(RES, irq_resched_count, "Rescheduling interrupts");
+METRICFS_ITEM(CAL, irq_call_count, "Function call interrupts");
+METRICFS_ITEM(TLB, irq_tlb_count, "TLB shootdowns");
+#endif
+#ifdef CONFIG_X86_THERMAL_VECTOR
+METRICFS_ITEM(TRM, irq_thermal_count, "Thermal event interrupts");
+#endif
+#ifdef CONFIG_X86_MCE_THRESHOLD
+METRICFS_ITEM(THR, irq_threshold_count, "Threshold APIC interrupts");
+#endif
+#ifdef CONFIG_X86_MCE_AMD
+METRICFS_ITEM(DFR, irq_deferred_error_count, "Deferred Error APIC interrupts");
+#endif
+#ifdef CONFIG_HAVE_KVM
+METRICFS_ITEM(PIN, kvm_posted_intr_ipis, "Posted-interrupt notification event");
+METRICFS_ITEM(PIW, kvm_posted_intr_wakeup_ipis,
+ "Posted-interrupt wakeup event");
+#endif
+
+static int __init init_irq_metricfs(void)
+{
+ struct metricfs_subsys *subsys;
+
+ subsys = metricfs_create_subsys("irq_x86", NULL);
+
+ metric_init_NMI(subsys);
+#ifdef CONFIG_X86_LOCAL_APIC
+ metric_init_LOC(subsys);
+ metric_init_SPU(subsys);
+ metric_init_PMI(subsys);
+ metric_init_IWI(subsys);
+ metric_init_RTR(subsys);
+#endif
+ metric_init_PLT(subsys);
+#ifdef CONFIG_SMP
+ metric_init_RES(subsys);
+ metric_init_CAL(subsys);
+ metric_init_TLB(subsys);
+#endif
+#ifdef CONFIG_X86_THERMAL_VECTOR
+ metric_init_TRM(subsys);
+#endif
+#ifdef CONFIG_X86_MCE_THRESHOLD
+ metric_init_THR(subsys);
+#endif
+#ifdef CONFIG_X86_MCE_AMD
+ metric_init_DFR(subsys);
+#endif
+#ifdef CONFIG_HAVE_KVM
+ metric_init_PIN(subsys);
+ metric_init_PIW(subsys);
+#endif
+
+ return 0;
+}
+module_init(init_irq_metricfs);
+
+#endif
--
2.28.0.236.gb10cc79966-goog
next prev parent reply other threads:[~2020-08-07 21:30 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-07 21:29 [RFC PATCH 0/7] metricfs metric file system and examples Jonathan Adams
2020-08-07 21:29 ` [RFC PATCH 1/7] core/metricfs: Create metricfs, standardized files under debugfs Jonathan Adams
2020-08-08 5:41 ` Greg KH
2020-08-07 21:29 ` [RFC PATCH 2/7] core/metricfs: add support for percpu metricfs files Jonathan Adams
2020-08-08 5:43 ` Greg KH
2020-08-07 21:29 ` [RFC PATCH 3/7] core/metricfs: metric for kernel warnings Jonathan Adams
2020-08-08 5:45 ` Greg KH
2020-08-07 21:29 ` [RFC PATCH 4/7] core/metricfs: expose softirq information through metricfs Jonathan Adams
2020-08-08 5:46 ` Greg KH
2020-08-07 21:29 ` [RFC PATCH 5/7] core/metricfs: expose scheduler stat " Jonathan Adams
2020-08-07 21:29 ` Jonathan Adams [this message]
2020-08-13 10:11 ` [RFC PATCH 6/7] core/metricfs: expose x86-specific irq " Thomas Gleixner
2020-08-13 11:47 ` Paolo Bonzini
2020-08-13 12:13 ` Thomas Gleixner
2020-08-13 14:10 ` Paolo Bonzini
2020-08-13 14:21 ` Thomas Gleixner
2020-08-07 21:29 ` [RFC PATCH 7/7] net-metricfs: Export /proc/net/dev via metricfs Jonathan Adams
2020-08-08 2:06 ` [RFC PATCH 0/7] metricfs metric file system and examples Andrew Lunn
2020-08-08 15:59 ` David Ahern
2020-08-10 18:20 ` Jakub Kicinski
2020-08-10 9:23 ` Pavel Machek
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=20200807212916.2883031-7-jwadams@google.com \
--to=jwadams@google.com \
--cc=gregkh@linuxfoundation.org \
--cc=jmattson@google.com \
--cc=kvm@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pbonzini@redhat.com \
--cc=rientjes@google.com \
/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;
as well as URLs for NNTP newsgroup(s).