From ccd99203264095da1a0c37f49dffbe0d1e79e61b Mon Sep 17 00:00:00 2001 From: Brad Lewis Date: Mon, 2 Nov 2020 10:35:17 -0700 Subject: [PATCH] DLPX-72556 estat warning messages (#52) --- bpf/standalone/arc_prefetch.py | 1 - bpf/standalone/txg.py | 3 +-- bpf/stbtrace/zio.st | 3 +-- bpf/stbtrace/zpl.st | 3 +-- cmd/estat.py | 3 +-- 5 files changed, 4 insertions(+), 9 deletions(-) diff --git a/bpf/standalone/arc_prefetch.py b/bpf/standalone/arc_prefetch.py index 768f7b1..3c82019 100755 --- 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 index 5ca0262..583ee91 100755 --- 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 index d4115a8..f09eb7d 100644 --- 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 index a22e91f..c10e918 100644 --- 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 index 25e61d1..c0d9e16 100755 --- 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 + "\"")