[PATCH] io_uring/rw: keep CQE flags on iopoll requests when adding kbuf flags

[PATCH] io_uring/rw: keep CQE flags on iopoll requests when adding kbuf flags

[Caleb Sander Mateos]

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.

Fixes: e26dca67fde1 ("io_uring: add support for IORING_SETUP_CQE_MIXED")
Reported-by: sashiko-bot@kernel.org
Link: https://sashiko.dev/#/message/20260827191705.D53C91F000E9%40smtp.kernel.org
Signed-off-by: Caleb Sander Mateos <csander@purestorage.com>
---
 io_uring/rw.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/io_uring/rw.c b/io_uring/rw.c
index 95106dd1d7eb..f2bbb0b1c30a 100644
--- a/io_uring/rw.c
+++ b/io_uring/rw.c
@@ -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);
-- 
2.55.0

Re: [PATCH] io_uring/rw: keep CQE flags on iopoll requests when adding kbuf flags

[Anuj Gupta]

Reviewed-by: Anuj Gupta <anuj20.g@samsung.com>

Re: [PATCH] io_uring/rw: keep CQE flags on iopoll requests when adding kbuf flags

[Jens Axboe]

On Wed, 02 Sep 2026 15:01:59 -0600, Caleb Sander Mateos wrote:
> 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.
> 
> [...]

Applied, thanks!

[1/1] io_uring/rw: keep CQE flags on iopoll requests when adding kbuf flags
      (no commit info)

Best regards,
-- 
Jens Axboe