DLPX-78812 Disk IO analytics collector not running on aws

Author: brad-lewis

bpf/estat/backend-io.c

@@ -43,7 +43,7 @@ disk_io_start(struct pt_regs *ctx, struct request *reqp)
 	return (0);
 }
 
-// @@ kprobe|blk_account_io_completion|disk_io_done
+// @@ kprobe|blk_account_io_done|disk_io_done
 int
 disk_io_done(struct pt_regs *ctx, struct request *reqp)
 {

bpf/stbtrace/io.st

@@ -128,7 +128,10 @@ b = BPF(text=bpf_text)
 if BPF.get_kprobe_functions(b'blk_start_request'):
     b.attach_kprobe(event="blk_start_request", fn_name="disk_io_start")
 b.attach_kprobe(event="blk_mq_start_request", fn_name="disk_io_start")
-b.attach_kprobe(event="blk_account_io_completion", fn_name="disk_io_done")
+if BPF.get_kprobe_functions(b'blk_account_io_completion'):
+    b.attach_kprobe(event="blk_account_io_completion", fn_name="disk_io_done")
+else:
+    b.attach_kprobe(event="blk_account_io_done", fn_name="disk_io_done")
 
 
 helper = BCCHelper(b, BCCHelper.ANALYTICS_PRINT_MODE)