public inbox for [email protected]
 help / color / mirror / Atom feed
From: Pavel Begunkov <[email protected]>
To: Jens Axboe <[email protected]>, [email protected]
Subject: [PATCH 10/13] io_uring: untie alloc_async_data and needs_async_data
Date: Tue, 23 Feb 2021 01:55:45 +0000	[thread overview]
Message-ID: <54ef00e365c9f4dd89f396be72c1387039277ba5.1614045169.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 b3585226bfb5..8f25371ae904 100644
--- a/fs/io_uring.c
+++ b/fs/io_uring.c
@@ -3105,21 +3105,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)
@@ -3127,7 +3119,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;
 		}
@@ -5814,7 +5806,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


  parent reply	other threads:[~2021-02-23  2:01 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-02-23  1:55 [PATCH for-next 00/13] simple 5.13 cleanups Pavel Begunkov
2021-02-23  1:55 ` [PATCH 01/13] io_uring: introduce a new helper for ctx quiesce Pavel Begunkov
2021-02-23  1:55 ` [PATCH 02/13] io_uring: avoid taking ctx refs for task-cancel Pavel Begunkov
2021-02-23  1:55 ` [PATCH 03/13] io_uring: reuse io_req_task_queue_fail() Pavel Begunkov
2021-02-23  1:55 ` [PATCH 04/13] io_uring: further deduplicate file slot selection Pavel Begunkov
2021-02-23  1:55 ` [PATCH 05/13] io_uring: add a helper failing not issued requests Pavel Begunkov
2021-02-23  1:55 ` [PATCH 06/13] io_uring: refactor provide/remove buffer locking Pavel Begunkov
2021-02-23  1:55 ` [PATCH 07/13] io_uring: don't restirct issue_flags for io_openat Pavel Begunkov
2021-02-23  1:55 ` [PATCH 08/13] io_uring: use better types for cflags Pavel Begunkov
2021-02-23  1:55 ` [PATCH 09/13] io_uring: refactor out send/recv async setup Pavel Begunkov
2021-02-23  1:55 ` Pavel Begunkov [this message]
2021-02-23  1:55 ` [PATCH 11/13] io_uring: rethink def->needs_async_data Pavel Begunkov
2021-02-23  1:55 ` [PATCH 12/13] io_uring: merge defer_prep() and prep_async() Pavel Begunkov
2021-02-23  1:55 ` [PATCH 13/13] io_uring: simplify io_resubmit_prep() 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=54ef00e365c9f4dd89f396be72c1387039277ba5.1614045169.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