From ef05d9ebcc927260f700a94436e7c9347657bbef Mon Sep 17 00:00:00 2001
From: Pavel Begunkov <asml.silence@gmail.com>
Date: Fri, 24 Sep 2021 22:00:02 +0100
Subject: [PATCH] io_uring: kill off ->inflight_entry field
Git-commit: ef05d9ebcc927260f700a94436e7c9347657bbef
Patch-mainline: v5.16-rc1
References: bsc#1205205
->inflight_entry is not used anymore after converting everything to
single linked lists, remove it. Also adjust io_kiocb layout, so all hot
bits are in first 3 cachelines.
Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
Link: https://lore.kernel.org/r/fd8d68087ede26c4e1707ce6b175aa1eb2381f2b.1632516769.git.asml.silence@gmail.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Gabriel Krisman Bertazi <krisman@suse.de>
---
fs/io_uring.c | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/fs/io_uring.c b/fs/io_uring.c
index b8f60cf36156..eff24d8eb399 100644
--- a/fs/io_uring.c
+++ b/fs/io_uring.c
@@ -868,18 +868,15 @@ struct io_kiocb {
struct percpu_ref *fixed_rsrc_refs;
/* used with ctx->iopoll_list with reads/writes */
- struct list_head inflight_entry;
+ struct io_wq_work_node comp_list;
struct io_task_work io_task_work;
/* for polled requests, i.e. IORING_OP_POLL_ADD and async armed poll */
struct hlist_node hash_node;
struct async_poll *apoll;
- struct io_wq_work work;
- const struct cred *creds;
-
- struct io_wq_work_node comp_list;
-
/* store used ubuf, so we can prevent reloading */
struct io_mapped_ubuf *imu;
+ struct io_wq_work work;
+ const struct cred *creds;
};
struct io_tctx_node {
--
2.35.3