From: Anuj Gupta <[email protected]>
To: [email protected], [email protected], [email protected]
Cc: [email protected], [email protected],
[email protected], [email protected],
[email protected], Anuj Gupta <[email protected]>,
Kanchan Joshi <[email protected]>
Subject: [PATCH for-next v11 02/13] io_uring: introduce fixed buffer support for io_uring_cmd
Date: Thu, 29 Sep 2022 17:36:21 +0530 [thread overview]
Message-ID: <[email protected]> (raw)
In-Reply-To: <[email protected]>
Add IORING_URING_CMD_FIXED flag that is to be used for sending io_uring
command with previously registered buffers. User-space passes the buffer
index in sqe->buf_index, same as done in read/write variants that uses
fixed buffers.
Signed-off-by: Anuj Gupta <[email protected]>
Signed-off-by: Kanchan Joshi <[email protected]>
---
include/linux/io_uring.h | 2 +-
include/uapi/linux/io_uring.h | 9 +++++++++
io_uring/uring_cmd.c | 16 +++++++++++++++-
3 files changed, 25 insertions(+), 2 deletions(-)
diff --git a/include/linux/io_uring.h b/include/linux/io_uring.h
index 1dbf51115c30..e10c5cc81082 100644
--- a/include/linux/io_uring.h
+++ b/include/linux/io_uring.h
@@ -28,7 +28,7 @@ struct io_uring_cmd {
void *cookie;
};
u32 cmd_op;
- u32 pad;
+ u32 flags;
u8 pdu[32]; /* available inline for free use */
};
diff --git a/include/uapi/linux/io_uring.h b/include/uapi/linux/io_uring.h
index 92f29d9505a6..ab7458033ee3 100644
--- a/include/uapi/linux/io_uring.h
+++ b/include/uapi/linux/io_uring.h
@@ -56,6 +56,7 @@ struct io_uring_sqe {
__u32 hardlink_flags;
__u32 xattr_flags;
__u32 msg_ring_flags;
+ __u32 uring_cmd_flags;
};
__u64 user_data; /* data to be passed back at completion time */
/* pack this to avoid bogus arm OABI complaints */
@@ -219,6 +220,14 @@ enum io_uring_op {
IORING_OP_LAST,
};
+/*
+ * sqe->uring_cmd_flags
+ * IORING_URING_CMD_FIXED use registered buffer; pass thig flag
+ * along with setting sqe->buf_index.
+ */
+#define IORING_URING_CMD_FIXED (1U << 0)
+
+
/*
* sqe->fsync_flags
*/
diff --git a/io_uring/uring_cmd.c b/io_uring/uring_cmd.c
index 6a6d69523d75..faefa9f6f259 100644
--- a/io_uring/uring_cmd.c
+++ b/io_uring/uring_cmd.c
@@ -4,6 +4,7 @@
#include <linux/file.h>
#include <linux/io_uring.h>
#include <linux/security.h>
+#include <linux/nospec.h>
#include <uapi/linux/io_uring.h>
@@ -77,8 +78,21 @@ 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);
- if (sqe->rw_flags || sqe->__pad1)
+ if (sqe->__pad1)
return -EINVAL;
+
+ ioucmd->flags = READ_ONCE(sqe->uring_cmd_flags);
+ if (ioucmd->flags & IORING_URING_CMD_FIXED) {
+ struct io_ring_ctx *ctx = req->ctx;
+ u16 index;
+
+ req->buf_index = READ_ONCE(sqe->buf_index);
+ if (unlikely(req->buf_index >= ctx->nr_user_bufs))
+ return -EFAULT;
+ index = array_index_nospec(req->buf_index, ctx->nr_user_bufs);
+ req->imu = ctx->user_bufs[index];
+ io_req_set_rsrc_node(req, ctx, 0);
+ }
ioucmd->cmd = sqe->cmd;
ioucmd->cmd_op = READ_ONCE(sqe->cmd_op);
return 0;
--
2.25.1
next prev parent reply other threads:[~2022-09-29 12:21 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <CGME20220929121630epcas5p3e1ed2c5251276d557f8f921e8186620f@epcas5p3.samsung.com>
2022-09-29 12:06 ` [PATCH for-next v11 00/13] Fixed-buffer for uring-cmd/passthru Anuj Gupta
[not found] ` <CGME20220929121634epcas5p27400b84f8a8b43a91c4199ec39d50b51@epcas5p2.samsung.com>
2022-09-29 12:06 ` [PATCH for-next v11 01/13] io_uring: add io_uring_cmd_import_fixed Anuj Gupta
[not found] ` <CGME20220929121637epcas5p2ff344c7951037f79d117d000e405dd45@epcas5p2.samsung.com>
2022-09-29 12:06 ` Anuj Gupta [this message]
2022-09-30 1:26 ` [PATCH for-next v11 02/13] io_uring: introduce fixed buffer support for io_uring_cmd Jens Axboe
[not found] ` <CGME20220929121640epcas5p400a71aa51f374f016e2143d0228879bc@epcas5p4.samsung.com>
2022-09-29 12:06 ` [PATCH for-next v11 03/13] nvme: refactor nvme_add_user_metadata Anuj Gupta
[not found] ` <CGME20220929121643epcas5p4c58f6ebb794bde58981272cd33c69f9f@epcas5p4.samsung.com>
2022-09-29 12:06 ` [PATCH for-next v11 04/13] nvme: refactor nvme_alloc_request Anuj Gupta
2022-09-29 13:25 ` Christoph Hellwig
[not found] ` <CGME20220929121647epcas5p2d4ca8ae0b83a1fce230914f586ee3cc0@epcas5p2.samsung.com>
2022-09-29 12:06 ` [PATCH for-next v11 05/13] block: rename bio_map_put to blk_mq_map_bio_put Anuj Gupta
2022-09-29 13:25 ` Christoph Hellwig
[not found] ` <CGME20220929121650epcas5p424925af86ec6941bb53e5c102fd0ffc8@epcas5p4.samsung.com>
2022-09-29 12:06 ` [PATCH for-next v11 06/13] block: factor out blk_rq_map_bio_alloc helper Anuj Gupta
[not found] ` <CGME20220929121653epcas5p4ee82ef35b46d6686820dc4d870b6588e@epcas5p4.samsung.com>
2022-09-29 12:06 ` [PATCH for-next v11 07/13] block: add blk_rq_map_user_bvec Anuj Gupta
2022-09-29 13:26 ` Christoph Hellwig
[not found] ` <CGME20220929121657epcas5p213b7a187fd77b0783adb4b9389579b44@epcas5p2.samsung.com>
2022-09-29 12:06 ` [PATCH for-next v11 08/13] block: extend functionality to map bvec iterator Anuj Gupta
[not found] ` <CGME20220929121701epcas5p287a6d3f851626a5c7580d9a534432e9b@epcas5p2.samsung.com>
2022-09-29 12:06 ` [PATCH for-next v11 09/13] nvme: pass ubuffer as an integer Anuj Gupta
2022-09-29 13:27 ` Christoph Hellwig
[not found] ` <CGME20220929121704epcas5p3415fd4782cbcffa7b1e6ddf774bebb03@epcas5p3.samsung.com>
2022-09-29 12:06 ` [PATCH for-next v11 10/13] nvme: wire up fixed buffer support for nvme passthrough Anuj Gupta
[not found] ` <CGME20220929121709epcas5p325553d10a7ada7717c2f51ddb566a3e5@epcas5p3.samsung.com>
2022-09-29 12:06 ` [PATCH for-next v11 11/13] block: add blk_rq_map_user_io Anuj Gupta
2022-09-29 13:28 ` Christoph Hellwig
[not found] ` <CGME20220929121713epcas5p1824ed0c48c9e9ceeb18954d9c23564ed@epcas5p1.samsung.com>
2022-09-29 12:06 ` [PATCH for-next v11 12/13] scsi: Use blk_rq_map_user_io helper Anuj Gupta
2022-09-29 13:28 ` Christoph Hellwig
[not found] ` <CGME20220929121715epcas5p488759f34f6e55d940c6dca523e24f464@epcas5p4.samsung.com>
2022-09-29 12:06 ` [PATCH for-next v11 13/13] nvme: " Anuj Gupta
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox