typesafety improvements on io_uring-6.0
cover typesafety improvements on io_uring-6.0
Hi Jens,
with the split into individual files (which is gread) and the introduction of the generic struct io_cmd_data, we now have the risk do incompatible casting in io_kiocb_to_cmd().
My patches catch casting problems with BUILD_BUG_ON() now. While there I added missing BUILD_BUG_ON() checks for new io_uring_sqe fields.
Stefan Metzmacher (3):
io_uring: consistently make use of io_notif_to_data()
io_uring: make io_kiocb_to_cmd() typesafe
io_uring: add missing BUILD_BUG_ON() checks for new io_uring_sqe
fields
include/linux/io_uring_types.h | 9 +++++++- io_uring/advise.c | 8 +++---- io_uring/cancel.c | 4 ++-- io_uring/epoll.c | 4 ++-- io_uring/fs.c | 28 +++++++++++------------ io_uring/io_uring.c | 19 ++++++++++++--- io_uring/kbuf.c | 8 +++---- io_uring/msg_ring.c | 8 +++---- io_uring/net.c | 42 +++++++++++++++++----------------- io_uring/notif.c | 4 +--- io_uring/notif.h | 2 +- io_uring/openclose.c | 16 ++++++------- io_uring/poll.c | 16 ++++++------- io_uring/rsrc.c | 10 ++++---- io_uring/rw.c | 28 +++++++++++------------ io_uring/splice.c | 8 +++---- io_uring/statx.c | 6 ++--- io_uring/sync.c | 12 +++++----- io_uring/timeout.c | 26 ++++++++++----------- io_uring/uring_cmd.c | 11 +++++---- io_uring/xattr.c | 18 +++++++-------- 21 files changed, 154 insertions(+), 133 deletions(-)
Signature · 1 line
2.34.1
PATCH 1/3 io_uring: consistently make use of io_notif_to_data()
This makes the assignment typesafe. It prepares
changing io_kiocb_to_cmd() in the next commit.
--- io_uring/notif.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
io_uring/notif.c +1 -1
@@ -100,7 +100,7 @@ __cold int io_notif_unregister(struct io_ring_ctx *ctx)if (!notif)continue ; - nd =io_kiocb_to_cmd (notif); + nd =io_notif_to_data (notif); slot->notif =NULL ;if (!refcount_dec_and_test (&nd->uarg.refcnt))continue ;
Signature · 1 line
2.34.1
PATCH 2/3 io_uring: make io_kiocb_to_cmd() typesafe
In reply to Stefan MetzmacherWe need to make sure (at build time) that struct io_cmd_data is not casted to a structure that's larger.
--- include/linux/io_uring_types.h | 9 +++++++- io_uring/advise.c | 8 +++---- io_uring/cancel.c | 4 ++-- io_uring/epoll.c | 4 ++-- io_uring/fs.c | 28 +++++++++++------------ io_uring/kbuf.c | 8 +++---- io_uring/msg_ring.c | 8 +++---- io_uring/net.c | 42 +++++++++++++++++----------------- io_uring/notif.c | 2 -- io_uring/notif.h | 2 +- io_uring/openclose.c | 16 ++++++------- io_uring/poll.c | 16 ++++++------- io_uring/rsrc.c | 10 ++++---- io_uring/rw.c | 28 +++++++++++------------ io_uring/splice.c | 8 +++---- io_uring/statx.c | 6 ++--- io_uring/sync.c | 12 +++++----- io_uring/timeout.c | 26 ++++++++++----------- io_uring/uring_cmd.c | 8 +++---- io_uring/xattr.c | 18 +++++++-------- 20 files changed, 134 insertions(+), 129 deletions(-)
include/linux/io_uring_types.h +8 -1
@@ -491,7 +491,14 @@ struct io_cmd_data {__u8 data[56 ]; }; -#define io_kiocb_to_cmd (req) ((void *) &(req)->cmd) +static inline void io_kiocb_cmd_sz_check (size_t cmd_sz) +{ +BUILD_BUG_ON (cmd_sz >sizeof (struct io_cmd_data )); +} +#define io_kiocb_to_cmd (req, cmd_type) ( \ + io_kiocb_cmd_sz_check(sizeof(cmd_type)) , \ + ((cmd_type *)&(req)->cmd) \ +)#define cmd_to_io_kiocb (ptr) ((struct io_kiocb *) ptr)struct io_kiocb {
io_uring/advise.c +4 -4
@@ -31,7 +31,7 @@ struct io_madvise {int io_madvise_prep (struct io_kiocb *req,const struct io_uring_sqe *sqe) {#if defined(CONFIG_ADVISE_SYSCALLS ) && defined(CONFIG_MMU ) -struct io_madvise *ma =io_kiocb_to_cmd (req); + struct io_madvise *ma = io_kiocb_to_cmd(req, struct io_madvise);if (sqe->buf_index || sqe->off || sqe->splice_fd_in)return -EINVAL ;
@@ -48,7 +48,7 @@ int io_madvise_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe)int io_madvise (struct io_kiocb *req,unsigned int issue_flags) {#if defined(CONFIG_ADVISE_SYSCALLS ) && defined(CONFIG_MMU ) -struct io_madvise *ma =io_kiocb_to_cmd (req); + struct io_madvise *ma = io_kiocb_to_cmd(req, struct io_madvise);int ret;if (issue_flags &IO_URING_F_NONBLOCK )
@@ -64,7 +64,7 @@ int io_madvise(struct io_kiocb *req, unsigned int issue_flags)int io_fadvise_prep (struct io_kiocb *req,const struct io_uring_sqe *sqe) { -struct io_fadvise *fa =io_kiocb_to_cmd (req); + struct io_fadvise *fa = io_kiocb_to_cmd(req, struct io_fadvise);if (sqe->buf_index || sqe->addr || sqe->splice_fd_in)return -EINVAL ;
@@ -77,7 +77,7 @@ int io_fadvise_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe)int io_fadvise (struct io_kiocb *req,unsigned int issue_flags) { -struct io_fadvise *fa =io_kiocb_to_cmd (req); + struct io_fadvise *fa = io_kiocb_to_cmd(req, struct io_fadvise);int ret;if (issue_flags &IO_URING_F_NONBLOCK ) {
io_uring/cancel.c +2 -2
@@ -107,7 +107,7 @@ int io_try_cancel(struct io_uring_task *tctx, struct io_cancel_data *cd,int io_async_cancel_prep (struct io_kiocb *req,const struct io_uring_sqe *sqe) { -struct io_cancel *cancel =io_kiocb_to_cmd (req); + struct io_cancel *cancel = io_kiocb_to_cmd(req, struct io_cancel);if (unlikely (req->flags &REQ_F_BUFFER_SELECT ))return -EINVAL ;
@@ -164,7 +164,7 @@ static int __io_async_cancel(struct io_cancel_data *cd,int io_async_cancel (struct io_kiocb *req,unsigned int issue_flags) { -struct io_cancel *cancel =io_kiocb_to_cmd (req); + struct io_cancel *cancel = io_kiocb_to_cmd(req, struct io_cancel);struct io_cancel_data cd = { .ctx = req->ctx, .data = cancel->addr,
io_uring/epoll.c +2 -2
@@ -23,7 +23,7 @@ struct io_epoll {int io_epoll_ctl_prep (struct io_kiocb *req,const struct io_uring_sqe *sqe) { -struct io_epoll *epoll =io_kiocb_to_cmd (req); + struct io_epoll *epoll = io_kiocb_to_cmd(req, struct io_epoll); pr_warn_once("%s: epoll_ctl support in io_uring is deprecated and will " "be removed in a future Linux kernel version.\n",
@@ -49,7 +49,7 @@ int io_epoll_ctl_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe)int io_epoll_ctl (struct io_kiocb *req,unsigned int issue_flags) { -struct io_epoll *ie =io_kiocb_to_cmd (req); + struct io_epoll *ie = io_kiocb_to_cmd(req, struct io_epoll);int ret;bool force_nonblock = issue_flags &IO_URING_F_NONBLOCK ;
io_uring/fs.c +14 -14
@@ -49,7 +49,7 @@ struct io_link {int io_renameat_prep (struct io_kiocb *req,const struct io_uring_sqe *sqe) { -struct io_rename *ren =io_kiocb_to_cmd (req); + struct io_rename *ren = io_kiocb_to_cmd(req, struct io_rename);const char __user *oldf, *newf;if (sqe->buf_index || sqe->splice_fd_in)
@@ -79,7 +79,7 @@ int io_renameat_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe)int io_renameat (struct io_kiocb *req,unsigned int issue_flags) { -struct io_rename *ren =io_kiocb_to_cmd (req); + struct io_rename *ren = io_kiocb_to_cmd(req, struct io_rename);int ret;if (issue_flags &IO_URING_F_NONBLOCK )
@@ -95,7 +95,7 @@ int io_renameat(struct io_kiocb *req, unsigned int issue_flags)void io_renameat_cleanup (struct io_kiocb *req) { -struct io_rename *ren =io_kiocb_to_cmd (req); + struct io_rename *ren = io_kiocb_to_cmd(req, struct io_rename);putname (ren->oldpath);putname (ren->newpath);
@@ -103,7 +103,7 @@ void io_renameat_cleanup(struct io_kiocb *req)int io_unlinkat_prep (struct io_kiocb *req,const struct io_uring_sqe *sqe) { -struct io_unlink *un =io_kiocb_to_cmd (req); + struct io_unlink *un = io_kiocb_to_cmd(req, struct io_unlink);const char __user *fname;if (sqe->off || sqe->len || sqe->buf_index || sqe->splice_fd_in)
@@ -128,7 +128,7 @@ int io_unlinkat_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe)int io_unlinkat (struct io_kiocb *req,unsigned int issue_flags) { -struct io_unlink *un =io_kiocb_to_cmd (req); + struct io_unlink *un = io_kiocb_to_cmd(req, struct io_unlink);int ret;if (issue_flags &IO_URING_F_NONBLOCK )
@@ -146,14 +146,14 @@ int io_unlinkat(struct io_kiocb *req, unsigned int issue_flags)void io_unlinkat_cleanup (struct io_kiocb *req) { -struct io_unlink *ul =io_kiocb_to_cmd (req); + struct io_unlink *ul = io_kiocb_to_cmd(req, struct io_unlink);putname (ul->filename); }int io_mkdirat_prep (struct io_kiocb *req,const struct io_uring_sqe *sqe) { -struct io_mkdir *mkd =io_kiocb_to_cmd (req); + struct io_mkdir *mkd = io_kiocb_to_cmd(req, struct io_mkdir);const char __user *fname;if (sqe->off || sqe->rw_flags || sqe->buf_index || sqe->splice_fd_in)
@@ -175,7 +175,7 @@ int io_mkdirat_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe)int io_mkdirat (struct io_kiocb *req,unsigned int issue_flags) { -struct io_mkdir *mkd =io_kiocb_to_cmd (req); + struct io_mkdir *mkd = io_kiocb_to_cmd(req, struct io_mkdir);int ret;if (issue_flags &IO_URING_F_NONBLOCK )
@@ -190,14 +190,14 @@ int io_mkdirat(struct io_kiocb *req, unsigned int issue_flags)void io_mkdirat_cleanup (struct io_kiocb *req) { -struct io_mkdir *md =io_kiocb_to_cmd (req); + struct io_mkdir *md = io_kiocb_to_cmd(req, struct io_mkdir);putname (md->filename); }int io_symlinkat_prep (struct io_kiocb *req,const struct io_uring_sqe *sqe) { -struct io_link *sl =io_kiocb_to_cmd (req); + struct io_link *sl = io_kiocb_to_cmd(req, struct io_link);const char __user *oldpath, *newpath;if (sqe->len || sqe->rw_flags || sqe->buf_index || sqe->splice_fd_in)
@@ -225,7 +225,7 @@ int io_symlinkat_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe)int io_symlinkat (struct io_kiocb *req,unsigned int issue_flags) { -struct io_link *sl =io_kiocb_to_cmd (req); + struct io_link *sl = io_kiocb_to_cmd(req, struct io_link);int ret;if (issue_flags &IO_URING_F_NONBLOCK )
@@ -240,7 +240,7 @@ int io_symlinkat(struct io_kiocb *req, unsigned int issue_flags)int io_linkat_prep (struct io_kiocb *req,const struct io_uring_sqe *sqe) { -struct io_link *lnk =io_kiocb_to_cmd (req); + struct io_link *lnk = io_kiocb_to_cmd(req, struct io_link);const char __user *oldf, *newf;if (sqe->rw_flags || sqe->buf_index || sqe->splice_fd_in)
@@ -270,7 +270,7 @@ int io_linkat_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe)int io_linkat (struct io_kiocb *req,unsigned int issue_flags) { -struct io_link *lnk =io_kiocb_to_cmd (req); + struct io_link *lnk = io_kiocb_to_cmd(req, struct io_link);int ret;if (issue_flags &IO_URING_F_NONBLOCK )
@@ -286,7 +286,7 @@ int io_linkat(struct io_kiocb *req, unsigned int issue_flags)void io_link_cleanup (struct io_kiocb *req) { -struct io_link *sl =io_kiocb_to_cmd (req); + struct io_link *sl = io_kiocb_to_cmd(req, struct io_link);putname (sl->oldpath);putname (sl->newpath);
io_uring/kbuf.c +4 -4
@@ -272,7 +272,7 @@ void io_destroy_buffers(struct io_ring_ctx *ctx)int io_remove_buffers_prep (struct io_kiocb *req,const struct io_uring_sqe *sqe) { -struct io_provide_buf *p =io_kiocb_to_cmd (req); + struct io_provide_buf *p = io_kiocb_to_cmd(req, struct io_provide_buf);u64 tmp; if (sqe->rw_flags || sqe->addr || sqe->len || sqe->off ||
@@ -291,7 +291,7 @@ int io_remove_buffers_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe)int io_remove_buffers (struct io_kiocb *req,unsigned int issue_flags) { -struct io_provide_buf *p =io_kiocb_to_cmd (req); + struct io_provide_buf *p = io_kiocb_to_cmd(req, struct io_provide_buf);struct io_ring_ctx *ctx = req->ctx;struct io_buffer_list *bl;int ret =0 ;
@@ -319,7 +319,7 @@ int io_remove_buffers(struct io_kiocb *req, unsigned int issue_flags)int io_provide_buffers_prep (struct io_kiocb *req,const struct io_uring_sqe *sqe) {unsigned long size, tmp_check; -struct io_provide_buf *p =io_kiocb_to_cmd (req); + struct io_provide_buf *p = io_kiocb_to_cmd(req, struct io_provide_buf);u64 tmp;if (sqe->rw_flags || sqe->splice_fd_in)
@@ -421,7 +421,7 @@ static int io_add_buffers(struct io_ring_ctx *ctx, struct io_provide_buf *pbuf,int io_provide_buffers (struct io_kiocb *req,unsigned int issue_flags) { -struct io_provide_buf *p =io_kiocb_to_cmd (req); + struct io_provide_buf *p = io_kiocb_to_cmd(req, struct io_provide_buf);struct io_ring_ctx *ctx = req->ctx;struct io_buffer_list *bl;int ret =0 ;
io_uring/msg_ring.c +4 -4
@@ -26,7 +26,7 @@ struct io_msg {static int io_msg_ring_data (struct io_kiocb *req) {struct io_ring_ctx *target_ctx = req->file->private_data; -struct io_msg *msg =io_kiocb_to_cmd (req); + struct io_msg *msg = io_kiocb_to_cmd(req, struct io_msg);if (msg->src_fd || msg->dst_fd || msg->flags)return -EINVAL ;
@@ -76,7 +76,7 @@ static int io_double_lock_ctx(struct io_ring_ctx *ctx,static int io_msg_send_fd (struct io_kiocb *req,unsigned int issue_flags) {struct io_ring_ctx *target_ctx = req->file->private_data; -struct io_msg *msg =io_kiocb_to_cmd (req); + struct io_msg *msg = io_kiocb_to_cmd(req, struct io_msg);struct io_ring_ctx *ctx = req->ctx;unsigned long file_ptr;struct file *src_file;
@@ -122,7 +122,7 @@ static int io_msg_send_fd(struct io_kiocb *req, unsigned int issue_flags)int io_msg_ring_prep (struct io_kiocb *req,const struct io_uring_sqe *sqe) { -struct io_msg *msg =io_kiocb_to_cmd (req); + struct io_msg *msg = io_kiocb_to_cmd(req, struct io_msg);if (unlikely (sqe->buf_index || sqe->personality))return -EINVAL ;
@@ -141,7 +141,7 @@ int io_msg_ring_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe)int io_msg_ring (struct io_kiocb *req,unsigned int issue_flags) { -struct io_msg *msg =io_kiocb_to_cmd (req); + struct io_msg *msg = io_kiocb_to_cmd(req, struct io_msg);int ret; ret = -EBADFD ;
io_uring/net.c +21 -21
168 lines not on this page · raw message
io_uring/notif.c +0 -2
@@ -123,8 +123,6 @@ __cold int io_notif_register(struct io_ring_ctx *ctx,struct io_uring_notification_register reg;unsigned i; -BUILD_BUG_ON (sizeof (struct io_notif_data ) >64 ); -if (ctx->nr_notif_slots)return -EBUSY ;if (size !=sizeof (reg))
io_uring/notif.h +1 -1
@@ -46,7 +46,7 @@ struct io_kiocb *io_alloc_notif(struct io_ring_ctx *ctx,static inline struct io_notif_data *io_notif_to_data (struct io_kiocb *notif) { -return io_kiocb_to_cmd (notif); + return io_kiocb_to_cmd(notif, struct io_notif_data); } static inline struct io_kiocb *io_get_notif(struct io_ring_ctx *ctx,
io_uring/openclose.c +8 -8
@@ -33,7 +33,7 @@ struct io_close {static int __io_openat_prep (struct io_kiocb *req,const struct io_uring_sqe *sqe) { -struct io_open *open =io_kiocb_to_cmd (req); + struct io_open *open = io_kiocb_to_cmd(req, struct io_open);const char __user *fname;int ret;
@@ -66,7 +66,7 @@ static int __io_openat_prep(struct io_kiocb *req, const struct io_uring_sqe *sqeint io_openat_prep (struct io_kiocb *req,const struct io_uring_sqe *sqe) { -struct io_open *open =io_kiocb_to_cmd (req); + struct io_open *open = io_kiocb_to_cmd(req, struct io_open);u64 mode =READ_ONCE (sqe->len);u64 flags =READ_ONCE (sqe->open_flags);
@@ -76,7 +76,7 @@ int io_openat_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe)int io_openat2_prep (struct io_kiocb *req,const struct io_uring_sqe *sqe) { -struct io_open *open =io_kiocb_to_cmd (req); + struct io_open *open = io_kiocb_to_cmd(req, struct io_open);struct open_how __user *how;size_t len;int ret;
@@ -95,7 +95,7 @@ int io_openat2_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe)int io_openat2 (struct io_kiocb *req,unsigned int issue_flags) { -struct io_open *open =io_kiocb_to_cmd (req); + struct io_open *open = io_kiocb_to_cmd(req, struct io_open);struct open_flags op;struct file *file;bool resolve_nonblock, nonblock_set;
@@ -167,7 +167,7 @@ int io_openat(struct io_kiocb *req, unsigned int issue_flags)void io_open_cleanup (struct io_kiocb *req) { -struct io_open *open =io_kiocb_to_cmd (req); + struct io_open *open = io_kiocb_to_cmd(req, struct io_open);if (open->filename)putname (open->filename);
@@ -187,14 +187,14 @@ int __io_close_fixed(struct io_ring_ctx *ctx, unsigned int issue_flags,static inline int io_close_fixed (struct io_kiocb *req,unsigned int issue_flags) { -struct io_close *close =io_kiocb_to_cmd (req); + struct io_close *close = io_kiocb_to_cmd(req, struct io_close);return __io_close_fixed (req->ctx, issue_flags, close->file_slot -1 ); }int io_close_prep (struct io_kiocb *req,const struct io_uring_sqe *sqe) { -struct io_close *close =io_kiocb_to_cmd (req); + struct io_close *close = io_kiocb_to_cmd(req, struct io_close);if (sqe->off || sqe->addr || sqe->len || sqe->rw_flags || sqe->buf_index)return -EINVAL ;
@@ -212,7 +212,7 @@ int io_close_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe)int io_close (struct io_kiocb *req,unsigned int issue_flags) {struct files_struct *files = current->files; -struct io_close *close =io_kiocb_to_cmd (req); + struct io_close *close = io_kiocb_to_cmd(req, struct io_close);struct fdtable *fdt;struct file *file;int ret = -EBADF ;
io_uring/poll.c +8 -8
@@ -85,7 +85,7 @@ static struct io_poll *io_poll_get_double(struct io_kiocb *req)static struct io_poll *io_poll_get_single (struct io_kiocb *req) {if (req->opcode ==IORING_OP_POLL_ADD ) -return io_kiocb_to_cmd (req); + return io_kiocb_to_cmd(req, struct io_poll);return &req->apoll->poll; }
@@ -274,7 +274,7 @@ static void io_poll_task_func(struct io_kiocb *req, bool *locked)return ;if (ret ==IOU_POLL_DONE ) { -struct io_poll *poll =io_kiocb_to_cmd (req); + struct io_poll *poll = io_kiocb_to_cmd(req, struct io_poll); req->cqe.res =mangle_poll (req->cqe.res & poll->events); }else if (ret !=IOU_POLL_REMOVE_POLL_USE_RES ) { req->cqe.res = ret;
@@ -475,7 +475,7 @@ static void io_poll_queue_proc(struct file *file, struct wait_queue_head *head, struct poll_table_struct *p) { struct io_poll_table *pt = container_of(p, struct io_poll_table, pt); -struct io_poll *poll =io_kiocb_to_cmd (pt->req); + struct io_poll *poll = io_kiocb_to_cmd(pt->req, struct io_poll);__io_queue_proc (poll, pt, head, (struct io_poll **) &pt->req->async_data);
@@ -821,7 +821,7 @@ static __poll_t io_poll_parse_events(const struct io_uring_sqe *sqe,int io_poll_remove_prep (struct io_kiocb *req,const struct io_uring_sqe *sqe) { -struct io_poll_update *upd =io_kiocb_to_cmd (req); + struct io_poll_update *upd = io_kiocb_to_cmd(req, struct io_poll_update);u32 flags;if (sqe->buf_index || sqe->splice_fd_in)
@@ -851,7 +851,7 @@ int io_poll_remove_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe)int io_poll_add_prep (struct io_kiocb *req,const struct io_uring_sqe *sqe) { -struct io_poll *poll =io_kiocb_to_cmd (req); + struct io_poll *poll = io_kiocb_to_cmd(req, struct io_poll);u32 flags;if (sqe->buf_index || sqe->off || sqe->addr)
@@ -868,7 +868,7 @@ int io_poll_add_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe)int io_poll_add (struct io_kiocb *req,unsigned int issue_flags) { -struct io_poll *poll =io_kiocb_to_cmd (req); + struct io_poll *poll = io_kiocb_to_cmd(req, struct io_poll);struct io_poll_table ipt;int ret;
@@ -891,7 +891,7 @@ int io_poll_add(struct io_kiocb *req, unsigned int issue_flags)int io_poll_remove (struct io_kiocb *req,unsigned int issue_flags) { -struct io_poll_update *poll_update =io_kiocb_to_cmd (req); + struct io_poll_update *poll_update = io_kiocb_to_cmd(req, struct io_poll_update);struct io_cancel_data cd = { .data = poll_update->old_user_data, };struct io_ring_ctx *ctx = req->ctx;struct io_hash_bucket *bucket;
@@ -930,7 +930,7 @@ int io_poll_remove(struct io_kiocb *req, unsigned int issue_flags)if (poll_update->update_events || poll_update->update_user_data) {/* only mask one event flags, keep behavior flags */ if (poll_update->update_events) { -struct io_poll *poll =io_kiocb_to_cmd (preq); + struct io_poll *poll = io_kiocb_to_cmd(preq, struct io_poll); poll->events &= ~0xffff ; poll->events |= poll_update->events &0xffff ;
io_uring/rsrc.c +5 -5
@@ -657,7 +657,7 @@ __cold int io_register_rsrc(struct io_ring_ctx *ctx, void __user *arg,int io_rsrc_update_prep (struct io_kiocb *req,const struct io_uring_sqe *sqe) { -struct io_rsrc_update *up =io_kiocb_to_cmd (req); + struct io_rsrc_update *up = io_kiocb_to_cmd(req, struct io_rsrc_update);if (unlikely (req->flags & (REQ_F_FIXED_FILE |REQ_F_BUFFER_SELECT )))return -EINVAL ;
@@ -676,7 +676,7 @@ int io_rsrc_update_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe)static int io_files_update_with_index_alloc (struct io_kiocb *req,unsigned int issue_flags) { -struct io_rsrc_update *up =io_kiocb_to_cmd (req); + struct io_rsrc_update *up = io_kiocb_to_cmd(req, struct io_rsrc_update);__s32 __user *fds =u64_to_user_ptr (up->arg);unsigned int done;struct file *file;
@@ -714,7 +714,7 @@ static int io_files_update_with_index_alloc(struct io_kiocb *req,static int io_files_update (struct io_kiocb *req,unsigned int issue_flags) { -struct io_rsrc_update *up =io_kiocb_to_cmd (req); + struct io_rsrc_update *up = io_kiocb_to_cmd(req, struct io_rsrc_update);struct io_ring_ctx *ctx = req->ctx;struct io_uring_rsrc_update2 up2;int ret;
@@ -743,7 +743,7 @@ static int io_files_update(struct io_kiocb *req, unsigned int issue_flags)static int io_notif_update (struct io_kiocb *req,unsigned int issue_flags) { -struct io_rsrc_update *up =io_kiocb_to_cmd (req); + struct io_rsrc_update *up = io_kiocb_to_cmd(req, struct io_rsrc_update);struct io_ring_ctx *ctx = req->ctx;unsigned len = up->nr_args;unsigned idx_end, idx = up->offset;
@@ -778,7 +778,7 @@ static int io_notif_update(struct io_kiocb *req, unsigned int issue_flags)int io_rsrc_update (struct io_kiocb *req,unsigned int issue_flags) { -struct io_rsrc_update *up =io_kiocb_to_cmd (req); + struct io_rsrc_update *up = io_kiocb_to_cmd(req, struct io_rsrc_update);switch (up->type) {case IORING_RSRC_UPDATE_FILES :
io_uring/rw.c +14 -14
@@ -35,7 +35,7 @@ static inline bool io_file_supports_nowait(struct io_kiocb *req)int io_prep_rw (struct io_kiocb *req,const struct io_uring_sqe *sqe) { -struct io_rw *rw =io_kiocb_to_cmd (req); + struct io_rw *rw = io_kiocb_to_cmd(req, struct io_rw);unsigned ioprio;int ret;
@@ -102,7 +102,7 @@ static inline void io_rw_done(struct kiocb *kiocb, ssize_t ret)static inline loff_t *io_kiocb_update_pos (struct io_kiocb *req) { -struct io_rw *rw =io_kiocb_to_cmd (req); + struct io_rw *rw = io_kiocb_to_cmd(req, struct io_rw);if (rw->kiocb.ki_pos !=-1 )return &rw->kiocb.ki_pos;
@@ -186,7 +186,7 @@ static void kiocb_end_write(struct io_kiocb *req)static bool __io_complete_rw_common (struct io_kiocb *req,long res) { -struct io_rw *rw =io_kiocb_to_cmd (req); + struct io_rw *rw = io_kiocb_to_cmd(req, struct io_rw);if (rw->kiocb.ki_flags &IOCB_WRITE ) {kiocb_end_write (req);
@@ -241,7 +241,7 @@ static int kiocb_done(struct io_kiocb *req, ssize_t ret, unsigned int issue_flags) {struct io_async_rw *io = req->async_data; -struct io_rw *rw =io_kiocb_to_cmd (req); + struct io_rw *rw = io_kiocb_to_cmd(req, struct io_rw);/* add previously done IO, if any */ if (req_has_async_data (req) && io->bytes_done >0 ) {
@@ -277,7 +277,7 @@ static int kiocb_done(struct io_kiocb *req, ssize_t ret,static ssize_t io_compat_import (struct io_kiocb *req,struct iovec *iov,unsigned int issue_flags) { -struct io_rw *rw =io_kiocb_to_cmd (req); + struct io_rw *rw = io_kiocb_to_cmd(req, struct io_rw);struct compat_iovec __user *uiov;compat_ssize_t clen;void __user *buf;
@@ -305,7 +305,7 @@ static ssize_t io_compat_import(struct io_kiocb *req, struct iovec *iov,static ssize_t __io_iov_buffer_select (struct io_kiocb *req,struct iovec *iov,unsigned int issue_flags) { -struct io_rw *rw =io_kiocb_to_cmd (req); + struct io_rw *rw = io_kiocb_to_cmd(req, struct io_rw);struct iovec __user *uiov =u64_to_user_ptr (rw->addr);void __user *buf;ssize_t len;
@@ -328,7 +328,7 @@ static ssize_t __io_iov_buffer_select(struct io_kiocb *req, struct iovec *iov,static ssize_t io_iov_buffer_select (struct io_kiocb *req,struct iovec *iov,unsigned int issue_flags) { -struct io_rw *rw =io_kiocb_to_cmd (req); + struct io_rw *rw = io_kiocb_to_cmd(req, struct io_rw);if (req->flags & (REQ_F_BUFFER_SELECTED |REQ_F_BUFFER_RING )) { iov[0 ].iov_base =u64_to_user_ptr (rw->addr);
@@ -350,7 +350,7 @@ static struct iovec *__io_import_iovec(int ddir, struct io_kiocb *req,struct io_rw_state *s, unsigned int issue_flags) { - struct io_rw *rw = io_kiocb_to_cmd(req); + struct io_rw *rw = io_kiocb_to_cmd(req, struct io_rw);struct iov_iter *iter = &s->iter;u8 opcode = req->opcode;struct iovec *iovec;
@@ -571,7 +571,7 @@ static int io_async_buf_func(struct wait_queue_entry *wait, unsigned mode, {struct wait_page_queue *wpq;struct io_kiocb *req = wait->private; -struct io_rw *rw =io_kiocb_to_cmd (req); + struct io_rw *rw = io_kiocb_to_cmd(req, struct io_rw);struct wait_page_key *key = arg; wpq = container_of(wait, struct wait_page_queue, wait);
@@ -601,7 +601,7 @@ static bool io_rw_should_retry(struct io_kiocb *req) {struct io_async_rw *io = req->async_data;struct wait_page_queue *wait = &io->wpq; -struct io_rw *rw =io_kiocb_to_cmd (req); + struct io_rw *rw = io_kiocb_to_cmd(req, struct io_rw);struct kiocb *kiocb = &rw->kiocb;/* never retry for NOWAIT, we just complete with -EAGAIN */
@@ -649,7 +649,7 @@ static bool need_complete_io(struct io_kiocb *req)static int io_rw_init_file (struct io_kiocb *req,fmode_t mode) { -struct io_rw *rw =io_kiocb_to_cmd (req); + struct io_rw *rw = io_kiocb_to_cmd(req, struct io_rw);struct kiocb *kiocb = &rw->kiocb;struct io_ring_ctx *ctx = req->ctx;struct file *file = req->file;
@@ -694,7 +694,7 @@ static int io_rw_init_file(struct io_kiocb *req, fmode_t mode)int io_read (struct io_kiocb *req,unsigned int issue_flags) { -struct io_rw *rw =io_kiocb_to_cmd (req); + struct io_rw *rw = io_kiocb_to_cmd(req, struct io_rw);struct io_rw_state __s, *s = &__s;struct iovec *iovec;struct kiocb *kiocb = &rw->kiocb;
@@ -839,7 +839,7 @@ int io_read(struct io_kiocb *req, unsigned int issue_flags)int io_write (struct io_kiocb *req,unsigned int issue_flags) { -struct io_rw *rw =io_kiocb_to_cmd (req); + struct io_rw *rw = io_kiocb_to_cmd(req, struct io_rw);struct io_rw_state __s, *s = &__s;struct iovec *iovec;struct kiocb *kiocb = &rw->kiocb;
@@ -994,7 +994,7 @@ int io_do_iopoll(struct io_ring_ctx *ctx, bool force_nonspin)wq_list_for_each (pos, start, &ctx->iopoll_list) { struct io_kiocb *req = container_of(pos, struct io_kiocb, comp_list); -struct io_rw *rw =io_kiocb_to_cmd (req); + struct io_rw *rw = io_kiocb_to_cmd(req, struct io_rw);int ret;/*
io_uring/splice.c +4 -4
@@ -26,7 +26,7 @@ struct io_splice {static int __io_splice_prep (struct io_kiocb *req,const struct io_uring_sqe *sqe) { -struct io_splice *sp =io_kiocb_to_cmd (req); + struct io_splice *sp = io_kiocb_to_cmd(req, struct io_splice);unsigned int valid_flags =SPLICE_F_FD_IN_FIXED |SPLICE_F_ALL ; sp->len =READ_ONCE (sqe->len);
@@ -46,7 +46,7 @@ int io_tee_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe)int io_tee (struct io_kiocb *req,unsigned int issue_flags) { -struct io_splice *sp =io_kiocb_to_cmd (req); + struct io_splice *sp = io_kiocb_to_cmd(req, struct io_splice);struct file *out = sp->file_out;unsigned int flags = sp->flags & ~SPLICE_F_FD_IN_FIXED ;struct file *in;
@@ -78,7 +78,7 @@ int io_tee(struct io_kiocb *req, unsigned int issue_flags)int io_splice_prep (struct io_kiocb *req,const struct io_uring_sqe *sqe) { -struct io_splice *sp =io_kiocb_to_cmd (req); + struct io_splice *sp = io_kiocb_to_cmd(req, struct io_splice); sp->off_in =READ_ONCE (sqe->splice_off_in); sp->off_out =READ_ONCE (sqe->off);
@@ -87,7 +87,7 @@ int io_splice_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe)int io_splice (struct io_kiocb *req,unsigned int issue_flags) { -struct io_splice *sp =io_kiocb_to_cmd (req); + struct io_splice *sp = io_kiocb_to_cmd(req, struct io_splice);struct file *out = sp->file_out;unsigned int flags = sp->flags & ~SPLICE_F_FD_IN_FIXED ;loff_t *poff_in, *poff_out;
io_uring/statx.c +3 -3
@@ -22,7 +22,7 @@ struct io_statx {int io_statx_prep (struct io_kiocb *req,const struct io_uring_sqe *sqe) { -struct io_statx *sx =io_kiocb_to_cmd (req); + struct io_statx *sx = io_kiocb_to_cmd(req, struct io_statx);const char __user *path;if (sqe->buf_index || sqe->splice_fd_in)
@@ -53,7 +53,7 @@ int io_statx_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe)int io_statx (struct io_kiocb *req,unsigned int issue_flags) { -struct io_statx *sx =io_kiocb_to_cmd (req); + struct io_statx *sx = io_kiocb_to_cmd(req, struct io_statx);int ret;if (issue_flags &IO_URING_F_NONBLOCK )
@@ -66,7 +66,7 @@ int io_statx(struct io_kiocb *req, unsigned int issue_flags)void io_statx_cleanup (struct io_kiocb *req) { -struct io_statx *sx =io_kiocb_to_cmd (req); + struct io_statx *sx = io_kiocb_to_cmd(req, struct io_statx);if (sx->filename)putname (sx->filename);
io_uring/sync.c +6 -6
@@ -24,7 +24,7 @@ struct io_sync {int io_sfr_prep (struct io_kiocb *req,const struct io_uring_sqe *sqe) { -struct io_sync *sync =io_kiocb_to_cmd (req); + struct io_sync *sync = io_kiocb_to_cmd(req, struct io_sync);if (unlikely (sqe->addr || sqe->buf_index || sqe->splice_fd_in))return -EINVAL ;
@@ -37,7 +37,7 @@ int io_sfr_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe)int io_sync_file_range (struct io_kiocb *req,unsigned int issue_flags) { -struct io_sync *sync =io_kiocb_to_cmd (req); + struct io_sync *sync = io_kiocb_to_cmd(req, struct io_sync);int ret;/* sync_file_range always requires a blocking context */
@@ -51,7 +51,7 @@ int io_sync_file_range(struct io_kiocb *req, unsigned int issue_flags)int io_fsync_prep (struct io_kiocb *req,const struct io_uring_sqe *sqe) { -struct io_sync *sync =io_kiocb_to_cmd (req); + struct io_sync *sync = io_kiocb_to_cmd(req, struct io_sync);if (unlikely (sqe->addr || sqe->buf_index || sqe->splice_fd_in))return -EINVAL ;
@@ -67,7 +67,7 @@ int io_fsync_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe)int io_fsync (struct io_kiocb *req,unsigned int issue_flags) { -struct io_sync *sync =io_kiocb_to_cmd (req); + struct io_sync *sync = io_kiocb_to_cmd(req, struct io_sync);loff_t end = sync->off + sync->len;int ret;
@@ -83,7 +83,7 @@ int io_fsync(struct io_kiocb *req, unsigned int issue_flags)int io_fallocate_prep (struct io_kiocb *req,const struct io_uring_sqe *sqe) { -struct io_sync *sync =io_kiocb_to_cmd (req); + struct io_sync *sync = io_kiocb_to_cmd(req, struct io_sync);if (sqe->buf_index || sqe->rw_flags || sqe->splice_fd_in)return -EINVAL ;
@@ -96,7 +96,7 @@ int io_fallocate_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe)int io_fallocate (struct io_kiocb *req,unsigned int issue_flags) { -struct io_sync *sync =io_kiocb_to_cmd (req); + struct io_sync *sync = io_kiocb_to_cmd(req, struct io_sync);int ret;/* fallocate always requiring blocking context */
io_uring/timeout.c +13 -13
@@ -36,7 +36,7 @@ struct io_timeout_rem {static inline bool io_is_timeout_noseq (struct io_kiocb *req) { -struct io_timeout *timeout =io_kiocb_to_cmd (req); + struct io_timeout *timeout = io_kiocb_to_cmd(req, struct io_timeout);return !timeout->off; }
@@ -56,7 +56,7 @@ static bool io_kill_timeout(struct io_kiocb *req, int status)struct io_timeout_data *io = req->async_data;if (hrtimer_try_to_cancel (&io->timer) !=-1 ) { -struct io_timeout *timeout =io_kiocb_to_cmd (req); + struct io_timeout *timeout = io_kiocb_to_cmd(req, struct io_timeout);if (status)req_set_fail (req);
@@ -188,7 +188,7 @@ struct io_kiocb *__io_disarm_linked_timeout(struct io_kiocb *req, __must_hold(&req->ctx->timeout_lock) {struct io_timeout_data *io = link->async_data; -struct io_timeout *timeout =io_kiocb_to_cmd (link); + struct io_timeout *timeout = io_kiocb_to_cmd(link, struct io_timeout);io_remove_next_linked (req); timeout->head =NULL ;
@@ -205,7 +205,7 @@ static enum hrtimer_restart io_timeout_fn(struct hrtimer *timer)struct io_timeout_data *data =container_of (timer, struct io_timeout_data, timer);struct io_kiocb *req = data->req; -struct io_timeout *timeout =io_kiocb_to_cmd (req); + struct io_timeout *timeout = io_kiocb_to_cmd(req, struct io_timeout);struct io_ring_ctx *ctx = req->ctx;unsigned long flags;
@@ -252,7 +252,7 @@ static struct io_kiocb *io_timeout_extract(struct io_ring_ctx *ctx, io = req->async_data;if (hrtimer_try_to_cancel (&io->timer) ==-1 )return ERR_PTR (-EALREADY ); - timeout =io_kiocb_to_cmd (req); + timeout = io_kiocb_to_cmd(req, struct io_timeout);list_del_init (&timeout->list);return req; }
@@ -275,7 +275,7 @@ int io_timeout_cancel(struct io_ring_ctx *ctx, struct io_cancel_data *cd)static void io_req_task_link_timeout (struct io_kiocb *req,bool *locked) {unsigned issue_flags = *locked ?0 :IO_URING_F_UNLOCKED ; -struct io_timeout *timeout =io_kiocb_to_cmd (req); + struct io_timeout *timeout = io_kiocb_to_cmd(req, struct io_timeout);struct io_kiocb *prev = timeout->prev;int ret = -ENOENT ;
@@ -302,7 +302,7 @@ static enum hrtimer_restart io_link_timeout_fn(struct hrtimer *timer)struct io_timeout_data *data =container_of (timer, struct io_timeout_data, timer);struct io_kiocb *prev, *req = data->req; -struct io_timeout *timeout =io_kiocb_to_cmd (req); + struct io_timeout *timeout = io_kiocb_to_cmd(req, struct io_timeout);struct io_ring_ctx *ctx = req->ctx;unsigned long flags;
@@ -378,7 +378,7 @@ static int io_timeout_update(struct io_ring_ctx *ctx, __u64 user_data, {struct io_cancel_data cd = { .data = user_data, };struct io_kiocb *req =io_timeout_extract (ctx, &cd); -struct io_timeout *timeout =io_kiocb_to_cmd (req); + struct io_timeout *timeout = io_kiocb_to_cmd(req, struct io_timeout);struct io_timeout_data *data;if (IS_ERR (req))
@@ -395,7 +395,7 @@ static int io_timeout_update(struct io_ring_ctx *ctx, __u64 user_data,int io_timeout_remove_prep (struct io_kiocb *req,const struct io_uring_sqe *sqe) { -struct io_timeout_rem *tr =io_kiocb_to_cmd (req); + struct io_timeout_rem *tr = io_kiocb_to_cmd(req, struct io_timeout_rem);if (unlikely (req->flags & (REQ_F_FIXED_FILE |REQ_F_BUFFER_SELECT )))return -EINVAL ;
@@ -435,7 +435,7 @@ static inline enum hrtimer_mode io_translate_timeout_mode(unsigned int flags)*/ int io_timeout_remove (struct io_kiocb *req,unsigned int issue_flags) { -struct io_timeout_rem *tr =io_kiocb_to_cmd (req); + struct io_timeout_rem *tr = io_kiocb_to_cmd(req, struct io_timeout_rem);struct io_ring_ctx *ctx = req->ctx;int ret;
@@ -466,7 +466,7 @@ static int __io_timeout_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe, bool is_timeout_link) { -struct io_timeout *timeout =io_kiocb_to_cmd (req); + struct io_timeout *timeout = io_kiocb_to_cmd(req, struct io_timeout);struct io_timeout_data *data;unsigned flags;u32 off =READ_ONCE (sqe->off);
@@ -532,7 +532,7 @@ int io_link_timeout_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe)int io_timeout (struct io_kiocb *req,unsigned int issue_flags) { -struct io_timeout *timeout =io_kiocb_to_cmd (req); + struct io_timeout *timeout = io_kiocb_to_cmd(req, struct io_timeout);struct io_ring_ctx *ctx = req->ctx;struct io_timeout_data *data = req->async_data;struct list_head *entry;
@@ -583,7 +583,7 @@ int io_timeout(struct io_kiocb *req, unsigned int issue_flags)void io_queue_linked_timeout (struct io_kiocb *req) { -struct io_timeout *timeout =io_kiocb_to_cmd (req); + struct io_timeout *timeout = io_kiocb_to_cmd(req, struct io_timeout);struct io_ring_ctx *ctx = req->ctx;spin_lock_irq (&ctx->timeout_lock);
io_uring/uring_cmd.c +4 -4
@@ -11,7 +11,7 @@static void io_uring_cmd_work (struct io_kiocb *req,bool *locked) { -struct io_uring_cmd *ioucmd =io_kiocb_to_cmd (req); + struct io_uring_cmd *ioucmd = io_kiocb_to_cmd(req, struct io_uring_cmd); ioucmd->task_work_cb (ioucmd); }
@@ -55,7 +55,7 @@ EXPORT_SYMBOL_GPL(io_uring_cmd_done);int io_uring_cmd_prep_async (struct io_kiocb *req) { -struct io_uring_cmd *ioucmd =io_kiocb_to_cmd (req); + struct io_uring_cmd *ioucmd = io_kiocb_to_cmd(req, struct io_uring_cmd);size_t cmd_size; cmd_size =uring_cmd_pdu_size (req->ctx->flags &IORING_SETUP_SQE128 );
@@ -66,7 +66,7 @@ int io_uring_cmd_prep_async(struct io_kiocb *req)int io_uring_cmd_prep (struct io_kiocb *req,const struct io_uring_sqe *sqe) { -struct io_uring_cmd *ioucmd =io_kiocb_to_cmd (req); + struct io_uring_cmd *ioucmd = io_kiocb_to_cmd(req, struct io_uring_cmd);if (sqe->rw_flags || sqe->__pad1)return -EINVAL ;
@@ -77,7 +77,7 @@ int io_uring_cmd_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe)int io_uring_cmd (struct io_kiocb *req,unsigned int issue_flags) { -struct io_uring_cmd *ioucmd =io_kiocb_to_cmd (req); + struct io_uring_cmd *ioucmd = io_kiocb_to_cmd(req, struct io_uring_cmd);struct io_ring_ctx *ctx = req->ctx;struct file *file = req->file;int ret;
io_uring/xattr.c +9 -9
@@ -24,7 +24,7 @@ struct io_xattr {void io_xattr_cleanup (struct io_kiocb *req) { -struct io_xattr *ix =io_kiocb_to_cmd (req); + struct io_xattr *ix = io_kiocb_to_cmd(req, struct io_xattr);if (ix->filename)putname (ix->filename);
@@ -44,7 +44,7 @@ static void io_xattr_finish(struct io_kiocb *req, int ret)static int __io_getxattr_prep (struct io_kiocb *req,const struct io_uring_sqe *sqe) { -struct io_xattr *ix =io_kiocb_to_cmd (req); + struct io_xattr *ix = io_kiocb_to_cmd(req, struct io_xattr);const char __user *name;int ret;
@@ -85,7 +85,7 @@ int io_fgetxattr_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe)int io_getxattr_prep (struct io_kiocb *req,const struct io_uring_sqe *sqe) { -struct io_xattr *ix =io_kiocb_to_cmd (req); + struct io_xattr *ix = io_kiocb_to_cmd(req, struct io_xattr);const char __user *path;int ret;
@@ -106,7 +106,7 @@ int io_getxattr_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe)int io_fgetxattr (struct io_kiocb *req,unsigned int issue_flags) { -struct io_xattr *ix =io_kiocb_to_cmd (req); + struct io_xattr *ix = io_kiocb_to_cmd(req, struct io_xattr);int ret;if (issue_flags &IO_URING_F_NONBLOCK )
@@ -122,7 +122,7 @@ int io_fgetxattr(struct io_kiocb *req, unsigned int issue_flags)int io_getxattr (struct io_kiocb *req,unsigned int issue_flags) { -struct io_xattr *ix =io_kiocb_to_cmd (req); + struct io_xattr *ix = io_kiocb_to_cmd(req, struct io_xattr);unsigned int lookup_flags =LOOKUP_FOLLOW ;struct path path;int ret;
@@ -151,7 +151,7 @@ int io_getxattr(struct io_kiocb *req, unsigned int issue_flags)static int __io_setxattr_prep (struct io_kiocb *req,const struct io_uring_sqe *sqe) { -struct io_xattr *ix =io_kiocb_to_cmd (req); + struct io_xattr *ix = io_kiocb_to_cmd(req, struct io_xattr);const char __user *name;int ret;
@@ -181,7 +181,7 @@ static int __io_setxattr_prep(struct io_kiocb *req,int io_setxattr_prep (struct io_kiocb *req,const struct io_uring_sqe *sqe) { -struct io_xattr *ix =io_kiocb_to_cmd (req); + struct io_xattr *ix = io_kiocb_to_cmd(req, struct io_xattr);const char __user *path;int ret;
@@ -208,7 +208,7 @@ int io_fsetxattr_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe)static int __io_setxattr (struct io_kiocb *req,unsigned int issue_flags,struct path *path) { -struct io_xattr *ix =io_kiocb_to_cmd (req); + struct io_xattr *ix = io_kiocb_to_cmd(req, struct io_xattr);int ret; ret =mnt_want_write (path->mnt);
@@ -234,7 +234,7 @@ int io_fsetxattr(struct io_kiocb *req, unsigned int issue_flags)int io_setxattr (struct io_kiocb *req,unsigned int issue_flags) { -struct io_xattr *ix =io_kiocb_to_cmd (req); + struct io_xattr *ix = io_kiocb_to_cmd(req, struct io_xattr);unsigned int lookup_flags =LOOKUP_FOLLOW ;struct path path;int ret;
Signature · 1 line
2.34.1
PATCH 3/3 io_uring: add missing BUILD_BUG_ON() checks for new io_uring_sqe fields
In reply to Stefan Metzmacher--- io_uring/io_uring.c | 19 ++++++++++++++++--- io_uring/uring_cmd.c | 3 +++ 2 files changed, 19 insertions(+), 3 deletions(-)
io_uring/io_uring.c +16 -3
@@ -3885,13 +3885,15 @@ SYSCALL_DEFINE4(io_uring_register, unsigned int, fd, unsigned int, opcode,static int __init io_uring_init (void ) { -#define __BUILD_BUG_VERIFY_ELEMENT (stype, eoffset, etype, ename) do { \ +#define __BUILD_BUG_VERIFY_OFFSET_SIZE (stype, eoffset, esize, ename) do { \ BUILD_BUG_ON(offsetof(stype, ename) != eoffset); \ - BUILD_BUG_ON(sizeof(etype) != sizeof_field(stype, ename)); \ + BUILD_BUG_ON(sizeof_field(stype, ename) != esize); \ } while (0)#define BUILD_BUG_SQE_ELEM (eoffset, etype, ename) \ - __BUILD_BUG_VERIFY_ELEMENT(struct io_uring_sqe, eoffset, etype, ename) + __BUILD_BUG_VERIFY_OFFSET_SIZE(struct io_uring_sqe, eoffset, sizeof(etype), ename) +#define BUILD_BUG_SQE_ELEM_SIZE (eoffset, esize, ename) \ + __BUILD_BUG_VERIFY_OFFSET_SIZE(struct io_uring_sqe, eoffset, esize, ename)BUILD_BUG_ON (sizeof (struct io_uring_sqe ) !=64 );BUILD_BUG_SQE_ELEM (0 , __u8, opcode);BUILD_BUG_SQE_ELEM (1 , __u8, flags);
@@ -3899,6 +3901,8 @@ static int __init io_uring_init(void)BUILD_BUG_SQE_ELEM (4 , __s32, fd);BUILD_BUG_SQE_ELEM (8 , __u64, off);BUILD_BUG_SQE_ELEM (8 , __u64, addr2); +BUILD_BUG_SQE_ELEM (8 , __u32, cmd_op); +BUILD_BUG_SQE_ELEM (12 , __u32, __pad1);BUILD_BUG_SQE_ELEM (16 , __u64, addr);BUILD_BUG_SQE_ELEM (16 , __u64, splice_off_in);BUILD_BUG_SQE_ELEM (24 , __u32, len);
@@ -3917,13 +3921,22 @@ static int __init io_uring_init(void)BUILD_BUG_SQE_ELEM (28 , __u32, statx_flags);BUILD_BUG_SQE_ELEM (28 , __u32, fadvise_advice);BUILD_BUG_SQE_ELEM (28 , __u32, splice_flags); +BUILD_BUG_SQE_ELEM (28 , __u32, rename_flags); +BUILD_BUG_SQE_ELEM (28 , __u32, unlink_flags); +BUILD_BUG_SQE_ELEM (28 , __u32, hardlink_flags); +BUILD_BUG_SQE_ELEM (28 , __u32, xattr_flags); +BUILD_BUG_SQE_ELEM (28 , __u32, msg_ring_flags);BUILD_BUG_SQE_ELEM (32 , __u64, user_data);BUILD_BUG_SQE_ELEM (40 , __u16, buf_index);BUILD_BUG_SQE_ELEM (40 , __u16, buf_group);BUILD_BUG_SQE_ELEM (42 , __u16, personality);BUILD_BUG_SQE_ELEM (44 , __s32, splice_fd_in);BUILD_BUG_SQE_ELEM (44 , __u32, file_index); +BUILD_BUG_SQE_ELEM (44 , __u16, notification_idx); +BUILD_BUG_SQE_ELEM (46 , __u16, addr_len);BUILD_BUG_SQE_ELEM (48 , __u64, addr3); +BUILD_BUG_SQE_ELEM_SIZE (48 ,0 , cmd); +BUILD_BUG_SQE_ELEM (56 , __u64, __pad2);BUILD_BUG_ON (sizeof (struct io_uring_files_update ) !=sizeof (struct io_uring_rsrc_update ));
io_uring/uring_cmd.c +3 -0
@@ -58,6 +58,9 @@ int io_uring_cmd_prep_async(struct io_kiocb *req) struct io_uring_cmd *ioucmd = io_kiocb_to_cmd(req, struct io_uring_cmd);size_t cmd_size; +BUILD_BUG_ON (uring_cmd_pdu_size (0 ) !=16 ); +BUILD_BUG_ON (uring_cmd_pdu_size (1 ) !=80 ); + cmd_size =uring_cmd_pdu_size (req->ctx->flags &IORING_SETUP_SQE128 );memcpy (req->async_data, ioucmd->cmd, cmd_size);
Signature · 1 line
2.34.1
Quoted 10 lines · Stefan Metzmacher
with the split into individual files (which is gread) and the introduction of the generic struct
io_cmd_data, we now have the risk do incompatible casting inio_kiocb_to_cmd().My patches catch casting problems with
BUILD_BUG_ON()now. While there I added missingBUILD_BUG_ON()checks for newio_uring_sqefields.[...]
Applied, thanks!
[1/3] io_uring: consistently make use of io_notif_to_data()
commit: 3608c38ea378cb7bb2d43ebe43c468c7be58b83a
[2/3] io_uring: make io_kiocb_to_cmd() typesafe
commit: 28789defa868b7b731ed73cfd7e0c0bfcd901de7
[3/3] io_uring: add missing BUILD_BUG_ON() checks for new io_uring_sqe fields
commit: 4167efe6463b09505112b6dc2c30b8ac68fcf348Best regards,
Signature · 1 line
Jens Axboe