From: Pavel Begunkov <[email protected]>
To: [email protected]
Cc: Jens Axboe <[email protected]>, [email protected]
Subject: [PATCH for-next 11/25] io_uring: refactor io_req_task_complete()
Date: Tue, 14 Jun 2022 13:29:49 +0100 [thread overview]
Message-ID: <517340728990899f3bdd23a2b18929409cae0718.1655209709.git.asml.silence@gmail.com> (raw)
In-Reply-To: <[email protected]>
Clean up io_req_task_complete() and deduplicate io_put_kbuf() calls.
Signed-off-by: Pavel Begunkov <[email protected]>
---
io_uring/io_uring.c | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
diff --git a/io_uring/io_uring.c b/io_uring/io_uring.c
index 6c48d0c6dcd5..f3cae98471b8 100644
--- a/io_uring/io_uring.c
+++ b/io_uring/io_uring.c
@@ -1857,15 +1857,19 @@ static int io_iopoll_check(struct io_ring_ctx *ctx, long min)
return ret;
}
-inline void io_req_task_complete(struct io_kiocb *req, bool *locked)
+
+void io_req_task_complete(struct io_kiocb *req, bool *locked)
{
- if (*locked) {
- req->cqe.flags |= io_put_kbuf(req, 0);
+ if (req->flags & (REQ_F_BUFFER_SELECTED|REQ_F_BUFFER_RING)) {
+ unsigned issue_flags = *locked ? IO_URING_F_UNLOCKED : 0;
+
+ req->cqe.flags |= io_put_kbuf(req, issue_flags);
+ }
+
+ if (*locked)
io_req_add_compl_list(req);
- } else {
- req->cqe.flags |= io_put_kbuf(req, IO_URING_F_UNLOCKED);
+ else
io_req_complete_post(req);
- }
}
/*
--
2.36.1
next prev parent reply other threads:[~2022-06-14 12:34 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-14 12:29 [PATCH for-next 00/25] 5.20 cleanups and poll optimisations Pavel Begunkov
2022-06-14 12:29 ` [PATCH for-next 01/25] io_uring: make reg buf init consistent Pavel Begunkov
2022-06-14 12:29 ` [PATCH for-next 02/25] io_uring: move defer_list to slow data Pavel Begunkov
2022-06-14 12:29 ` [PATCH for-next 03/25] io_uring: better caching for ctx timeout fields Pavel Begunkov
2022-06-14 12:29 ` [PATCH for-next 04/25] io_uring: refactor ctx slow data placement Pavel Begunkov
2022-06-14 12:29 ` [PATCH for-next 05/25] io_uring: move cancel_seq out of io-wq Pavel Begunkov
2022-06-14 12:52 ` Jens Axboe
2022-06-14 13:01 ` Pavel Begunkov
2022-06-14 13:10 ` Jens Axboe
2022-06-14 12:29 ` [PATCH for-next 06/25] io_uring: move small helpers to headers Pavel Begunkov
2022-06-14 12:29 ` [PATCH for-next 07/25] io_uring: inline ->registered_rings Pavel Begunkov
2022-06-14 12:29 ` [PATCH for-next 08/25] io_uring: don't set REQ_F_COMPLETE_INLINE in tw Pavel Begunkov
2022-06-14 12:29 ` [PATCH for-next 09/25] io_uring: never defer-complete multi-apoll Pavel Begunkov
2022-06-14 12:29 ` [PATCH for-next 10/25] io_uring: kill REQ_F_COMPLETE_INLINE Pavel Begunkov
2022-06-14 12:29 ` Pavel Begunkov [this message]
2022-06-14 12:29 ` [PATCH for-next 12/25] io_uring: don't inline io_put_kbuf Pavel Begunkov
2022-06-14 12:29 ` [PATCH for-next 13/25] io_uring: remove check_cq checking from hot paths Pavel Begunkov
2022-06-14 12:29 ` [PATCH for-next 14/25] io_uring: poll: remove unnecessary req->ref set Pavel Begunkov
2022-06-14 12:29 ` [PATCH for-next 15/25] io_uring: switch cancel_hash to use per entry spinlock Pavel Begunkov
2022-06-14 12:29 ` [PATCH for-next 16/25] io_uring: pass poll_find lock back Pavel Begunkov
2022-06-14 12:29 ` [PATCH for-next 17/25] io_uring: clean up io_try_cancel Pavel Begunkov
2022-06-14 12:29 ` [PATCH for-next 18/25] io_uring: limit number hash buckets Pavel Begunkov
2022-06-14 12:29 ` [PATCH for-next 19/25] io_uring: clean up io_ring_ctx_alloc Pavel Begunkov
2022-06-14 12:29 ` [PATCH for-next 20/25] io_uring: use state completion infra for poll reqs Pavel Begunkov
2022-06-14 12:29 ` [PATCH for-next 21/25] io_uring: add IORING_SETUP_SINGLE_ISSUER Pavel Begunkov
2022-06-14 12:56 ` Pavel Begunkov
2022-06-14 12:30 ` [PATCH for-next 22/25] io_uring: pass hash table into poll_find Pavel Begunkov
2022-06-14 12:30 ` [PATCH for-next 23/25] io_uring: introduce a struct for hash table Pavel Begunkov
2022-06-14 12:30 ` [PATCH for-next 24/25] io_uring: propagate locking state to poll cancel Pavel Begunkov
2022-06-14 12:30 ` [PATCH for-next 25/25] io_uring: mutex locked poll hashing 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=517340728990899f3bdd23a2b18929409cae0718.1655209709.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