From: Pavel Begunkov <[email protected]>
To: Jens Axboe <[email protected]>, [email protected]
Subject: [PATCH 04/11] io_uring: inline io_clean_op() fast path
Date: Thu, 4 Mar 2021 18:52:18 +0000 [thread overview]
Message-ID: <ea095975590b3ae822572606291b79944fb9f805.1614883423.git.asml.silence@gmail.com> (raw)
In-Reply-To: <[email protected]>
Inline io_clean_op(), leaving __io_clean_op() but renaming it. This will
be used in following patches.
Signed-off-by: Pavel Begunkov <[email protected]>
---
fs/io_uring.c | 21 +++++++++------------
1 file changed, 9 insertions(+), 12 deletions(-)
diff --git a/fs/io_uring.c b/fs/io_uring.c
index 869e564ce713..d50d0e98639b 100644
--- a/fs/io_uring.c
+++ b/fs/io_uring.c
@@ -1000,7 +1000,7 @@ static void io_queue_linked_timeout(struct io_kiocb *req);
static int __io_sqe_files_update(struct io_ring_ctx *ctx,
struct io_uring_rsrc_update *ip,
unsigned nr_args);
-static void __io_clean_op(struct io_kiocb *req);
+static void io_clean_op(struct io_kiocb *req);
static struct file *io_file_get(struct io_submit_state *state,
struct io_kiocb *req, int fd, bool fixed);
static void __io_queue_sqe(struct io_kiocb *req);
@@ -1031,12 +1031,6 @@ EXPORT_SYMBOL(io_uring_get_socket);
#define io_for_each_link(pos, head) \
for (pos = (head); pos; pos = pos->link)
-static inline void io_clean_op(struct io_kiocb *req)
-{
- if (req->flags & (REQ_F_NEED_CLEANUP | REQ_F_BUFFER_SELECTED))
- __io_clean_op(req);
-}
-
static inline void io_set_resource_node(struct io_kiocb *req)
{
struct io_ring_ctx *ctx = req->ctx;
@@ -1527,7 +1521,9 @@ static void __io_cqring_fill_event(struct io_kiocb *req, long res,
set_bit(0, &ctx->cq_check_overflow);
ctx->rings->sq_flags |= IORING_SQ_CQ_OVERFLOW;
}
- io_clean_op(req);
+ if (req->flags & (REQ_F_NEED_CLEANUP | REQ_F_BUFFER_SELECTED))
+ io_clean_op(req);
+
req->result = res;
req->compl.cflags = cflags;
req_ref_get(req);
@@ -1574,7 +1570,8 @@ static void io_req_complete_post(struct io_kiocb *req, long res,
static void io_req_complete_state(struct io_kiocb *req, long res,
unsigned int cflags)
{
- io_clean_op(req);
+ if (req->flags & (REQ_F_NEED_CLEANUP | REQ_F_BUFFER_SELECTED))
+ io_clean_op(req);
req->result = res;
req->compl.cflags = cflags;
req->flags |= REQ_F_COMPLETE_INLINE;
@@ -1673,8 +1670,8 @@ static inline void io_put_file(struct io_kiocb *req, struct file *file,
static void io_dismantle_req(struct io_kiocb *req)
{
- io_clean_op(req);
-
+ if (req->flags & (REQ_F_NEED_CLEANUP | REQ_F_BUFFER_SELECTED))
+ io_clean_op(req);
if (req->async_data)
kfree(req->async_data);
if (req->file)
@@ -5812,7 +5809,7 @@ static int io_req_defer(struct io_kiocb *req)
return -EIOCBQUEUED;
}
-static void __io_clean_op(struct io_kiocb *req)
+static void io_clean_op(struct io_kiocb *req)
{
if (req->flags & REQ_F_BUFFER_SELECTED) {
switch (req->opcode) {
--
2.24.0
next prev parent reply other threads:[~2021-03-04 18:58 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-04 18:52 [PATCH 5.13 00/11] a second batch for 5.13 Pavel Begunkov
2021-03-04 18:52 ` [PATCH 01/11] io_uring: don't take ctx refs in task_work handler Pavel Begunkov
2021-03-04 18:52 ` [PATCH 02/11] io_uring: optimise io_uring_enter() Pavel Begunkov
2021-03-04 18:52 ` [PATCH 03/11] io_uring: move setting tctx->sqpoll from hot path Pavel Begunkov
2021-03-04 18:52 ` Pavel Begunkov [this message]
2021-03-04 18:52 ` [PATCH 05/11] io_uring: optimise io_dismantle_req() fast path Pavel Begunkov
2021-03-04 18:52 ` [PATCH 06/11] io_uring: abolish old io_put_file() Pavel Begunkov
2021-03-04 18:52 ` [PATCH 07/11] io_uring: keep io_req_free_batch() call locality Pavel Begunkov
2021-03-04 18:52 ` [PATCH 08/11] io_uring: set req->work closer to all other fields Pavel Begunkov
2021-03-04 18:52 ` [PATCH 09/11] io_uring: inline __io_queue_linked_timeout() Pavel Begunkov
2021-03-04 18:52 ` [PATCH 10/11] io_uring: optimise success case of __io_queue_sqe Pavel Begunkov
2021-03-04 18:52 ` [PATCH 11/11] io_uring: refactor io_flush_cached_reqs() 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=ea095975590b3ae822572606291b79944fb9f805.1614883423.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