ABI change for registration/tagging
cover ABI change for registration/tagging
For more details see 1/2. The change is not as horrid as it may look, just passing rsrc type not in struct but as arguments deffered from IORING_REGISTER_*.
I do think it's a better API and might save us from putting extra bits in the future. Suggestions are welcome.
Pavel Begunkov (2):
io_uring: change registration/upd/rsrc tagging ABI
io_uring: add feature flag for rsrc tags
fs/io_uring.c | 42 ++++++++++++++++++++++++----------- include/uapi/linux/io_uring.h | 19 ++++++++-------- 2 files changed, 39 insertions(+), 22 deletions(-)
Signature · 1 line
2.31.1
PATCH 2/2 io_uring: add feature flag for rsrc tags
Add IORING_FEAT_RSRC_TAGS indicating that io_uring supports a bunch of new IORING_REGISTER operations, in particular IORING_REGISTER_[FILES[,UPDATE]2,BUFFERS[2,UPDATE]] that support rsrc tagging, and also indicating implemented dynamic fixed buffer updates.
--- fs/io_uring.c | 3 ++- include/uapi/linux/io_uring.h | 1 + 2 files changed, 3 insertions(+), 1 deletion(-)
fs/io_uring.c +2 -1
@@ -9676,7 +9676,8 @@ static int io_uring_create(unsigned entries, struct io_uring_params *p,IORING_FEAT_SUBMIT_STABLE |IORING_FEAT_RW_CUR_POS |IORING_FEAT_CUR_PERSONALITY |IORING_FEAT_FAST_POLL |IORING_FEAT_POLL_32BITS |IORING_FEAT_SQPOLL_NONFIXED | -IORING_FEAT_EXT_ARG |IORING_FEAT_NATIVE_WORKERS ; +IORING_FEAT_EXT_ARG |IORING_FEAT_NATIVE_WORKERS | +IORING_FEAT_RSRC_TAGS ;if (copy_to_user (params, p,sizeof (*p))) { ret = -EFAULT ;
include/uapi/linux/io_uring.h +1 -0
@@ -280,6 +280,7 @@ struct io_uring_params {#define IORING_FEAT_SQPOLL_NONFIXED (1U << 7)#define IORING_FEAT_EXT_ARG (1U << 8)#define IORING_FEAT_NATIVE_WORKERS (1U << 9) +#define IORING_FEAT_RSRC_TAGS (1U << 10)/* * io_uring_register(2) opcodes and arguments
Signature · 1 line
2.31.1
PATCH 1/2 io_uring: change registration/upd/rsrc tagging ABI
In reply to Pavel BegunkovThere are ABI moments about recently added rsrc registration/update and tagging that might become a nuisance in the future. First, IORING_REGISTER_RSRC[_UPD] hide different types of resources under it, so breaks fine control over them by restrictions. It works for now, but once those are wanted under restrictions it would require a rework.
It was also inconvenient trying to fit a new resource not supporting all the features (e.g. dynamic update) into the interface, so better to return to IORING_REGISTER_* top level dispatching.
Second, register/update were considered to accept a type of resource, however that's not a good idea because there might be several ways of registration of a single resource type, e.g. we may want to add non-contig buffers or anything more exquisite as dma mapped memory. So, remove IORING_RSRC_[FILE,BUFFER] out of the ABI, and place them internally for now to limit changes.
--- fs/io_uring.c | 39 ++++++++++++++++++++++++----------- include/uapi/linux/io_uring.h | 18 ++++++++-------- 2 files changed, 36 insertions(+), 21 deletions(-)
fs/io_uring.c +27 -12
@@ -783,6 +783,11 @@ struct io_task_work {task_work_func_t func; }; +enum { +IORING_RSRC_FILE =0 , +IORING_RSRC_BUFFER =1 , +}; +/* * NOTE! Each of the iocb union members has the file pointer * as the first entry in their struct definition. So you can
@@ -9911,7 +9916,7 @@ static int io_register_files_update(struct io_ring_ctx *ctx, void __user *arg, }static int io_register_rsrc_update (struct io_ring_ctx *ctx,void __user *arg, -unsigned size) +unsigned size,unsigned type) {struct io_uring_rsrc_update2 up;
@@ -9919,13 +9924,13 @@ static int io_register_rsrc_update(struct io_ring_ctx *ctx, void __user *arg,return -EINVAL ;if (copy_from_user (&up, arg,sizeof (up)))return -EFAULT ; -if (!up.nr) +if (!up.nr || up.resv)return -EINVAL ; -return __io_register_rsrc_update (ctx, up.type, &up, up.nr); +return __io_register_rsrc_update (ctx, type, &up, up.nr); }static int io_register_rsrc (struct io_ring_ctx *ctx,void __user *arg, -unsigned int size) +unsigned int size,unsigned int type) {struct io_uring_rsrc_register rr;
@@ -9936,10 +9941,10 @@ static int io_register_rsrc(struct io_ring_ctx *ctx, void __user *arg,memset (&rr,0 ,sizeof (rr));if (copy_from_user (&rr, arg, size))return -EFAULT ; -if (!rr.nr) +if (!rr.nr || rr.resv || rr.resv2)return -EINVAL ; -switch (rr.type) { +switch (type) {case IORING_RSRC_FILE :return io_sqe_files_register (ctx,u64_to_user_ptr (rr.data), rr.nr,u64_to_user_ptr (rr.tags));
@@ -9961,8 +9966,10 @@ static bool io_register_op_must_quiesce(int op)case IORING_REGISTER_PROBE :case IORING_REGISTER_PERSONALITY :case IORING_UNREGISTER_PERSONALITY : -case IORING_REGISTER_RSRC : -case IORING_REGISTER_RSRC_UPDATE : +case IORING_REGISTER_FILES2 : +case IORING_REGISTER_FILES_UPDATE2 : +case IORING_REGISTER_BUFFERS2 : +case IORING_REGISTER_BUFFERS_UPDATE :return false;default :return true;
@@ -10088,11 +10095,19 @@ static int __io_uring_register(struct io_ring_ctx *ctx, unsigned opcode,case IORING_REGISTER_RESTRICTIONS : ret =io_register_restrictions (ctx, arg, nr_args);break ; -case IORING_REGISTER_RSRC : - ret =io_register_rsrc (ctx, arg, nr_args); +case IORING_REGISTER_FILES2 : + ret =io_register_rsrc (ctx, arg, nr_args,IORING_RSRC_FILE ); +break ; +case IORING_REGISTER_FILES_UPDATE2 : + ret =io_register_rsrc_update (ctx, arg, nr_args, +IORING_RSRC_FILE ); +break ; +case IORING_REGISTER_BUFFERS2 : + ret =io_register_rsrc (ctx, arg, nr_args,IORING_RSRC_BUFFER );break ; -case IORING_REGISTER_RSRC_UPDATE : - ret =io_register_rsrc_update (ctx, arg, nr_args); +case IORING_REGISTER_BUFFERS_UPDATE : + ret =io_register_rsrc_update (ctx, arg, nr_args, +IORING_RSRC_BUFFER );break ;default : ret = -EINVAL ;
include/uapi/linux/io_uring.h +9 -9
@@ -298,8 +298,12 @@ enum {IORING_UNREGISTER_PERSONALITY =10 ,IORING_REGISTER_RESTRICTIONS =11 ,IORING_REGISTER_ENABLE_RINGS =12 , -IORING_REGISTER_RSRC =13 , -IORING_REGISTER_RSRC_UPDATE =14 , + +/* extended with tagging */ +IORING_REGISTER_FILES2 =13 , +IORING_REGISTER_FILES_UPDATE2 =14 , +IORING_REGISTER_BUFFERS2 =15 , +IORING_REGISTER_BUFFERS_UPDATE =16 ,/* this goes last */ IORING_REGISTER_LAST
@@ -312,14 +316,10 @@ struct io_uring_files_update {__aligned_u64 /* __s32 * */ fds; }; -enum { -IORING_RSRC_FILE =0 , -IORING_RSRC_BUFFER =1 , -}; -struct io_uring_rsrc_register { -__u32 type;__u32 nr; +__u32 resv; +__u64 resv2;__aligned_u64 data;__aligned_u64 tags; };
@@ -335,8 +335,8 @@ struct io_uring_rsrc_update2 {__u32 resv;__aligned_u64 data;__aligned_u64 tags; -__u32 type;__u32 nr; +__u32 resv2; };/* Skip updating fd indexes set to this value in the fd table */
Signature · 1 line
2.31.1