io_uring/rsrc: avoid NULL check in io_put_rsrc_node()
PATCH 1/1 io_uring/rsrc: avoid NULL check in io_put_rsrc_node()
Most callers of io_put_rsrc_node() already check that node is non-NULL:
- io_rsrc_data_free()
- io_sqe_buffer_register()
- io_reset_rsrc_node()
- io_req_put_rsrc_nodes() (REQ_F_BUF_NODE indicates non-NULL buf_node)
Only io_splice_cleanup() can call io_put_rsrc_node() with a NULL node. So move the NULL check there.
--- io_uring/rsrc.h | 2 +- io_uring/splice.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-)
io_uring/rsrc.h +1 -1
@@ -81,11 +81,11 @@ static inline struct io_rsrc_node *io_rsrc_node_lookup(struct io_rsrc_data *data }static inline void io_put_rsrc_node (struct io_ring_ctx *ctx,struct io_rsrc_node *node) {lockdep_assert_held (&ctx->uring_lock); -if (node && !--node->refs) +if (!--node->refs)io_free_rsrc_node (ctx, node); }static inline bool io_reset_rsrc_node (struct io_ring_ctx *ctx,struct io_rsrc_data *data,int index)
io_uring/splice.c +2 -1
@@ -49,11 +49,12 @@ int io_tee_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe)void io_splice_cleanup (struct io_kiocb *req) { struct io_splice *sp = io_kiocb_to_cmd(req, struct io_splice); -io_put_rsrc_node (req->ctx, sp->rsrc_node); +if (sp->rsrc_node) +io_put_rsrc_node (req->ctx, sp->rsrc_node); }static struct file *io_splice_get_file (struct io_kiocb *req,unsigned int issue_flags) {
Signature · 1 line
2.45.2
Quoted 10 lines · Caleb Sander Mateos
Most callers of
io_put_rsrc_node()already check that node is non-NULL:
-io_rsrc_data_free()
-io_sqe_buffer_register()
-io_reset_rsrc_node()
-io_req_put_rsrc_nodes()(REQ_F_BUF_NODEindicates non-NULLbuf_node)Only
io_splice_cleanup()can callio_put_rsrc_node()with a NULL node. So move the NULL check there.[...]
Applied, thanks!
[1/1] io_uring/rsrc: avoid NULL check in io_put_rsrc_node()
commit: 496f56bf9f1acf11ce14489f34d81ba6e4023f42
Best regards,
Signature · 1 line
Jens Axboe