From c5595975b53a487bf329eeba65b5c5f34605a4c0 Mon Sep 17 00:00:00 2001

From: Pavel Begunkov <asml.silence@gmail.com>

Date: Wed, 15 Jun 2022 11:23:07 +0100

Subject: [PATCH] io_uring: make io_fill_cqe_aux honour CQE32

Git-commit: c5595975b53a487bf329eeba65b5c5f34605a4c0

Patch-mainline: v5.19-rc3

References: bsc#1205205

Don't let io_fill_cqe_aux() post 16B cqes for CQE32 rings, neither the

kernel nor the userspace expect this to happen.

Fixes: 76c68fbf1a1f9 ("io_uring: enable CQE32")

Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>

Link: https://lore.kernel.org/r/64fae669fae1b7083aa15d0cd807f692b0880b9a.1655287457.git.asml.silence@gmail.com

Signed-off-by: Jens Axboe <axboe@kernel.dk>

Signed-off-by: Gabriel Krisman Bertazi <krisman@suse.de>

---

 fs/io_uring.c | 5 +++++

 1 file changed, 5 insertions(+)

diff --git a/fs/io_uring.c b/fs/io_uring.c

index 792e9c95d217..5d479428d8e5 100644

--- a/fs/io_uring.c

+++ b/fs/io_uring.c

@@ -2518,6 +2518,11 @@ static noinline bool io_fill_cqe_aux(struct io_ring_ctx *ctx, u64 user_data,

 		WRITE_ONCE(cqe->user_data, user_data);

 		WRITE_ONCE(cqe->res, res);

 		WRITE_ONCE(cqe->flags, cflags);

+

+		if (ctx->flags & IORING_SETUP_CQE32) {

+			WRITE_ONCE(cqe->big_cqe[0], 0);

+			WRITE_ONCE(cqe->big_cqe[1], 0);

+		}

 		return true;

 	}

 	return io_cqring_event_overflow(ctx, user_data, res, cflags, 0, 0);

-- 

2.35.3