io_uring/rw: keep CQE flags on iopoll requests when adding kbuf flags
PATCH 1/1 io_uring/rw: keep CQE flags on iopoll requests when adding kbuf flags
io_do_iopoll() assigns the result of io_put_kbuf() to the request's CQE flags upon completion. This overwrites any CQE flags that may have been set by the opcode-specific layer. (For example, if __io_uring_cmd_done() had set IORING_CQE_F_32, it would be cleared.) Switch the = to an |= so the kbuf flags are added to the existing CQE flags rather than replacing them. io_req_rw_complete() does the same with the io_put_kbuf() result.
--- io_uring/rw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
io_uring/rw.c +1 -1
@@ -1371,11 +1371,11 @@ int io_do_iopoll(struct io_ring_ctx *ctx, bool force_nonspin)if (!smp_load_acquire (&req->iopoll_completed))continue ;list_del (&req->iopoll_node);wq_list_add_tail (&req->comp_list, &ctx->submit_state.compl_reqs); nr_events++; - req->cqe.flags =io_put_kbuf (req,max (req->cqe.res,0 ),NULL ); + req->cqe.flags |=io_put_kbuf (req,max (req->cqe.res,0 ),NULL );if (!io_is_uring_cmd (req))io_req_rw_cleanup (req,0 ); }if (nr_events)__io_submit_flush_completions (ctx);
Signature · 1 line
2.55.0
Quoted 8 lines · Caleb Sander Mateos
io_do_iopoll()assigns the result ofio_put_kbuf()to the request's CQE flags upon completion. This overwrites any CQE flags that may have been set by the opcode-specific layer. (For example, if__io_uring_cmd_done()had setIORING_CQE_F_32, it would be cleared.) Switch the = to an |= so the kbuf flags are added to the existing CQE flags rather than replacing them.io_req_rw_complete()does the same with theio_put_kbuf()result.[...]
Applied, thanks!
[1/1] io_uring/rw: keep CQE flags on iopoll requests when adding kbuf flags
(no commit info)
Best regards,
Signature · 1 line
Jens Axboe