From 9cf16a2134f5276a1bb6a2abdd9c1efe011a86d6 Mon Sep 17 00:00:00 2001 From: Don Brady Date: Thu, 14 May 2020 13:45:29 -0600 Subject: [PATCH] Compilation failures due to fentry issue [Backport of #33 to 6.0.3.0] (#47) Co-authored-by: Brad Lewis --- bpf/standalone/zil.py | 3 ++- bpf/stbtrace/zio.st | 3 ++- bpf/stbtrace/zpl.st | 3 ++- cmd/estat.py | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/bpf/standalone/zil.py b/bpf/standalone/zil.py index 14003d9..46d9ec8 100755 --- a/bpf/standalone/zil.py +++ b/bpf/standalone/zil.py @@ -260,7 +260,8 @@ "-I/usr/src/zfs-" + KVER + "/include/", "-I/usr/src/zfs-" + KVER + "/include/spl", "-I/usr/src/zfs-" + KVER + "/include/", - "-I/usr/src/zfs-" + KVER + "/include/linux"]) + "-I/usr/src/zfs-" + KVER + "/include/linux", + "-DCC_USING_FENTRY"]) b.attach_kprobe(event="zfs_write", fn_name="zfs_write_entry") b.attach_kretprobe(event="zfs_write", fn_name="zfs_write_return") diff --git a/bpf/stbtrace/zio.st b/bpf/stbtrace/zio.st index 7248439..57babe0 100644 --- a/bpf/stbtrace/zio.st +++ b/bpf/stbtrace/zio.st @@ -132,7 +132,8 @@ b = BPF(text=bpf_text, cflags=["-include", "/usr/src/zfs-" + KVER + "/zfs_config.h", "-I/usr/src/zfs-" + KVER + "/include/", "-I/usr/src/zfs-" + KVER + "/include/spl/", - "-I/usr/src/zfs-" + KVER + "/include/linux"]) + "-I/usr/src/zfs-" + KVER + "/include/linux", + "-DCC_USING_FENTRY"]) b.attach_kretprobe(event="vdev_queue_io_to_issue", fn_name="vdev_queue_issue_return") b.attach_kprobe(event="vdev_queue_io_done", fn_name="vdev_queue_done") diff --git a/bpf/stbtrace/zpl.st b/bpf/stbtrace/zpl.st index b1b8828..22ec052 100644 --- a/bpf/stbtrace/zpl.st +++ b/bpf/stbtrace/zpl.st @@ -173,7 +173,8 @@ int zfs_write_done(struct pt_regs *ctx) """ KVER = os.popen('uname -r').read().rstrip() b = BPF(text=bpf_text, - cflags=["-I/usr/src/zfs-" + KVER + "/include/spl"]) + cflags=["-I/usr/src/zfs-" + KVER + "/include/spl/", + "-DCC_USING_FENTRY"]) b.attach_kprobe(event="zfs_read", fn_name="zfs_read_start") b.attach_kprobe(event="zfs_write", fn_name="zfs_write_start") diff --git a/cmd/estat.py b/cmd/estat.py index 212f781..642b140 100755 --- a/cmd/estat.py +++ b/cmd/estat.py @@ -394,7 +394,8 @@ class Args: cflags = ["-include", "/usr/src/zfs-" + KVER + "/zfs_config.h", "-I/usr/src/zfs-" + KVER + "/include/", - "-I/usr/src/zfs-" + KVER + "/include/spl"] + "-I/usr/src/zfs-" + KVER + "/include/spl", + "-DCC_USING_FENTRY"] if script_arg: cflags.append("-DOPTARG=\"" + script_arg + "\"")