Fix ZPL Collectors after ZFS changes to sync flags and include files (#21)

Author: brad-lewis

bpf/estat/zpl.c

@@ -57,7 +57,7 @@ zfs_read_write_entry(io_info_t *info, struct inode *ip, uio_t *uio, int flags)
 	info->start_time = bpf_ktime_get_ns();
 	info->bytes = uio->uio_resid;
 	info->is_sync =
-	    z_os->os_sync == ZFS_SYNC_ALWAYS || (flags & (FSYNC | FDSYNC));
+	    z_os->os_sync == ZFS_SYNC_ALWAYS || (flags & (O_SYNC | O_DSYNC));
 
 	u32 tid = bpf_get_current_pid_tgid();
 	io_info_t *infop = io_info_map.lookup(&tid);

bpf/stbtrace/zpl.st

@@ -172,8 +172,12 @@ 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"])
+b = BPF(text=bpf_text, cflags=["-include",
+                               "/usr/src/zfs-" + KVER + "/zfs_config.h",
+                               "-include",
+                               "/usr/src/zfs-" + KVER + "/include/spl/sys/types.h",
+                               "-I/usr/src/zfs-" + KVER + "/include/",
+                               "-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")

cmd/estat.py

@@ -383,6 +383,8 @@ class Args:
 KVER = os.popen('uname -r').read().rstrip()
 cflags = ["-include",
           "/usr/src/zfs-" + KVER + "/zfs_config.h",
+          "-include",
+          "/usr/src/zfs-" + KVER + "/include/spl/sys/types.h",
           "-I/usr/src/zfs-" + KVER + "/include/",
           "-I/usr/src/zfs-" + KVER + "/include/spl"]
 if script_arg: