Merge pull request iovisor#3827 from htejun/fix-biolatpcts-build

biolatpcts: Build fixes on recent kernels
yingtaojuzi · Jan 27, 2022 · d89bb79 · d89bb79
2 parents b1d8796 + 11614bc
commit d89bb79
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/examples/tracing/biolatpcts.py b/examples/tracing/biolatpcts.py
@@ -11,6 +11,7 @@
 
 bpf_source = """
 #include <linux/blk_types.h>
+#include <linux/blk-mq.h>
 #include <linux/blkdev.h>
 #include <linux/time64.h>
 
@@ -45,7 +46,10 @@
 """
 
 bpf = BPF(text=bpf_source)
-bpf.attach_kprobe(event='blk_account_io_done', fn_name='kprobe_blk_account_io_done')
+if BPF.get_kprobe_functions(b'__blk_account_io_done'):
+ bpf.attach_kprobe(event="__blk_account_io_done", fn_name="kprobe_blk_account_io_done")
+else:
+ bpf.attach_kprobe(event="blk_account_io_done", fn_name="kprobe_blk_account_io_done")
 
 cur_lat_100ms = bpf['lat_100ms']
 cur_lat_1ms = bpf['lat_1ms']

diff --git a/tools/biolatpcts.py b/tools/biolatpcts.py
@@ -56,6 +56,7 @@
 bpf_source = """
 #include <linux/blk_types.h>
 #include <linux/blkdev.h>
+#include <linux/blk-mq.h>
 #include <linux/time64.h>
 
 BPF_PERCPU_ARRAY(rwdf_100ms, u64, 400);