Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2024-12-29 09:12:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

io_uring: only initialize io_kiocb rsrc_nodes when needed

Browse Source 
Add the empty node initializing to the preinit part of the io_kiocb
allocation, and reset them if they have been used.

Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Jens Axboe 2024-10-26 10:46:10 -06:00
parent 0701db7439
commit f38f284764
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
io_uring/io_uring.c
View File

@ -947,6 +947,8 @@ void io_req_defer_failed(struct io_kiocb *req, s32 res)
static void io_preinit_req(struct io_kiocb *req, struct io_ring_ctx *ctx)
{
req->ctx = ctx;
req->rsrc_nodes[IORING_RSRC_FILE] = rsrc_empty_node;
req->rsrc_nodes[IORING_RSRC_BUFFER] = rsrc_empty_node;
req->link = NULL;
req->async_data = NULL;
/* not necessary, but safer to zero */
@ -2032,8 +2034,6 @@ static int io_init_req(struct io_ring_ctx *ctx, struct io_kiocb *req,
req->flags = (__force io_req_flags_t) sqe_flags;
req->cqe.user_data = READ_ONCE(sqe->user_data);
req->file = NULL;
req->rsrc_nodes[IORING_RSRC_FILE] = rsrc_empty_node;
req->rsrc_nodes[IORING_RSRC_BUFFER] = rsrc_empty_node;
req->task = current;
req->cancel_seq_set = false;

10
io_uring/rsrc.h
View File

@ -81,8 +81,14 @@ static inline void io_put_rsrc_node(struct io_rsrc_node *node)
static inline void io_req_put_rsrc_nodes(struct io_kiocb *req)
{
io_put_rsrc_node(req->rsrc_nodes[IORING_RSRC_FILE]);
io_put_rsrc_node(req->rsrc_nodes[IORING_RSRC_BUFFER]);
if (req->rsrc_nodes[IORING_RSRC_FILE] != rsrc_empty_node) {
io_put_rsrc_node(req->rsrc_nodes[IORING_RSRC_FILE]);
req->rsrc_nodes[IORING_RSRC_FILE] = rsrc_empty_node;
}
if (req->rsrc_nodes[IORING_RSRC_BUFFER] != rsrc_empty_node) {
io_put_rsrc_node(req->rsrc_nodes[IORING_RSRC_BUFFER]);
req->rsrc_nodes[IORING_RSRC_BUFFER] = rsrc_empty_node;
}
}
static inline void io_req_assign_rsrc_node(struct io_kiocb *req,