DLPX-78888 [Backport of DLPX-78812 to 6.0.12] Disk IO analytics collector not running on aws (#75)

brad-lewis · web-flow · commit 2bb739db89d3 · 2021-12-22T09:33:35.000-07:00
diff --git a/bpf/estat/backend-io.c b/bpf/estat/backend-io.c
@@ -44,7 +44,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)
 {
diff --git a/bpf/stbtrace/io.st b/bpf/stbtrace/io.st
@@ -128,7 +128,7 @@ 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")
+b.attach_kprobe(event="blk_account_io_done", fn_name="disk_io_done")
 
 
 helper = BCCHelper(b, BCCHelper.ANALYTICS_PRINT_MODE)

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ disk_io_start(struct pt_regs ctx, struct request reqp)`
`44`	`44`	`return (0);`
`45`	`45`	`}`
`46`	`46`
`47`		`-// @@ kprobe\|blk_account_io_completion\|disk_io_done`
	`47`	`+// @@ kprobe\|blk_account_io_done\|disk_io_done`
`48`	`48`	`int`
`49`	`49`	`disk_io_done(struct pt_regs ctx, struct request reqp)`
`50`	`50`	`{`