ctrliq · ciq-kernel-automation · Mar 5, 2026 · Mar 5, 2026 · Mar 5, 2026 · Mar 5, 2026
diff --git a/MAINTAINERS b/MAINTAINERS
@@ -9443,6 +9443,7 @@ T:	git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git
 F:	Documentation/filesystems/fuse.rst
 F:	fs/fuse/
 F:	include/uapi/linux/fuse.h
+F:	tools/testing/selftests/filesystems/fuse/
 
 FUTEX SUBSYSTEM
 M:	Thomas Gleixner <tglx@linutronix.de>

diff --git a/configs/kernel-aarch64-64k-debug-rhel.config b/configs/kernel-aarch64-64k-debug-rhel.config
@@ -2300,6 +2300,7 @@ CONFIG_FUNCTION_TRACER=y
 # CONFIG_FUN_ETH is not set
 CONFIG_FUSE_DAX=y
 CONFIG_FUSE_FS=m
+CONFIG_FUSE_IO_URING=y
 CONFIG_FUSE_PASSTHROUGH=y
 # CONFIG_FUSION_CTL is not set
 # CONFIG_FUSION_FC is not set

diff --git a/configs/kernel-aarch64-64k-rhel.config b/configs/kernel-aarch64-64k-rhel.config
@@ -2284,6 +2284,7 @@ CONFIG_FUNCTION_TRACER=y
 # CONFIG_FUN_ETH is not set
 CONFIG_FUSE_DAX=y
 CONFIG_FUSE_FS=m
+CONFIG_FUSE_IO_URING=y
 CONFIG_FUSE_PASSTHROUGH=y
 # CONFIG_FUSION_CTL is not set
 # CONFIG_FUSION_FC is not set

diff --git a/configs/kernel-aarch64-debug-rhel.config b/configs/kernel-aarch64-debug-rhel.config
@@ -2297,6 +2297,7 @@ CONFIG_FUNCTION_TRACER=y
 # CONFIG_FUN_ETH is not set
 CONFIG_FUSE_DAX=y
 CONFIG_FUSE_FS=m
+CONFIG_FUSE_IO_URING=y
 CONFIG_FUSE_PASSTHROUGH=y
 # CONFIG_FUSION_CTL is not set
 # CONFIG_FUSION_FC is not set

diff --git a/configs/kernel-aarch64-rhel.config b/configs/kernel-aarch64-rhel.config
@@ -2281,6 +2281,7 @@ CONFIG_FUNCTION_TRACER=y
 # CONFIG_FUN_ETH is not set
 CONFIG_FUSE_DAX=y
 CONFIG_FUSE_FS=m
+CONFIG_FUSE_IO_URING=y
 CONFIG_FUSE_PASSTHROUGH=y
 # CONFIG_FUSION_CTL is not set
 # CONFIG_FUSION_FC is not set

diff --git a/configs/kernel-aarch64-rt-64k-debug-rhel.config b/configs/kernel-aarch64-rt-64k-debug-rhel.config
@@ -2339,6 +2339,7 @@ CONFIG_FUNCTION_TRACER=y
 # CONFIG_FUN_ETH is not set
 CONFIG_FUSE_DAX=y
 CONFIG_FUSE_FS=m
+CONFIG_FUSE_IO_URING=y
 CONFIG_FUSE_PASSTHROUGH=y
 # CONFIG_FUSION_CTL is not set
 # CONFIG_FUSION_FC is not set

diff --git a/configs/kernel-aarch64-rt-64k-rhel.config b/configs/kernel-aarch64-rt-64k-rhel.config
@@ -2323,6 +2323,7 @@ CONFIG_FUNCTION_TRACER=y
 # CONFIG_FUN_ETH is not set
 CONFIG_FUSE_DAX=y
 CONFIG_FUSE_FS=m
+CONFIG_FUSE_IO_URING=y
 CONFIG_FUSE_PASSTHROUGH=y
 # CONFIG_FUSION_CTL is not set
 # CONFIG_FUSION_FC is not set

diff --git a/configs/kernel-aarch64-rt-debug-rhel.config b/configs/kernel-aarch64-rt-debug-rhel.config
@@ -2336,6 +2336,7 @@ CONFIG_FUNCTION_TRACER=y
 # CONFIG_FUN_ETH is not set
 CONFIG_FUSE_DAX=y
 CONFIG_FUSE_FS=m
+CONFIG_FUSE_IO_URING=y
 CONFIG_FUSE_PASSTHROUGH=y
 # CONFIG_FUSION_CTL is not set
 # CONFIG_FUSION_FC is not set

