io_uring/zcrx: don't use mark0 for allocating xarray

isilence · axboe · commit 8ae2837d5a97 · 2026-04-01T10:21:13.000-06:00
XA_MARK_0 is not compatible with xarray allocating entries, use XA_MARK_1. Fixes: fda90d4 ("io_uring/zcrx: return back two step unregistration") Signed-off-by: Pavel Begunkov <asml.silence@gmail.com> Link: https://patch.msgid.link/f232cfd3c466047d333b474dd2bddd246b6ebb82.1774780198.git.asml.silence@gmail.com Signed-off-by: Jens Axboe <axboe@kernel.dk>
diff --git a/io_uring/zcrx.c b/io_uring/zcrx.c
@@ -929,12 +929,12 @@ int io_register_zcrx(struct io_ring_ctx *ctx,
 
 static inline bool is_zcrx_entry_marked(struct io_ring_ctx *ctx, unsigned long id)
 {
-	return xa_get_mark(&ctx->zcrx_ctxs, id, XA_MARK_0);
+	return xa_get_mark(&ctx->zcrx_ctxs, id, XA_MARK_1);
 }
 
 static inline void set_zcrx_entry_mark(struct io_ring_ctx *ctx, unsigned long id)
 {
-	xa_set_mark(&ctx->zcrx_ctxs, id, XA_MARK_0);
+	xa_set_mark(&ctx->zcrx_ctxs, id, XA_MARK_1);
 }
 
 void io_terminate_zcrx(struct io_ring_ctx *ctx)

Original file line number	Diff line number	Diff line change
`@@ -929,12 +929,12 @@ int io_register_zcrx(struct io_ring_ctx *ctx,`
`929`	`929`
`930`	`930`	`static inline bool is_zcrx_entry_marked(struct io_ring_ctx *ctx, unsigned long id)`
`931`	`931`	`{`
`932`		`- return xa_get_mark(&ctx->zcrx_ctxs, id, XA_MARK_0);`
	`932`	`+ return xa_get_mark(&ctx->zcrx_ctxs, id, XA_MARK_1);`
`933`	`933`	`}`
`934`	`934`
`935`	`935`	`static inline void set_zcrx_entry_mark(struct io_ring_ctx *ctx, unsigned long id)`
`936`	`936`	`{`
`937`		`- xa_set_mark(&ctx->zcrx_ctxs, id, XA_MARK_0);`
	`937`	`+ xa_set_mark(&ctx->zcrx_ctxs, id, XA_MARK_1);`
`938`	`938`	`}`
`939`	`939`
`940`	`940`	`void io_terminate_zcrx(struct io_ring_ctx *ctx)`