From: Bijan Mottahedeh <bijan.mottahedeh@oracle.com>
To: axboe@kernel.dk, asml.silence@gmail.com, io-uring@vger.kernel.org
Subject: [PATCH v5 08/13] io_uring: generalize files_update functionlity to rsrc_update
Date: Tue, 12 Jan 2021 13:33:08 -0800 [thread overview]
Message-ID: <1610487193-21374-9-git-send-email-bijan.mottahedeh@oracle.com> (raw)
In-Reply-To: <1610487193-21374-1-git-send-email-bijan.mottahedeh@oracle.com>
Generalize files_update functionality to rsrc_update in order to
leverage it for buffers updates.
Signed-off-by: Bijan Mottahedeh <bijan.mottahedeh@oracle.com>
---
fs/io_uring.c | 19 ++++++++++++++-----
include/uapi/linux/io_uring.h | 6 +++++-
2 files changed, 19 insertions(+), 6 deletions(-)
diff --git a/fs/io_uring.c b/fs/io_uring.c
index 6ebfe1f..f9f458c 100644
--- a/fs/io_uring.c
+++ b/fs/io_uring.c
@@ -5954,7 +5954,7 @@ static int io_async_cancel(struct io_kiocb *req)
}
static int io_rsrc_update_prep(struct io_kiocb *req,
- const struct io_uring_sqe *sqe)
+ const struct io_uring_sqe *sqe)
{
if (unlikely(req->ctx->flags & IORING_SETUP_SQPOLL))
return -EINVAL;
@@ -5971,8 +5971,11 @@ static int io_rsrc_update_prep(struct io_kiocb *req,
return 0;
}
-static int io_files_update(struct io_kiocb *req, bool force_nonblock,
- struct io_comp_state *cs)
+static int io_rsrc_update(struct io_kiocb *req, bool force_nonblock,
+ struct io_comp_state *cs,
+ int (*update)(struct io_ring_ctx *ctx,
+ struct io_uring_rsrc_update *up,
+ unsigned int nr_args))
{
struct io_ring_ctx *ctx = req->ctx;
struct io_uring_rsrc_update up;
@@ -5982,10 +5985,10 @@ static int io_files_update(struct io_kiocb *req, bool force_nonblock,
return -EAGAIN;
up.offset = req->rsrc_update.offset;
- up.fds = req->rsrc_update.arg;
+ up.rsrc = req->rsrc_update.arg;
mutex_lock(&ctx->uring_lock);
- ret = __io_sqe_files_update(ctx, &up, req->rsrc_update.nr_args);
+ ret = (*update)(ctx, &up, req->rsrc_update.nr_args);
mutex_unlock(&ctx->uring_lock);
if (ret < 0)
@@ -5994,6 +5997,12 @@ static int io_files_update(struct io_kiocb *req, bool force_nonblock,
return 0;
}
+static int io_files_update(struct io_kiocb *req, bool force_nonblock,
+ struct io_comp_state *cs)
+{
+ return io_rsrc_update(req, force_nonblock, cs, __io_sqe_files_update);
+}
+
static int io_req_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe)
{
switch (req->opcode) {
diff --git a/include/uapi/linux/io_uring.h b/include/uapi/linux/io_uring.h
index 77de7c0..f51190b 100644
--- a/include/uapi/linux/io_uring.h
+++ b/include/uapi/linux/io_uring.h
@@ -288,7 +288,11 @@ enum {
struct io_uring_rsrc_update {
__u32 offset;
__u32 resv;
- __aligned_u64 /* __s32 * */ fds;
+ union {
+ __aligned_u64 /* __s32 * */ fds;
+ __aligned_u64 /* __s32 * */ iovs;
+ __aligned_u64 /* __s32 * */ rsrc;
+ };
};
#define io_uring_files_update io_uring_rsrc_update
--
1.8.3.1
next prev parent reply other threads:[~2021-01-12 22:01 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-12 21:33 [PATCH v5 00/13] io_uring: buffer registration enhancements Bijan Mottahedeh
2021-01-12 21:33 ` [PATCH v5 01/13] io_uring: rename file related variables to rsrc Bijan Mottahedeh
2021-01-12 21:33 ` [PATCH v5 02/13] io_uring: generalize io_queue_rsrc_removal Bijan Mottahedeh
2021-01-12 21:33 ` [PATCH v5 03/13] io_uring: separate ref_list from fixed_rsrc_data Bijan Mottahedeh
2021-01-12 21:33 ` [PATCH v5 04/13] io_uring: split alloc_fixed_file_ref_node Bijan Mottahedeh
2021-01-12 21:33 ` [PATCH v5 05/13] io_uring: add rsrc_ref locking routines Bijan Mottahedeh
2021-01-12 21:33 ` [PATCH v5 06/13] io_uring: implement fixed buffers registration similar to fixed files Bijan Mottahedeh
2021-01-15 17:41 ` Pavel Begunkov
2021-01-12 21:33 ` [PATCH v5 07/13] io_uring: create common fixed_rsrc_ref_node handling routines Bijan Mottahedeh
2021-01-12 21:33 ` Bijan Mottahedeh [this message]
2021-01-16 18:20 ` [PATCH v5 08/13] io_uring: generalize files_update functionlity to rsrc_update Pavel Begunkov
2021-01-12 21:33 ` [PATCH v5 09/13] io_uring: support buffer registration updates Bijan Mottahedeh
2021-01-12 21:33 ` [PATCH v5 10/13] io_uring: create common fixed_rsrc_data allocation routines Bijan Mottahedeh
2021-01-16 18:26 ` Pavel Begunkov
2021-01-12 21:33 ` [PATCH v5 11/13] io_uring: make percpu_ref_release names consistent Bijan Mottahedeh
2021-01-12 21:33 ` [PATCH v5 12/13] io_uring: call io_get_fixed_rsrc_ref for buffers Bijan Mottahedeh
2021-01-15 17:44 ` Pavel Begunkov
2021-01-12 21:33 ` [PATCH v5 13/13] io_uring: support buffer registration sharing Bijan Mottahedeh
2021-01-14 2:01 ` Bijan Mottahedeh
2021-01-14 21:17 ` Bijan Mottahedeh
2021-01-16 18:30 ` Pavel Begunkov
2021-01-14 21:20 ` [PATCH v5 00/13] io_uring: buffer registration enhancements Pavel Begunkov
2021-01-14 22:44 ` Bijan Mottahedeh
2021-01-14 22:54 ` Bijan Mottahedeh
2021-01-15 4:42 ` Pavel Begunkov
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 \
--in-reply-to=1610487193-21374-9-git-send-email-bijan.mottahedeh@oracle.com \
--to=bijan.mottahedeh@oracle.com \
--cc=asml.silence@gmail.com \
--cc=axboe@kernel.dk \
--cc=io-uring@vger.kernel.org \
/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;
as well as URLs for NNTP newsgroup(s).