Merge branch 'for-6.11/io_uring' into for-next

axboe · axboe · commit f3ae9c164fc4 · 2024-07-02T08:48:26.000-06:00
* for-6.11/io_uring:
  io_uring/msg_ring: fix overflow posting
diff --git a/io_uring/io_uring.c b/io_uring/io_uring.c
@@ -834,7 +834,11 @@ bool io_post_aux_cqe(struct io_ring_ctx *ctx, u64 user_data, s32 res, u32 cflags
  */
 void io_add_aux_cqe(struct io_ring_ctx *ctx, u64 user_data, s32 res, u32 cflags)
 {
-	__io_post_aux_cqe(ctx, user_data, res, cflags);
+	if (!io_fill_cqe_aux(ctx, user_data, res, cflags)) {
+		spin_lock(&ctx->completion_lock);
+		io_cqring_event_overflow(ctx, user_data, res, cflags, 0, 0);
+		spin_unlock(&ctx->completion_lock);
+	}
 	ctx->submit_state.cq_flush = true;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -834,7 +834,11 @@ bool io_post_aux_cqe(struct io_ring_ctx *ctx, u64 user_data, s32 res, u32 cflags`
`834`	`834`	`*/`
`835`	`835`	`void io_add_aux_cqe(struct io_ring_ctx *ctx, u64 user_data, s32 res, u32 cflags)`
`836`	`836`	`{`
`837`		`- __io_post_aux_cqe(ctx, user_data, res, cflags);`
	`837`	`+ if (!io_fill_cqe_aux(ctx, user_data, res, cflags)) {`
	`838`	`+ spin_lock(&ctx->completion_lock);`
	`839`	`+ io_cqring_event_overflow(ctx, user_data, res, cflags, 0, 0);`
	`840`	`+ spin_unlock(&ctx->completion_lock);`
	`841`	`+ }`
`838`	`842`	`ctx->submit_state.cq_flush = true;`
`839`	`843`	`}`
`840`	`844`