diff --git a/configs/kernel-aarch64-rt-rhel.config b/configs/kernel-aarch64-rt-rhel.config
@@ -2320,6 +2320,7 @@ CONFIG_FUNCTION_TRACER=y
 # CONFIG_FUN_ETH is not set
 CONFIG_FUSE_DAX=y
 CONFIG_FUSE_FS=m
+CONFIG_FUSE_IO_URING=y
 CONFIG_FUSE_PASSTHROUGH=y
 # CONFIG_FUSION_CTL is not set
 # CONFIG_FUSION_FC is not set

diff --git a/configs/kernel-x86_64-debug-rhel.config b/configs/kernel-x86_64-debug-rhel.config
@@ -2167,6 +2167,7 @@ CONFIG_FUNCTION_TRACER=y
 # CONFIG_FUN_ETH is not set
 CONFIG_FUSE_DAX=y
 CONFIG_FUSE_FS=m
+CONFIG_FUSE_IO_URING=y
 CONFIG_FUSE_PASSTHROUGH=y
 # CONFIG_FUSION_CTL is not set
 # CONFIG_FUSION_FC is not set

diff --git a/configs/kernel-x86_64-rhel.config b/configs/kernel-x86_64-rhel.config
@@ -2151,6 +2151,7 @@ CONFIG_FUNCTION_TRACER=y
 # CONFIG_FUN_ETH is not set
 CONFIG_FUSE_DAX=y
 CONFIG_FUSE_FS=m
+CONFIG_FUSE_IO_URING=y
 CONFIG_FUSE_PASSTHROUGH=y
 # CONFIG_FUSION_CTL is not set
 # CONFIG_FUSION_FC is not set

diff --git a/configs/kernel-x86_64-rt-debug-rhel.config b/configs/kernel-x86_64-rt-debug-rhel.config
@@ -2206,6 +2206,7 @@ CONFIG_FUNCTION_TRACER=y
 # CONFIG_FUN_ETH is not set
 CONFIG_FUSE_DAX=y
 CONFIG_FUSE_FS=m
+CONFIG_FUSE_IO_URING=y
 CONFIG_FUSE_PASSTHROUGH=y
 # CONFIG_FUSION_CTL is not set
 # CONFIG_FUSION_FC is not set

diff --git a/configs/kernel-x86_64-rt-rhel.config b/configs/kernel-x86_64-rt-rhel.config
@@ -2190,6 +2190,7 @@ CONFIG_FUNCTION_TRACER=y
 # CONFIG_FUN_ETH is not set
 CONFIG_FUSE_DAX=y
 CONFIG_FUSE_FS=m
+CONFIG_FUSE_IO_URING=y
 CONFIG_FUSE_PASSTHROUGH=y
 # CONFIG_FUSION_CTL is not set
 # CONFIG_FUSION_FC is not set

diff --git a/fs/fuse/Kconfig b/fs/fuse/Kconfig
@@ -63,3 +63,15 @@ config FUSE_PASSTHROUGH
 	  to be performed directly on a backing file.
 
 	  If you want to allow passthrough operations, answer Y.
+
+config FUSE_IO_URING
+	bool "FUSE communication over io-uring"
+	default y
+	depends on FUSE_FS
+	depends on IO_URING
+	help
+	  This allows sending FUSE requests over the io-uring interface and
+          also adds request core affinity.
+
+	  If you want to allow fuse server/client communication through io-uring,
+	  answer Y
diff --git a/fs/fuse/Makefile b/fs/fuse/Makefile
@@ -14,5 +14,6 @@ fuse-y := dev.o dir.o file.o inode.o control.o xattr.o acl.o readdir.o ioctl.o
 fuse-y += iomode.o
 fuse-$(CONFIG_FUSE_DAX) += dax.o
 fuse-$(CONFIG_FUSE_PASSTHROUGH) += passthrough.o
+fuse-$(CONFIG_FUSE_IO_URING) += dev_uring.o
 
 virtiofs-y := virtio_fs.o
diff --git a/fs/fuse/dax.c b/fs/fuse/dax.c
@@ -240,11 +240,12 @@ static int fuse_send_removemapping(struct inode *inode,
 
 	args.opcode = FUSE_REMOVEMAPPING;
 	args.nodeid = fi->nodeid;
-	args.in_numargs = 2;
-	args.in_args[0].size = sizeof(*inargp);
-	args.in_args[0].value = inargp;
-	args.in_args[1].size = inargp->count * sizeof(*remove_one);
-	args.in_args[1].value = remove_one;
+	args.in_numargs = 3;
+	fuse_set_zero_arg0(&args);
+	args.in_args[1].size = sizeof(*inargp);
+	args.in_args[1].value = inargp;
+	args.in_args[2].size = inargp->count * sizeof(*remove_one);
+	args.in_args[2].value = remove_one;
 	return fuse_simple_request(fm, &args);
 }