hardirqs: Migrate to kernel tracepoint
The hardirqs tool is not working properly in recent kernels.
This commit migrates hardirqs to use kernel tracepoints
instead of kprobes, just as we already made to softirqs.
Signed-off-by: Hengqi Chen <chenhengqi@outlook.com>
diff --git a/man/man8/hardirqs.8 b/man/man8/hardirqs.8
index 8e7237a..12ae6be 100644
--- a/man/man8/hardirqs.8
+++ b/man/man8/hardirqs.8
@@ -9,9 +9,10 @@
summary of this time is shown by the %irq column of mpstat(1), and event
counts (but not times) are shown by /proc/interrupts.
-WARNING: This currently uses dynamic tracing of hard interrupts. You should
-understand what this means before use. Try in a test environment. Future
-versions should switch to tracepoints.
+This tool uses the irq:irq_handler_entry and irq:irq_handler_exit kernel
+tracepoints, which is a stable tracing mechanism. BPF programs can attach to
+tracepoints from Linux 4.7 only. An older version of this tool is available
+in tools/old, and uses kprobes instead of tracepoints.
Since this uses BPF, only the root user can use this tool.
.SH REQUIREMENTS
@@ -90,6 +91,6 @@
.SH STABILITY
Unstable - in development.
.SH AUTHOR
-Brendan Gregg
+Brendan Gregg, Hengqi Chen
.SH SEE ALSO
softirqs(8)
diff --git a/tests/python/test_tools_smoke.py b/tests/python/test_tools_smoke.py
index 9222e37..5c01642 100755
--- a/tests/python/test_tools_smoke.py
+++ b/tests/python/test_tools_smoke.py
@@ -195,6 +195,7 @@
def test_gethostlatency(self):
self.run_with_int("gethostlatency.py")
+ @skipUnless(kernel_version_ge(4,7), "requires kernel >= 4.7")
def test_hardirqs(self):
self.run_with_duration("hardirqs.py 1 1")
diff --git a/tools/hardirqs.py b/tools/hardirqs.py
index fda804d..b60b63a 100755
--- a/tools/hardirqs.py
+++ b/tools/hardirqs.py
@@ -12,6 +12,7 @@
# Licensed under the Apache License, Version 2.0 (the "License")
#
# 19-Oct-2015 Brendan Gregg Created this.
+# 22-May-2021 Hengqi Chen Migrated to kernel tracepoints.
from __future__ import print_function
from bcc import BPF
@@ -70,61 +71,69 @@
char name[32];
u64 slot;
} irq_key_t;
+
+typedef struct irq_name {
+ char name[32];
+} irq_name_t;
+
BPF_HASH(start, u32);
-BPF_HASH(irqdesc, u32, struct irq_desc *);
+BPF_HASH(irqnames, u32, irq_name_t);
BPF_HISTOGRAM(dist, irq_key_t);
+"""
-// count IRQ
-int count_only(struct pt_regs *ctx, struct irq_desc *desc)
+bpf_text_count = """
+TRACEPOINT_PROBE(irq, irq_handler_entry)
{
- u32 pid = bpf_get_current_pid_tgid();
-
- struct irqaction *action = desc->action;
- char *name = (char *)action->name;
-
irq_key_t key = {.slot = 0 /* ignore */};
- bpf_probe_read_kernel(&key.name, sizeof(key.name), name);
+ TP_DATA_LOC_READ_CONST(&key.name, name, sizeof(key.name));
dist.increment(key);
-
return 0;
}
+"""
-// time IRQ
-int trace_start(struct pt_regs *ctx, struct irq_desc *desc)
+bpf_text_time = """
+TRACEPOINT_PROBE(irq, irq_handler_entry)
{
- u32 pid = bpf_get_current_pid_tgid();
+ u32 tid = bpf_get_current_pid_tgid();
u64 ts = bpf_ktime_get_ns();
- start.update(&pid, &ts);
- irqdesc.update(&pid, &desc);
+ irq_name_t name = {};
+
+ TP_DATA_LOC_READ_CONST(&name.name, name, sizeof(name));
+ irqnames.update(&tid, &name);
+ start.update(&tid, &ts);
return 0;
}
-int trace_completion(struct pt_regs *ctx)
+TRACEPOINT_PROBE(irq, irq_handler_exit)
{
u64 *tsp, delta;
- struct irq_desc **descp;
- u32 pid = bpf_get_current_pid_tgid();
+ irq_name_t *namep;
+ u32 tid = bpf_get_current_pid_tgid();
// fetch timestamp and calculate delta
- tsp = start.lookup(&pid);
- descp = irqdesc.lookup(&pid);
- if (tsp == 0 || descp == 0) {
+ tsp = start.lookup(&tid);
+ namep = irqnames.lookup(&tid);
+ if (tsp == 0 || namep == 0) {
return 0; // missed start
}
- struct irq_desc *desc = *descp;
- struct irqaction *action = desc->action;
- char *name = (char *)action->name;
+
+ char *name = (char *)namep->name;
delta = bpf_ktime_get_ns() - *tsp;
// store as sum or histogram
STORE
- start.delete(&pid);
- irqdesc.delete(&pid);
+ start.delete(&tid);
+ irqnames.delete(&tid);
return 0;
}
"""
+if args.count:
+ bpf_text += bpf_text_count
+else:
+ bpf_text += bpf_text_time
+
# code substitutions
if args.dist:
bpf_text = bpf_text.replace('STORE',
@@ -144,14 +153,9 @@
# load BPF program
b = BPF(text=bpf_text)
-# these should really use irq:irq_handler_entry/exit tracepoints:
if args.count:
- b.attach_kprobe(event="handle_irq_event_percpu", fn_name="count_only")
print("Tracing hard irq events... Hit Ctrl-C to end.")
else:
- b.attach_kprobe(event="handle_irq_event_percpu", fn_name="trace_start")
- b.attach_kretprobe(event="handle_irq_event_percpu",
- fn_name="trace_completion")
print("Tracing hard irq event time... Hit Ctrl-C to end.")
# output
diff --git a/tools/old/hardirqs.py b/tools/old/hardirqs.py
new file mode 100755
index 0000000..fda804d
--- /dev/null
+++ b/tools/old/hardirqs.py
@@ -0,0 +1,180 @@
+#!/usr/bin/python
+# @lint-avoid-python-3-compatibility-imports
+#
+# hardirqs Summarize hard IRQ (interrupt) event time.
+# For Linux, uses BCC, eBPF.
+#
+# USAGE: hardirqs [-h] [-T] [-N] [-C] [-d] [interval] [outputs]
+#
+# Thanks Amer Ather for help understanding irq behavior.
+#
+# Copyright (c) 2015 Brendan Gregg.
+# Licensed under the Apache License, Version 2.0 (the "License")
+#
+# 19-Oct-2015 Brendan Gregg Created this.
+
+from __future__ import print_function
+from bcc import BPF
+from time import sleep, strftime
+import argparse
+
+# arguments
+examples = """examples:
+ ./hardirqs # sum hard irq event time
+ ./hardirqs -d # show hard irq event time as histograms
+ ./hardirqs 1 10 # print 1 second summaries, 10 times
+ ./hardirqs -NT 1 # 1s summaries, nanoseconds, and timestamps
+"""
+parser = argparse.ArgumentParser(
+ description="Summarize hard irq event time as histograms",
+ formatter_class=argparse.RawDescriptionHelpFormatter,
+ epilog=examples)
+parser.add_argument("-T", "--timestamp", action="store_true",
+ help="include timestamp on output")
+parser.add_argument("-N", "--nanoseconds", action="store_true",
+ help="output in nanoseconds")
+parser.add_argument("-C", "--count", action="store_true",
+ help="show event counts instead of timing")
+parser.add_argument("-d", "--dist", action="store_true",
+ help="show distributions as histograms")
+parser.add_argument("interval", nargs="?", default=99999999,
+ help="output interval, in seconds")
+parser.add_argument("outputs", nargs="?", default=99999999,
+ help="number of outputs")
+parser.add_argument("--ebpf", action="store_true",
+ help=argparse.SUPPRESS)
+args = parser.parse_args()
+countdown = int(args.outputs)
+if args.count and (args.dist or args.nanoseconds):
+ print("The --count option can't be used with time-based options")
+ exit()
+if args.count:
+ factor = 1
+ label = "count"
+elif args.nanoseconds:
+ factor = 1
+ label = "nsecs"
+else:
+ factor = 1000
+ label = "usecs"
+debug = 0
+
+# define BPF program
+bpf_text = """
+#include <uapi/linux/ptrace.h>
+#include <linux/irq.h>
+#include <linux/irqdesc.h>
+#include <linux/interrupt.h>
+
+typedef struct irq_key {
+ char name[32];
+ u64 slot;
+} irq_key_t;
+BPF_HASH(start, u32);
+BPF_HASH(irqdesc, u32, struct irq_desc *);
+BPF_HISTOGRAM(dist, irq_key_t);
+
+// count IRQ
+int count_only(struct pt_regs *ctx, struct irq_desc *desc)
+{
+ u32 pid = bpf_get_current_pid_tgid();
+
+ struct irqaction *action = desc->action;
+ char *name = (char *)action->name;
+
+ irq_key_t key = {.slot = 0 /* ignore */};
+ bpf_probe_read_kernel(&key.name, sizeof(key.name), name);
+ dist.increment(key);
+
+ return 0;
+}
+
+// time IRQ
+int trace_start(struct pt_regs *ctx, struct irq_desc *desc)
+{
+ u32 pid = bpf_get_current_pid_tgid();
+ u64 ts = bpf_ktime_get_ns();
+ start.update(&pid, &ts);
+ irqdesc.update(&pid, &desc);
+ return 0;
+}
+
+int trace_completion(struct pt_regs *ctx)
+{
+ u64 *tsp, delta;
+ struct irq_desc **descp;
+ u32 pid = bpf_get_current_pid_tgid();
+
+ // fetch timestamp and calculate delta
+ tsp = start.lookup(&pid);
+ descp = irqdesc.lookup(&pid);
+ if (tsp == 0 || descp == 0) {
+ return 0; // missed start
+ }
+ struct irq_desc *desc = *descp;
+ struct irqaction *action = desc->action;
+ char *name = (char *)action->name;
+ delta = bpf_ktime_get_ns() - *tsp;
+
+ // store as sum or histogram
+ STORE
+
+ start.delete(&pid);
+ irqdesc.delete(&pid);
+ return 0;
+}
+"""
+
+# code substitutions
+if args.dist:
+ bpf_text = bpf_text.replace('STORE',
+ 'irq_key_t key = {.slot = bpf_log2l(delta / %d)};' % factor +
+ 'bpf_probe_read_kernel(&key.name, sizeof(key.name), name);' +
+ 'dist.increment(key);')
+else:
+ bpf_text = bpf_text.replace('STORE',
+ 'irq_key_t key = {.slot = 0 /* ignore */};' +
+ 'bpf_probe_read_kernel(&key.name, sizeof(key.name), name);' +
+ 'dist.increment(key, delta);')
+if debug or args.ebpf:
+ print(bpf_text)
+ if args.ebpf:
+ exit()
+
+# load BPF program
+b = BPF(text=bpf_text)
+
+# these should really use irq:irq_handler_entry/exit tracepoints:
+if args.count:
+ b.attach_kprobe(event="handle_irq_event_percpu", fn_name="count_only")
+ print("Tracing hard irq events... Hit Ctrl-C to end.")
+else:
+ b.attach_kprobe(event="handle_irq_event_percpu", fn_name="trace_start")
+ b.attach_kretprobe(event="handle_irq_event_percpu",
+ fn_name="trace_completion")
+ print("Tracing hard irq event time... Hit Ctrl-C to end.")
+
+# output
+exiting = 0 if args.interval else 1
+dist = b.get_table("dist")
+while (1):
+ try:
+ sleep(int(args.interval))
+ except KeyboardInterrupt:
+ exiting = 1
+
+ print()
+ if args.timestamp:
+ print("%-8s\n" % strftime("%H:%M:%S"), end="")
+
+ if args.dist:
+ dist.print_log2_hist(label, "hardirq")
+ else:
+ print("%-26s %11s" % ("HARDIRQ", "TOTAL_" + label))
+ for k, v in sorted(dist.items(), key=lambda dist: dist[1].value):
+ print("%-26s %11d" % (k.name.decode('utf-8', 'replace'), v.value / factor))
+ dist.clear()
+
+ countdown -= 1
+ if exiting or countdown == 0:
+ exit()
