tools: prepare block tools for the removing of legacy I/O path (iovis…

…or#2070) Recent -next kernels don't have blk_start_request() function anymore. It has been removed in a recent cleanup. bio* tools should be able to handle the lack of this probe.
nanshuaibo · Dec 10, 2018 · 74e25ed · 74e25ed
1 parent 218f748
commit 74e25ed
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/tools/biolatency.py b/tools/biolatency.py
@@ -116,7 +116,8 @@
 if args.queued:
  b.attach_kprobe(event="blk_account_io_start", fn_name="trace_req_start")
 else:
- b.attach_kprobe(event="blk_start_request", fn_name="trace_req_start")
+ if BPF.get_kprobe_functions(b'blk_start_request'):
+ b.attach_kprobe(event="blk_start_request", fn_name="trace_req_start")
  b.attach_kprobe(event="blk_mq_start_request", fn_name="trace_req_start")
 b.attach_kprobe(event="blk_account_io_completion",
  fn_name="trace_req_completion")

diff --git a/tools/biosnoop.py b/tools/biosnoop.py
@@ -122,7 +122,8 @@
 }
 """, debug=0)
 b.attach_kprobe(event="blk_account_io_start", fn_name="trace_pid_start")
-b.attach_kprobe(event="blk_start_request", fn_name="trace_req_start")
+if BPF.get_kprobe_functions(b'blk_start_request'):
+ b.attach_kprobe(event="blk_start_request", fn_name="trace_req_start")
 b.attach_kprobe(event="blk_mq_start_request", fn_name="trace_req_start")
 b.attach_kprobe(event="blk_account_io_completion",
  fn_name="trace_req_completion")

diff --git a/tools/biotop.py b/tools/biotop.py
@@ -173,7 +173,8 @@ def signal_ignore(signal, frame):
 
 b = BPF(text=bpf_text)
 b.attach_kprobe(event="blk_account_io_start", fn_name="trace_pid_start")
-b.attach_kprobe(event="blk_start_request", fn_name="trace_req_start")
+if BPF.get_kprobe_functions(b'blk_start_request'):
+ b.attach_kprobe(event="blk_start_request", fn_name="trace_req_start")
 b.attach_kprobe(event="blk_mq_start_request", fn_name="trace_req_start")
 b.attach_kprobe(event="blk_account_io_completion",
  fn_name="trace_req_completion")