io_uring: add fremovexattr and flistxattr support
v3 cover io_uring: add fremovexattr and flistxattr support
This series completes io_uring's FD-based xattr operations by adding support for:
- IORING_OP_FREMOVEXATTR
- IORING_OP_FLISTXATTR
This allows asynchronous xattr removal and listing.
New test cases have been added to the liburing test suite (test/xattr.c) and verified to pass. A separate userspace patch implementing the matching prep helpers, sanitizers, and test cases is submitted in parallel.
- Patch 1 makes the necessary VFS-layer list/remove helpers non-static and declares them in fs/internal.h.
- Patch 2 implements the io_uring operational support (opcodes, opdefs, preparation, and issue handlers) and invokes these exposed helpers.
Changes since v2:
- Revert unnecessary formatting changes to filename_listxattr in Patch 1.
Changes since v1:
- Omit path-based opcodes to prioritize optimal FD-based variants.
- Limit exported VFS helpers to only file_listxattr and file_removexattr.
- Rewrite standalone test program into a standard liburing testcase.
Aditya Prakash Srivastava (2):
fs: make file_listxattr and file_removexattr helpers non-static
io_uring: add fremovexattr and flistxattr support
fs/internal.h | 2 + fs/xattr.c | 3 +- include/uapi/linux/io_uring.h | 2 + io_uring/opdef.c | 18 +++++++ io_uring/xattr.c | 74 +++++++++++++++++++++++++++++ io_uring/xattr.h | 6 +++ tools/include/uapi/linux/io_uring.h | 13 +++++ 7 files changed, 116 insertions(+), 2 deletions(-)
Signature · 1 line
2.47.3
PATCH v3 1/2 fs: make file_listxattr and file_removexattr helpers non-static
In preparation for adding IORING_OP_FREMOVEXATTR and IORING_OP_FLISTXATTR support in io_uring, we need to invoke the VFS-layer helpers from within io_uring.
Make the following helpers non-static and declare them in fs/internal.h:
- file_listxattr()
- file_removexattr()
No functional change is introduced.
--- fs/internal.h | 2 ++ fs/xattr.c | 3 +-- 2 files changed, 3 insertions(+), 2 deletions(-)
fs/internal.h +2 -0
@@ -297,6 +297,8 @@ int filename_setxattr(int dfd, struct filename *filename, unsigned int lookup_flags, struct kernel_xattr_ctx *ctx);int setxattr_copy (const char __user *name,struct kernel_xattr_ctx *ctx);int import_xattr_name (struct xattr_name *kname,const char __user *name); +ssize_t file_listxattr (struct file *f,char __user *list,size_t size); +int file_removexattr (struct file *f,struct xattr_name *kname);int may_write_xattr (struct mnt_idmap *idmap,struct inode *inode);
fs/xattr.c +1 -2
@@ -953,7 +953,6 @@ listxattr(struct dentry *d, char __user *list, size_t size)return error; } -static ssize_t file_listxattr (struct file *f,char __user *list,size_t size) {audit_file (f);
@@ -1036,7 +1035,7 @@ removexattr(struct mnt_idmap *idmap, struct dentry *d, const char *name)return vfs_removexattr (idmap, d, name); } -static int file_removexattr (struct file *f,struct xattr_name *kname) +int file_removexattr (struct file *f,struct xattr_name *kname) {int error =mnt_want_write_file (f);
Signature · 1 line
2.47.3
Re: [PATCH v3 1/2] fs: make file_listxattr and file_removexattr helpers non-static
Quoted 11 lines · Aditya Prakash Srivastava
In preparation for adding
IORING_OP_FREMOVEXATTRandIORING_OP_FLISTXATTRsupport inio_uring, we need to invoke the VFS-layer helpers from withinio_uring.Make the following helpers non-static and declare them in
fs/internal.h:
-file_listxattr()
-file_removexattr()No functional change is introduced.
Signed-off-by Aditya Prakash Srivastava <[email protected]>
Looks ok to me. Feel free to add:
Honza
Quoted 42 lines
--- fs/internal.h | 2 ++ fs/xattr.c | 3 +-- 2 files changed, 3 insertions(+), 2 deletions(-)fs/internal.h +2
-0@@ -297,6 +297,8 @@ int filename_setxattr(int dfd, struct filename *filename, unsigned int lookup_flags, struct kernel_xattr_ctx *ctx);int setxattr_copy (const char __user *name,struct kernel_xattr_ctx *ctx);int import_xattr_name (struct xattr_name *kname,const char __user *name); +ssize_t file_listxattr (struct file *f,char __user *list,size_t size); +int file_removexattr (struct file *f,struct xattr_name *kname);int may_write_xattr (struct mnt_idmap *idmap,struct inode *inode);fs/xattr.c +1
-2@@ -953,7 +953,6 @@ listxattr(struct dentry *d, char __user *list, size_t size)return error; } -static ssize_t file_listxattr (struct file *f,char __user *list,size_t size) {audit_file (f);@@ -1036,7 +1035,7 @@ removexattr(struct mnt_idmap *idmap, struct dentry *d, const char *name)return vfs_removexattr (idmap, d, name); } -static int file_removexattr (struct file *f,struct xattr_name *kname) +int file_removexattr (struct file *f,struct xattr_name *kname) {int error =mnt_want_write_file (f);Signature · 1 line
2.47.3
Signature · 2 lines
Jan Kara <[email protected]> SUSE Labs, CR
PATCH v3 2/2 io_uring: add fremovexattr and flistxattr support
In reply to Aditya Prakash SrivastavaAdd support for IORING_OP_FREMOVEXATTR and IORING_OP_FLISTXATTR. This enables xattr listing and removal operations to be executed in an asynchronous fashion.
--- include/uapi/linux/io_uring.h | 2 + io_uring/opdef.c | 18 +++++++ io_uring/xattr.c | 74 +++++++++++++++++++++++++++++ io_uring/xattr.h | 6 +++ tools/include/uapi/linux/io_uring.h | 13 +++++ 5 files changed, 113 insertions(+)
include/uapi/linux/io_uring.h +2 -0
@@ -318,6 +318,8 @@ enum io_uring_op {IORING_OP_PIPE ,IORING_OP_NOP128 ,IORING_OP_URING_CMD128 , +IORING_OP_FREMOVEXATTR , +IORING_OP_FLISTXATTR ,/* this goes last, obviously */ IORING_OP_LAST,
io_uring/opdef.c +18 -0
@@ -591,6 +591,16 @@ const struct io_issue_def io_issue_defs[] = { .prep = io_uring_cmd_prep, .issue = io_uring_cmd, }, + [IORING_OP_FREMOVEXATTR] = { + .needs_file = 1, + .prep = io_fremovexattr_prep, + .issue = io_fremovexattr, + }, + [IORING_OP_FLISTXATTR] = { + .needs_file = 1, + .prep = io_flistxattr_prep, + .issue = io_flistxattr, + }, };const struct io_cold_def io_cold_defs[] = {
@@ -849,6 +859,14 @@ const struct io_cold_def io_cold_defs[] = { .sqe_copy = io_uring_cmd_sqe_copy, .cleanup = io_uring_cmd_cleanup, }, + [IORING_OP_FREMOVEXATTR] = { + .name = "FREMOVEXATTR", + .cleanup = io_xattr_cleanup, + }, + [IORING_OP_FLISTXATTR] = { + .name = "FLISTXATTR", + .cleanup = io_xattr_cleanup, + }, };const char *io_uring_get_opcode (u8 opcode)
io_uring/xattr.c +74 -0
77 lines not on this page · raw message
io_uring/xattr.h +6 -0
@@ -13,3 +13,9 @@ int io_fgetxattr(struct io_kiocb *req, unsigned int issue_flags);int io_getxattr_prep (struct io_kiocb *req,const struct io_uring_sqe *sqe);int io_getxattr (struct io_kiocb *req,unsigned int issue_flags); + +int io_fremovexattr_prep (struct io_kiocb *req,const struct io_uring_sqe *sqe); +int io_fremovexattr (struct io_kiocb *req,unsigned int issue_flags); + +int io_flistxattr_prep (struct io_kiocb *req,const struct io_uring_sqe *sqe); +int io_flistxattr (struct io_kiocb *req,unsigned int issue_flags);
tools/include/uapi/linux/io_uring.h +13 -0
@@ -253,6 +253,19 @@ enum io_uring_op {IORING_OP_FUTEX_WAIT ,IORING_OP_FUTEX_WAKE ,IORING_OP_FUTEX_WAITV , +IORING_OP_FIXED_FD_INSTALL , +IORING_OP_FTRUNCATE , +IORING_OP_BIND , +IORING_OP_LISTEN , +IORING_OP_RECV_ZC , +IORING_OP_EPOLL_WAIT , +IORING_OP_READV_FIXED , +IORING_OP_WRITEV_FIXED , +IORING_OP_PIPE , +IORING_OP_NOP128 , +IORING_OP_URING_CMD128 , +IORING_OP_FREMOVEXATTR , +IORING_OP_FLISTXATTR ,/* this goes last, obviously */ IORING_OP_LAST,
Signature · 1 line
2.47.3
Quoted 5 lines · Aditya Prakash Srivastava
Add support for
IORING_OP_FREMOVEXATTRandIORING_OP_FLISTXATTR. This enables xattr listing and removal operations to be executed in an asynchronous fashion.
Hi,
Checking if there is any feedback/concern that needs to be addressed with this patch?
Regards,
Aditya
Quoted 5 lines · Aditya Prakash Srivastava
Add support for
IORING_OP_FREMOVEXATTRandIORING_OP_FLISTXATTR. This enables xattr listing and removal operations to be executed in an asynchronous fashion.Signed-off-by Aditya Prakash Srivastava <[email protected]>
Jens has made a point about avoiding new commands just punting to the wq at [1].[1] https://github.com/axboe/liburing/issues/1492#issuecomment-4683773809
In this case, we have an immediate issue for inline submission with acquiring the mount and the inode lock and there is no callbacks so we are not really in good shape to work around it. Beyond that...
Quoted 67 lines
--- include/uapi/linux/io_uring.h | 2 + io_uring/opdef.c | 18 +++++++ io_uring/xattr.c | 74 +++++++++++++++++++++++++++++ io_uring/xattr.h | 6 +++ tools/include/uapi/linux/io_uring.h | 13 +++++ 5 files changed, 113 insertions(+)include/uapi/linux/io_uring.h +2
-0@@ -318,6 +318,8 @@ enum io_uring_op {IORING_OP_PIPE ,IORING_OP_NOP128 ,IORING_OP_URING_CMD128 , +IORING_OP_FREMOVEXATTR , +IORING_OP_FLISTXATTR ,/* this goes last, obviously */ IORING_OP_LAST,io_uring/opdef.c +18
-0@@ -591,6 +591,16 @@ const struct io_issue_def io_issue_defs[] = { .prep = io_uring_cmd_prep, .issue = io_uring_cmd, }, + [IORING_OP_FREMOVEXATTR] = { + .needs_file = 1, + .prep = io_fremovexattr_prep, + .issue = io_fremovexattr, + }, + [IORING_OP_FLISTXATTR] = { + .needs_file = 1, + .prep = io_flistxattr_prep, + .issue = io_flistxattr, + }, };const struct io_cold_def io_cold_defs[] = {@@ -849,6 +859,14 @@ const struct io_cold_def io_cold_defs[] = { .sqe_copy = io_uring_cmd_sqe_copy, .cleanup = io_uring_cmd_cleanup, }, + [IORING_OP_FREMOVEXATTR] = { + .name = "FREMOVEXATTR", + .cleanup = io_xattr_cleanup, + }, + [IORING_OP_FLISTXATTR] = { + .name = "FLISTXATTR", + .cleanup = io_xattr_cleanup, + }, };const char *io_uring_get_opcode (u8 opcode)io_uring/xattr.c +2
-0@@ -195,3 +195,77 @@ int io_setxattr(struct io_kiocb *req, unsigned int issue_flags)io_xattr_finish (req, ret);return IOU_COMPLETE ; } + +int io_fremovexattr_prep (struct io_kiocb *req,const struct io_uring_sqe *sqe)
io_uring/xattr.c int io_setxattr(struct io_kiocb *req, unsigned int issue_flags) · line 209
Quoted 10 lines
io_uring/xattr.c +10
-0+{ + struct io_xattr *ix = io_kiocb_to_cmd(req, struct io_xattr); +const char __user *name; +int ret; + +INIT_DELAYED_FILENAME (&ix->filename); + name =u64_to_user_ptr (READ_ONCE (sqe->addr)); + +if (READ_ONCE (sqe->addr2) ||READ_ONCE (sqe->len) ||READ_ONCE (sqe->xattr_flags)) +return -EINVAL ;
There are more fields to be rejected here, check the latest patches from Yi Xie such as cc609376e9a4 ("io_uring/fs: check unused sqe fields for unlinkat").
io_uring/xattr.c int io_setxattr(struct io_kiocb *req, unsigned int issue_flags) · line 222
Quoted 13 lines
io_uring/xattr.c +13
-0+ + ix->ctx.kname =kmalloc_obj (*ix->ctx.kname); +if (!ix->ctx.kname) +return -ENOMEM ; + + ret =import_xattr_name (ix->ctx.kname, name); +if (ret) { +kfree (ix->ctx.kname); +return ret; + } + + req->flags |=REQ_F_NEED_CLEANUP ; + req->flags |=REQ_F_FORCE_ASYNC ;
This will cause the cleanup to call io_xattr_cleanup, which does kfree on ix->ctx.kvalue, which is never initialized. If it has garbage from a previous command in the kiocb cmd space, you can craft a corruption or, more likely, a crash.
Quoted 74 lines
io_uring/xattr.c +49
-0+return 0 ; +} + +int io_fremovexattr (struct io_kiocb *req,unsigned int issue_flags) +{ + struct io_xattr *ix = io_kiocb_to_cmd(req, struct io_xattr); +int ret; + +WARN_ON_ONCE (issue_flags &IO_URING_F_NONBLOCK ); + + ret =file_removexattr (req->file, ix->ctx.kname); +io_xattr_finish (req, ret); +return IOU_COMPLETE ; +} + +int io_flistxattr_prep (struct io_kiocb *req,const struct io_uring_sqe *sqe) +{ + struct io_xattr *ix = io_kiocb_to_cmd(req, struct io_xattr); + +INIT_DELAYED_FILENAME (&ix->filename); + ix->ctx.kname =NULL ; + ix->ctx.kvalue =NULL ; + +if (READ_ONCE (sqe->addr)) +return -EINVAL ; + + ix->ctx.value =u64_to_user_ptr (READ_ONCE (sqe->addr2)); + ix->ctx.size =READ_ONCE (sqe->len); + ix->ctx.flags =READ_ONCE (sqe->xattr_flags); + +if (ix->ctx.flags) +return -EINVAL ; + + req->flags |=REQ_F_NEED_CLEANUP ; + req->flags |=REQ_F_FORCE_ASYNC ; +return 0 ; +} + +int io_flistxattr (struct io_kiocb *req,unsigned int issue_flags) +{ + struct io_xattr *ix = io_kiocb_to_cmd(req, struct io_xattr); +int ret; + +WARN_ON_ONCE (issue_flags &IO_URING_F_NONBLOCK ); + + ret =file_listxattr (req->file, ix->ctx.value, ix->ctx.size); +io_xattr_finish (req, ret); +return IOU_COMPLETE ; +}io_uring/xattr.h +6
-0@@ -13,3 +13,9 @@ int io_fgetxattr(struct io_kiocb *req, unsigned int issue_flags);int io_getxattr_prep (struct io_kiocb *req,const struct io_uring_sqe *sqe);int io_getxattr (struct io_kiocb *req,unsigned int issue_flags); + +int io_fremovexattr_prep (struct io_kiocb *req,const struct io_uring_sqe *sqe); +int io_fremovexattr (struct io_kiocb *req,unsigned int issue_flags); + +int io_flistxattr_prep (struct io_kiocb *req,const struct io_uring_sqe *sqe); +int io_flistxattr (struct io_kiocb *req,unsigned int issue_flags);tools/include/uapi/linux/io_uring.h +3
-0@@ -253,6 +253,19 @@ enum io_uring_op {IORING_OP_FUTEX_WAIT ,IORING_OP_FUTEX_WAKE ,IORING_OP_FUTEX_WAITV , +IORING_OP_FIXED_FD_INSTALL , +IORING_OP_FTRUNCATE , + IORING_OP_BIND,
tools/include/uapi/linux/io_uring.h enum io_uring_op { · line 268
Quoted 10 lines
tools/include/uapi/linux/io_uring.h +10
-0+IORING_OP_LISTEN , +IORING_OP_RECV_ZC , +IORING_OP_EPOLL_WAIT , +IORING_OP_READV_FIXED , +IORING_OP_WRITEV_FIXED , +IORING_OP_PIPE , +IORING_OP_NOP128 , +IORING_OP_URING_CMD128 , +IORING_OP_FREMOVEXATTR , + IORING_OP_FLISTXATTR,
I'd rather these (minus the xattr ones) go in a separate fix patch ahead of the series...
Signature · 1 line
Gabriel Krisman Bertazi