mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-28 13:22:57 +00:00
io_uring: stop using io_wq_work as an fd placeholder
[ Upstream commit82733d168c
] There are two reasons why this isn't the best idea: - It's an odd area to grab a bit of storage space, hence it's an odd area to grab storage from. - It puts the 3rd io_kiocb cacheline into the hot path, where normal hot path just needs the first two. Use 'cflags' for joint fd/cflags storage. We only need fd until we successfully issue, and we only need cflags once a request is done and is completed. Fixes:6bf9c47a39
("io_uring: defer file assignment") Signed-off-by: Jens Axboe <axboe@kernel.dk> Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
parent
cc4826f7b4
commit
833759b3aa
2 changed files with 8 additions and 5 deletions
|
@ -155,7 +155,6 @@ struct io_wq_work_node *wq_stack_extract(struct io_wq_work_node *stack)
|
|||
struct io_wq_work {
|
||||
struct io_wq_work_node list;
|
||||
unsigned flags;
|
||||
int fd;
|
||||
};
|
||||
|
||||
static inline struct io_wq_work *wq_next_work(struct io_wq_work *work)
|
||||
|
|
|
@ -864,7 +864,11 @@ struct io_kiocb {
|
|||
|
||||
u64 user_data;
|
||||
u32 result;
|
||||
u32 cflags;
|
||||
/* fd initially, then cflags for completion */
|
||||
union {
|
||||
u32 cflags;
|
||||
int fd;
|
||||
};
|
||||
|
||||
struct io_ring_ctx *ctx;
|
||||
struct task_struct *task;
|
||||
|
@ -6708,9 +6712,9 @@ static bool io_assign_file(struct io_kiocb *req, unsigned int issue_flags)
|
|||
return true;
|
||||
|
||||
if (req->flags & REQ_F_FIXED_FILE)
|
||||
req->file = io_file_get_fixed(req, req->work.fd, issue_flags);
|
||||
req->file = io_file_get_fixed(req, req->fd, issue_flags);
|
||||
else
|
||||
req->file = io_file_get_normal(req, req->work.fd);
|
||||
req->file = io_file_get_normal(req, req->fd);
|
||||
if (req->file)
|
||||
return true;
|
||||
|
||||
|
@ -7243,7 +7247,7 @@ static int io_init_req(struct io_ring_ctx *ctx, struct io_kiocb *req,
|
|||
if (io_op_defs[opcode].needs_file) {
|
||||
struct io_submit_state *state = &ctx->submit_state;
|
||||
|
||||
req->work.fd = READ_ONCE(sqe->fd);
|
||||
req->fd = READ_ONCE(sqe->fd);
|
||||
|
||||
/*
|
||||
* Plug now if we have more than 2 IO left after this, and the
|
||||
|
|
Loading…
Reference in a new issue