DLPX-72556 estat warning messages (delphix#52)

brad-lewis · Feb 3, 2021 · ccd9920 · ccd9920
1 parent 43b0a65
commit ccd9920
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 9 deletions.
diff --git a/bpf/standalone/arc_prefetch.py b/bpf/standalone/arc_prefetch.py
@@ -270,7 +270,6 @@ class ArcLatencyIndex(BCCMapIndex):
          "-I/usr/src/zfs-" + KVER + "/include/",
          "-I/usr/src/zfs-" + KVER + "/include/spl/",
          "-I/usr/src/zfs-" + KVER + "/include/linux",
-         "-DCC_USING_FENTRY",
          "-DNCOUNT_INDEX=" + str(len(ArcCountIndex)),
          "-DNAVERAGE_INDEX=" + str(len(ArcLatencyIndex))] \
          + ArcCountIndex.getCDefinitions() \

diff --git a/bpf/standalone/txg.py b/bpf/standalone/txg.py
@@ -349,8 +349,7 @@ def print_event(cpu, data, size):
                 "-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",
-                "-DCC_USING_FENTRY"])
+                "-I/usr/src/zfs-" + KVER + "/include/linux"])
 
 b.attach_kprobe(event="spa_sync", fn_name="spa_sync_entry")
 b.attach_kretprobe(event="spa_sync", fn_name="spa_sync_return")

diff --git a/bpf/stbtrace/zio.st b/bpf/stbtrace/zio.st
@@ -130,8 +130,7 @@ 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",
-                               "-DCC_USING_FENTRY"])
+                               "-I/usr/src/zfs-" + KVER + "/include/linux"])
 
 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,8 +178,7 @@ 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/",
-                "-DCC_USING_FENTRY"])
+                "-I/usr/src/zfs-" + KVER + "/include/spl/"])
 
 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
@@ -394,8 +394,7 @@ 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",
-          "-DCC_USING_FENTRY"]
+          "-I/usr/src/zfs-" + KVER + "/include/spl"]
 if script_arg:
     cflags.append("-DOPTARG=\"" + script_arg + "\"")