Compilation failures due to fentry issue

delphix · Jan 31, 2020 · 9ec4410 · 9ec4410
1 parent 3f6c4b1
commit 9ec4410
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/bpf/standalone/zil.py b/bpf/standalone/zil.py
@@ -259,7 +259,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
@@ -130,7 +130,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")

diff --git a/bpf/stbtrace/zpl.st b/bpf/stbtrace/zpl.st
@@ -178,7 +178,8 @@ b = BPF(text=bpf_text,
                 "-include",
                 "/usr/src/zfs-" + KVER + "/include/spl/sys/types.h",
                 "-I/usr/src/zfs-" + KVER + "/include/",
-                "-I/usr/src/zfs-" + KVER + "/include/spl/"])
+                "-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
@@ -386,7 +386,8 @@ class Args:
           "-include",
           "/usr/src/zfs-" + KVER + "/include/spl/sys/types.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 + "\"")