Skip to content

Commit 039c878

Browse files
Ming Leiaxboe
Ming Lei
authored andcommitted
io_uring/rsrc: add & apply io_req_assign_buf_node()
The following pattern becomes more and more: + io_req_assign_rsrc_node(&req->buf_node, node); + req->flags |= REQ_F_BUF_NODE; so make it a helper, which is less fragile to use than above code, for example, the BUF_NODE flag is even missed in current io_uring_cmd_prep(). Signed-off-by: Ming Lei <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Jens Axboe <[email protected]>
1 parent 4f219fc commit 039c878

File tree

5 files changed

+11
-7
lines changed

5 files changed

+11
-7
lines changed

io_uring/net.c

+1-2
Original file line numberDiff line numberDiff line change
@@ -1348,8 +1348,7 @@ static int io_send_zc_import(struct io_kiocb *req, unsigned int issue_flags)
13481348
io_ring_submit_lock(ctx, issue_flags);
13491349
node = io_rsrc_node_lookup(&ctx->buf_table, sr->buf_index);
13501350
if (node) {
1351-
io_req_assign_rsrc_node(&sr->notif->buf_node, node);
1352-
sr->notif->flags |= REQ_F_BUF_NODE;
1351+
io_req_assign_buf_node(sr->notif, node);
13531352
ret = 0;
13541353
}
13551354
io_ring_submit_unlock(ctx, issue_flags);

io_uring/nop.c

+1-2
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,7 @@ int io_nop(struct io_kiocb *req, unsigned int issue_flags)
6767
io_ring_submit_lock(ctx, issue_flags);
6868
node = io_rsrc_node_lookup(&ctx->buf_table, nop->buffer);
6969
if (node) {
70-
io_req_assign_rsrc_node(&req->buf_node, node);
71-
req->flags |= REQ_F_BUF_NODE;
70+
io_req_assign_buf_node(req, node);
7271
ret = 0;
7372
}
7473
io_ring_submit_unlock(ctx, issue_flags);

io_uring/rsrc.h

+7
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,13 @@ static inline void io_req_assign_rsrc_node(struct io_rsrc_node **dst_node,
111111
*dst_node = node;
112112
}
113113

114+
static inline void io_req_assign_buf_node(struct io_kiocb *req,
115+
struct io_rsrc_node *node)
116+
{
117+
io_req_assign_rsrc_node(&req->buf_node, node);
118+
req->flags |= REQ_F_BUF_NODE;
119+
}
120+
114121
int io_files_update(struct io_kiocb *req, unsigned int issue_flags);
115122
int io_files_update_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe);
116123

io_uring/rw.c

+1-2
Original file line numberDiff line numberDiff line change
@@ -341,8 +341,7 @@ static int io_prep_rw_fixed(struct io_kiocb *req, const struct io_uring_sqe *sqe
341341
node = io_rsrc_node_lookup(&ctx->buf_table, req->buf_index);
342342
if (!node)
343343
return -EFAULT;
344-
io_req_assign_rsrc_node(&req->buf_node, node);
345-
req->flags |= REQ_F_BUF_NODE;
344+
io_req_assign_buf_node(req, node);
346345

347346
io = req->async_data;
348347
ret = io_import_fixed(ddir, &io->iter, node->buf, rw->addr, rw->len);

io_uring/uring_cmd.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ int io_uring_cmd_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe)
219219
* being called. This prevents destruction of the mapped buffer
220220
* we'll need at actual import time.
221221
*/
222-
io_req_assign_rsrc_node(&req->buf_node, node);
222+
io_req_assign_buf_node(req, node);
223223
}
224224
ioucmd->cmd_op = READ_ONCE(sqe->cmd_op);
225225

0 commit comments

Comments
 (0)