From: Pavel Begunkov <[email protected]>
To: Jens Axboe <[email protected]>, [email protected]
Subject: [PATCH 09/12] io_uring: untie alloc_async_data and needs_async_data
Date: Sun, 28 Feb 2021 22:35:17 +0000 [thread overview]
Message-ID: <d296f66f127f936939fbff9dc306aacbc000f44c.1614551467.git.asml.silence@gmail.com> (raw)
In-Reply-To: <[email protected]>
All opcode handlers pretty well know whether they need async data or
not, and can skip testing for needs_async_data. The exception is rw
the generic path, but those test the flag by hand anyway. So, check the
flag and make io_alloc_async_data() allocating unconditionally.
Signed-off-by: Pavel Begunkov <[email protected]>
---
fs/io_uring.c | 14 +++-----------
1 file changed, 3 insertions(+), 11 deletions(-)
diff --git a/fs/io_uring.c b/fs/io_uring.c
index 6fb2baf8bd26..bfc795e8258f 100644
--- a/fs/io_uring.c
+++ b/fs/io_uring.c
@@ -3062,21 +3062,13 @@ static void io_req_map_rw(struct io_kiocb *req, const struct iovec *iovec,
}
}
-static inline int __io_alloc_async_data(struct io_kiocb *req)
+static inline int io_alloc_async_data(struct io_kiocb *req)
{
WARN_ON_ONCE(!io_op_defs[req->opcode].async_size);
req->async_data = kmalloc(io_op_defs[req->opcode].async_size, GFP_KERNEL);
return req->async_data == NULL;
}
-static int io_alloc_async_data(struct io_kiocb *req)
-{
- if (!io_op_defs[req->opcode].needs_async_data)
- return 0;
-
- return __io_alloc_async_data(req);
-}
-
static int io_setup_async_rw(struct io_kiocb *req, const struct iovec *iovec,
const struct iovec *fast_iov,
struct iov_iter *iter, bool force)
@@ -3084,7 +3076,7 @@ static int io_setup_async_rw(struct io_kiocb *req, const struct iovec *iovec,
if (!force && !io_op_defs[req->opcode].needs_async_data)
return 0;
if (!req->async_data) {
- if (__io_alloc_async_data(req)) {
+ if (io_alloc_async_data(req)) {
kfree(iovec);
return -ENOMEM;
}
@@ -5770,7 +5762,7 @@ static int io_req_defer_prep(struct io_kiocb *req)
/* some opcodes init it during the inital prep */
if (req->async_data)
return 0;
- if (__io_alloc_async_data(req))
+ if (io_alloc_async_data(req))
return -EAGAIN;
return io_req_prep_async(req);
}
--
2.24.0
next prev parent reply other threads:[~2021-02-28 22:40 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-28 22:35 [PATCH RESEND for-next 00/12] 5.13 first batch Pavel Begunkov
2021-02-28 22:35 ` [PATCH 01/12] io_uring: avoid taking ctx refs for task-cancel Pavel Begunkov
2021-02-28 22:35 ` [PATCH 02/12] io_uring: reuse io_req_task_queue_fail() Pavel Begunkov
2021-02-28 22:35 ` [PATCH 03/12] io_uring: further deduplicate file slot selection Pavel Begunkov
2021-02-28 22:35 ` [PATCH 04/12] io_uring: add a helper failing not issued requests Pavel Begunkov
2021-02-28 22:35 ` [PATCH 05/12] io_uring: refactor provide/remove buffer locking Pavel Begunkov
2021-02-28 22:35 ` [PATCH 06/12] io_uring: don't restirct issue_flags for io_openat Pavel Begunkov
2021-02-28 22:35 ` [PATCH 07/12] io_uring: use better types for cflags Pavel Begunkov
2021-02-28 22:35 ` [PATCH 08/12] io_uring: refactor out send/recv async setup Pavel Begunkov
2021-02-28 22:35 ` Pavel Begunkov [this message]
2021-02-28 22:35 ` [PATCH 10/12] io_uring: rethink def->needs_async_data Pavel Begunkov
2021-02-28 22:35 ` [PATCH 11/12] io_uring: merge defer_prep() and prep_async() Pavel Begunkov
2021-02-28 22:35 ` [PATCH 12/12] io_uring: simplify io_resubmit_prep() Pavel Begunkov
2021-03-01 23:53 ` [PATCH RESEND for-next 00/12] 5.13 first batch Jens Axboe
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=d296f66f127f936939fbff9dc306aacbc000f44c.1614551467.git.asml.silence@gmail.com \
[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