diff options
| author | Jens Axboe <axboe@kernel.dk> | 2023-01-21 19:53:41 -0700 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2023-01-29 15:17:41 -0700 |
| commit | 8572df941cbef2b295282535b013828e7df39471 (patch) | |
| tree | dad3d633b37be542fb90fd5146ba87f539db35f8 /io_uring/msg_ring.c | |
| parent | f30bd4d03824fb437bf080c2b2f926cfee3f09d0 (diff) | |
| download | linux-8572df941cbef2b295282535b013828e7df39471.tar.gz linux-8572df941cbef2b295282535b013828e7df39471.tar.bz2 linux-8572df941cbef2b295282535b013828e7df39471.zip | |
io_uring/msg-ring: ensure flags passing works for task_work completions
If the target ring is using IORING_SETUP_SINGLE_ISSUER and we're posting
a message from a different thread, then we need to ensure that the
fallback task_work that posts the CQE knwos about the flags passing as
well. If not we'll always be posting 0 as the flags.
Fixes: 3563d7ed58a5 ("io_uring/msg_ring: Pass custom flags to the cqe")
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'io_uring/msg_ring.c')
| -rw-r--r-- | io_uring/msg_ring.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/io_uring/msg_ring.c b/io_uring/msg_ring.c index 27992bda1ffa..8803c0979e2a 100644 --- a/io_uring/msg_ring.c +++ b/io_uring/msg_ring.c @@ -99,6 +99,11 @@ static void io_msg_tw_complete(struct callback_head *head) if (current->flags & PF_EXITING) { ret = -EOWNERDEAD; } else { + u32 flags = 0; + + if (msg->flags & IORING_MSG_RING_FLAGS_PASS) + flags = msg->cqe_flags; + /* * If the target ring is using IOPOLL mode, then we need to be * holding the uring_lock for posting completions. Other ring @@ -107,7 +112,7 @@ static void io_msg_tw_complete(struct callback_head *head) */ if (target_ctx->flags & IORING_SETUP_IOPOLL) mutex_lock(&target_ctx->uring_lock); - if (!io_post_aux_cqe(target_ctx, msg->user_data, msg->len, 0)) + if (!io_post_aux_cqe(target_ctx, msg->user_data, msg->len, flags)) ret = -EOVERFLOW; if (target_ctx->flags & IORING_SETUP_IOPOLL) mutex_unlock(&target_ctx->uring_lock); |