Add support for fuse to fsdist and fsslower tools

Author: xixiliguo

libbpf-tools/.gitignore

@@ -28,6 +28,8 @@
 /fsdist
 /fsslower
 /funclatency
+/fusedist
+/fuseslower
 /futexctn
 /gethostlatency
 /hardirqs

libbpf-tools/Makefile

@@ -100,8 +100,8 @@ APPS = \
 # export variables that are used in Makefile.btfgen as well.
 export OUTPUT BPFTOOL ARCH BTFHUB_ARCHIVE APPS
 
-FSDIST_ALIASES = btrfsdist ext4dist nfsdist xfsdist f2fsdist bcachefsdist zfsdist
-FSSLOWER_ALIASES = btrfsslower ext4slower nfsslower xfsslower f2fsslower bcachefsslower zfsslower
+FSDIST_ALIASES = btrfsdist ext4dist fusedist nfsdist xfsdist f2fsdist bcachefsdist zfsdist
+FSSLOWER_ALIASES = btrfsslower ext4slower fuseslower nfsslower xfsslower f2fsslower bcachefsslower zfsslower
 SIGSNOOP_ALIAS = killsnoop
 APP_ALIASES = $(FSDIST_ALIASES) $(FSSLOWER_ALIASES) ${SIGSNOOP_ALIAS}
 

libbpf-tools/fsdist.c

@@ -34,6 +34,7 @@ enum fs_type {
 	NONE,
 	BTRFS,
 	EXT4,
+	FUSE,
 	NFS,
 	XFS,
 	F2FS,
@@ -59,6 +60,13 @@ static struct fs_config {
 		[F_FSYNC] = "ext4_sync_file",
 		[F_GETATTR] = "ext4_file_getattr",
 	}},
+	[FUSE] = { "fuse", {
+		[F_READ] = "fuse_file_read_iter",
+		[F_WRITE] = "fuse_file_write_iter",
+		[F_OPEN] = "fuse_open",
+		[F_FSYNC] = "fuse_fsync",
+		[F_GETATTR] = "fuse_getattr",
+	}},
 	[NFS] = { "nfs", {
 		[F_READ] = "nfs_file_read",
 		[F_WRITE] = "nfs_file_write",
@@ -134,7 +142,7 @@ static const struct argp_option opts[] = {
 	{ "timestamp", 'T', NULL, 0, "Print timestamp", 0 },
 	{ "milliseconds", 'm', NULL, 0, "Millisecond histogram", 0 },
 	{ "pid", 'p', "PID", 0, "Process ID to trace", 0 },
-	{ "type", 't', "Filesystem", 0, "Which filesystem to trace, [btrfs/ext4/nfs/xfs/f2fs/bcachefs/zfs]", 0 },
+	{ "type", 't', "Filesystem", 0, "Which filesystem to trace, [btrfs/ext4/fuse/nfs/xfs/f2fs/bcachefs/zfs]", 0 },
 	{ "verbose", 'v', NULL, 0, "Verbose debug output", 0 },
 	{ NULL, 'h', NULL, OPTION_HIDDEN, "Show the full help", 0 },
 	{},
@@ -159,6 +167,8 @@ static error_t parse_arg(int key, char *arg, struct argp_state *state)
 			fs_type = BTRFS;
 		} else if (!strcmp(arg, "ext4")) {
 			fs_type = EXT4;
+		} else if (!strcmp(arg, "fuse")) {
+			fs_type = FUSE;
 		} else if (!strcmp(arg, "nfs")) {
 			fs_type = NFS;
 		} else if (!strcmp(arg, "xfs")) {
@@ -219,6 +229,8 @@ static void alias_parse(char *prog)
 		fs_type = BTRFS;
 	} else if (strstr(name, "ext4dist")) {
 		fs_type = EXT4;
+	} else if (strstr(name, "fusedist")) {
+		fs_type = FUSE;
 	} else if (strstr(name, "nfsdist")) {
 		fs_type = NFS;
 	} else if (strstr(name, "xfsdist")) {

libbpf-tools/fsslower.c

@@ -37,6 +37,7 @@ enum fs_type {
 	NONE,
 	BTRFS,
 	EXT4,
+	FUSE,
 	NFS,
 	XFS,
 	F2FS,
@@ -60,6 +61,12 @@ static struct fs_config {
 		[F_OPEN] = "ext4_file_open",
 		[F_FSYNC] = "ext4_sync_file",
 	}},
+	[FUSE] = { "fuse", {
+		[F_READ] = "fuse_file_read_iter",
+		[F_WRITE] = "fuse_file_write_iter",
+		[F_OPEN] = "fuse_open",
+		[F_FSYNC] = "fuse_fsync",
+	}},
 	[NFS] = { "nfs", {
 		[F_READ] = "nfs_file_read",
 		[F_WRITE] = "nfs_file_write",
@@ -127,7 +134,7 @@ static const struct argp_option opts[] = {
 	{ "duration", 'd', "DURATION", 0, "Total duration of trace in seconds", 0 },
 	{ "pid", 'p', "PID", 0, "Process ID to trace", 0 },
 	{ "min", 'm', "MIN", 0, "Min latency to trace, in ms (default 10)", 0 },
-	{ "type", 't', "Filesystem", 0, "Which filesystem to trace, [btrfs/ext4/nfs/xfs/f2fs/bcachefs/zfs]", 0 },
+	{ "type", 't', "Filesystem", 0, "Which filesystem to trace, [btrfs/ext4/fuse/nfs/xfs/f2fs/bcachefs/zfs]", 0 },
 	{ "verbose", 'v', NULL, 0, "Verbose debug output", 0 },
 	{ NULL, 'h', NULL, OPTION_HIDDEN, "Show the full help", 0 },
 	{},
@@ -162,6 +169,8 @@ static error_t parse_arg(int key, char *arg, struct argp_state *state)
 			fs_type = BTRFS;
 		} else if (!strcmp(arg, "ext4")) {
 			fs_type = EXT4;
+		} else if (!strcmp(arg, "fuse")) {
+			fs_type = FUSE;
 		} else if (!strcmp(arg, "nfs")) {
 			fs_type = NFS;
 		} else if (!strcmp(arg, "xfs")) {
@@ -202,6 +211,8 @@ static void alias_parse(char *prog)
 		fs_type = BTRFS;
 	} else if (strstr(name, "ext4slower")) {
 		fs_type = EXT4;
+	} else if (strstr(name, "fuseslower")) {
+		fs_type = FUSE;
 	} else if (strstr(name, "nfsslower")) {
 		fs_type = NFS;
 	} else if (strstr(name, "xfsslower")) {