Skip to content

Commit 7ef66d1

Browse files
committed
io_uring: remove IORING_CQE_F_MSG
This was introduced with the message ring opcode, but isn't strictly required for the request itself. The sender can encode what is needed in user_data, which is passed to the receiver. It's unclear if having a separate flag that essentially says "This CQE did not originate from an SQE on this ring" provides any real utility to applications. While we can always re-introduce a flag to provide this information, we cannot take it away at a later point in time. Remove the flag while we still can, before it's in a released kernel. Signed-off-by: Jens Axboe <axboe@kernel.dk>
1 parent 8a3e8ee commit 7ef66d1

2 files changed

Lines changed: 1 addition & 4 deletions

File tree

fs/io_uring.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4474,8 +4474,7 @@ static int io_msg_ring(struct io_kiocb *req, unsigned int issue_flags)
44744474
target_ctx = req->file->private_data;
44754475

44764476
spin_lock(&target_ctx->completion_lock);
4477-
filled = io_fill_cqe_aux(target_ctx, msg->user_data, msg->len,
4478-
IORING_CQE_F_MSG);
4477+
filled = io_fill_cqe_aux(target_ctx, msg->user_data, msg->len, 0);
44794478
io_commit_cqring(target_ctx);
44804479
spin_unlock(&target_ctx->completion_lock);
44814480

include/uapi/linux/io_uring.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -201,11 +201,9 @@ struct io_uring_cqe {
201201
*
202202
* IORING_CQE_F_BUFFER If set, the upper 16 bits are the buffer ID
203203
* IORING_CQE_F_MORE If set, parent SQE will generate more CQE entries
204-
* IORING_CQE_F_MSG If set, CQE was generated with IORING_OP_MSG_RING
205204
*/
206205
#define IORING_CQE_F_BUFFER (1U << 0)
207206
#define IORING_CQE_F_MORE (1U << 1)
208-
#define IORING_CQE_F_MSG (1U << 2)
209207

210208
enum {
211209
IORING_CQE_BUFFER_SHIFT = 16,

0 commit comments

Comments
 (0)