From: Anuj Gupta Add an import flags argument to io_uring_cmd_import_fixed(), so callers can opt in to buffer types they support. No flags are defined yet, and all callers pass 0. No functional change. Suggested-by: Pavel Begunkov Signed-off-by: Anuj Gupta Reviewed-by: Pavel Begunkov --- drivers/nvme/host/ioctl.c | 2 +- drivers/scsi/scsi_bsg.c | 2 +- fs/fuse/dev_uring.c | 2 +- include/linux/io_uring/cmd.h | 5 +++-- io_uring/uring_cmd.c | 5 ++++- 5 files changed, 10 insertions(+), 6 deletions(-) diff --git a/drivers/nvme/host/ioctl.c b/drivers/nvme/host/ioctl.c index a87c9ca9d06c..d342ccad067a 100644 --- a/drivers/nvme/host/ioctl.c +++ b/drivers/nvme/host/ioctl.c @@ -533,7 +533,7 @@ static int nvme_uring_cmd_io(struct nvme_ctrl *ctrl, struct nvme_ns *ns, ddir, &iter, issue_flags); else ret = io_uring_cmd_import_fixed(d.addr, d.data_len, - ddir, &iter, ioucmd, issue_flags); + ddir, &iter, ioucmd, issue_flags, 0); if (ret < 0) return ret; diff --git a/drivers/scsi/scsi_bsg.c b/drivers/scsi/scsi_bsg.c index 5eec248a77a6..e53b417c27b9 100644 --- a/drivers/scsi/scsi_bsg.c +++ b/drivers/scsi/scsi_bsg.c @@ -87,7 +87,7 @@ static int scsi_bsg_map_user_buffer(struct request *req, if (ioucmd->flags & IORING_URING_CMD_FIXED) { ret = io_uring_cmd_import_fixed(buf_addr, buf_len, is_write ? WRITE : READ, - &iter, ioucmd, issue_flags); + &iter, ioucmd, issue_flags, 0); if (ret < 0) return ret; ret = blk_rq_map_user_iov(req->q, req, NULL, &iter, gfp_mask); diff --git a/fs/fuse/dev_uring.c b/fs/fuse/dev_uring.c index c6dd420c4034..5cc206abccc0 100644 --- a/fs/fuse/dev_uring.c +++ b/fs/fuse/dev_uring.c @@ -727,7 +727,7 @@ static int fuse_uring_import_payload(struct fuse_ring_ent *ent, int dir, if (bufpool_registered(ent->queue)) err = io_uring_cmd_import_fixed((u64)(uintptr_t)base, len, dir, - iter, ent->cmd, issue_flags); + iter, ent->cmd, issue_flags, 0); else err = import_ubuf(dir, base, len, iter); diff --git a/include/linux/io_uring/cmd.h b/include/linux/io_uring/cmd.h index e18d4af62e1a..23fb66a1e2c1 100644 --- a/include/linux/io_uring/cmd.h +++ b/include/linux/io_uring/cmd.h @@ -64,7 +64,8 @@ static inline void io_uring_cmd_set_res32(struct io_uring_cmd *cmd, s32 ret, u64 int io_uring_cmd_import_fixed(u64 ubuf, unsigned long len, int rw, struct iov_iter *iter, struct io_uring_cmd *ioucmd, - unsigned int issue_flags); + unsigned int issue_flags, + unsigned int import_flags); int io_uring_cmd_import_fixed_vec(struct io_uring_cmd *ioucmd, const struct iovec __user *uvec, size_t uvec_segs, @@ -124,7 +125,7 @@ int io_buffer_unregister(struct io_uring_cmd *cmd, unsigned int index, static inline int io_uring_cmd_import_fixed(u64 ubuf, unsigned long len, int rw, struct iov_iter *iter, struct io_uring_cmd *ioucmd, - unsigned int issue_flags) + unsigned int issue_flags, unsigned int import_flags) { return -EOPNOTSUPP; } diff --git a/io_uring/uring_cmd.c b/io_uring/uring_cmd.c index 4dac3ba162ae..d77a94d19cb5 100644 --- a/io_uring/uring_cmd.c +++ b/io_uring/uring_cmd.c @@ -272,12 +272,15 @@ int io_uring_cmd(struct io_kiocb *req, unsigned int issue_flags) int io_uring_cmd_import_fixed(u64 ubuf, unsigned long len, int rw, struct iov_iter *iter, struct io_uring_cmd *ioucmd, - unsigned int issue_flags) + unsigned int issue_flags, + unsigned int import_flags) { struct io_kiocb *req = cmd_to_io_kiocb(ioucmd); if (WARN_ON_ONCE(!(ioucmd->flags & IORING_URING_CMD_FIXED))) return -EINVAL; + if (WARN_ON_ONCE(import_flags)) + return -EINVAL; return io_import_reg_buf(req, iter, ubuf, len, rw, issue_flags, 0); } -- 2.43.0