DLPX-96701 estat commands are failing with redefinition and forward declaration errors

PR URL: https://www.github.com/delphix/performance-diagnostics/pull/115

Author: tonynguien

bpf/estat/nfs.c

@@ -4,10 +4,6 @@
  * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
-struct bpf_wq {
-	__u64 __opaque[2];
-} __attribute__((aligned(8)));
-
 #include <uapi/linux/ptrace.h>
 #include <linux/bpf_common.h>
 #include <uapi/linux/bpf.h>

bpf/estat/zvol.c

@@ -40,12 +40,6 @@ typedef struct {
 	zvol_state_t *zv;
 } zvol_data_t;
 
-typedef struct zv_request {
-	zvol_state_t	*zv;
-	struct bio	*bio;
-} zv_request_t;
-
-
 BPF_HASH(zvol_base_data, u32, zvol_data_t);
 
 static inline bool equal_to_pool(char *str)

bpf/standalone/arc_prefetch.py

@@ -270,6 +270,8 @@ class ArcLatencyIndex(BCCMapIndex):
          "-I/usr/src/zfs-" + KVER + "/include/",
          "-I/usr/src/zfs-" + KVER + "/include/spl/",
          "-I/usr/src/zfs-" + KVER + "/include/linux",
+         "-D__KERNEL__",
+         "-D_KERNEL",
          "-DNCOUNT_INDEX=" + str(len(ArcCountIndex)),
          "-DNAVERAGE_INDEX=" + str(len(ArcLatencyIndex))] \
          + ArcCountIndex.getCDefinitions() \

bpf/standalone/txg.py

@@ -349,7 +349,8 @@ 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"])
+                "-I/usr/src/zfs-" + KVER + "/include/linux",
+                "-D__KERNEL__", "-D_KERNEL"])
 
 b.attach_kprobe(event="spa_sync", fn_name="spa_sync_entry")
 b.attach_kretprobe(event="spa_sync", fn_name="spa_sync_return")

bpf/standalone/zil.py

@@ -48,7 +48,7 @@
         description='Collect zil latency statistics.',
         usage='estat zil [options]')
 parser.add_argument('-c', '--coll', type=int, action='store',
-                    dest='collection_sec',
+                    dest='collection_sec', default=60,
                     help='The collection interval in seconds')
 parser.add_argument('-p', '--pool', type=str, action='store',
                     dest='pool',
@@ -319,7 +319,8 @@
                 "-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",
+                "-D__KERNEL__", "-D_KERNEL"])
 
 b.attach_kprobe(event="zfs_write", fn_name="zfs_write_entry")
 b.attach_kretprobe(event="zfs_write", fn_name="zfs_write_return")
@@ -337,8 +338,6 @@
                    fn_name="zil_commit_waiter_return")
 b.attach_kretprobe(event="zio_alloc_zil",
                    fn_name="zio_alloc_zil_return")
-b.attach_kprobe(event="zil_commit_waiter_skip",
-                fn_name="zil_commit_waiter_skip_entry")
 b.attach_kprobe(event="zil_commit_writer_stall",
                 fn_name="zil_commit_writer_stall_entry")
 
@@ -354,25 +353,13 @@
                                   BCCHelper.COUNT_AGGREGATION, "count")
 call_count_helper.add_key_type("name")
 
-if (not args.collection_sec):
-    print(" Tracing enabled... Hit Ctrl-C to end.")
-
-# Collect data for a collection interval if specified
-if (args.collection_sec):
-    sleep(args.collection_sec)
-    try:
-        print("%-16s\n" % strftime("%D - %H:%M:%S %Z"))
-        latency_helper.printall()
-        call_count_helper.printall()
-        exit(0)
-    except Exception as e:
-        print(str(e))
-        exit(0)
-
-# Collect data until keyborad interrupt with output for each second
+#
+# Collect data until keyborad interrupt
+#
+print(" Tracing enabled... Hit Ctrl-C to end.")
 while True:
     try:
-        sleep(60)
+        sleep(args.collection_sec)
     except KeyboardInterrupt:
         print("%-16s\n" % strftime("%D - %H:%M:%S %Z"))
         latency_helper.printall()

bpf/stbtrace/nfs.st

@@ -24,10 +24,6 @@ from bcchelper import BCCHelper   # noqa: E402
 bpf_text = '#include "' + base_dir + 'lib/bcc_helper.h' + '"\n'
 bpf_text += """
 
-struct bpf_wq {
-	__u64 __opaque[2];
-} __attribute__((aligned(8)));
-
 #include <uapi/linux/ptrace.h>
 #include <linux/bpf_common.h>
 #include <uapi/linux/bpf.h>

cmd/estat.py

@@ -110,8 +110,10 @@ def die(*args, **kwargs):
   estat zil [POOL]
       Provides a breakdown of time spent doing ZIL-related activities, in
       particular the time spent allocating a block and time spent waiting for
-      the write I/O to complete. If POOL is not specified, defaults to tracing
-      the pool 'domain0'.
+      the write I/O to complete.
+      -h          show txg help message and exit
+      -c INTERVAL set the collection interval in seconds
+      -p POOL     set the pool to monitor (default: domain0)
 """
 
 
@@ -406,7 +408,9 @@ 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",
+          "-D__KERNEL__",
+          "-D_KERNEL"]
 if script_arg:
     cflags.append("-DOPTARG=\"" + script_arg + "\"")