diff options
| author | Jens Axboe <axboe@kernel.dk> | 2025-08-07 14:25:50 -0600 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2025-08-27 11:24:22 -0600 |
| commit | c986f7586b8d3381ab0ce764136c3b951c618381 (patch) | |
| tree | 86a46cd49cb79ed4741e269cc93be59810e8a402 /io_uring | |
| parent | 1e81bf1414127bfeab0a0bcd9f39f42ccb96b6b9 (diff) | |
| download | lwn-c986f7586b8d3381ab0ce764136c3b951c618381.tar.gz lwn-c986f7586b8d3381ab0ce764136c3b951c618381.zip | |
io_uring/zcrx: add support for IORING_SETUP_CQE_MIXED
zcrx currently requires the ring to be set up with fixed 32b CQEs,
allow it to use IORING_SETUP_CQE_MIXED as well.
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'io_uring')
| -rw-r--r-- | io_uring/zcrx.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/io_uring/zcrx.c b/io_uring/zcrx.c index e5ff49f3425e..51fd2350dbe9 100644 --- a/io_uring/zcrx.c +++ b/io_uring/zcrx.c @@ -554,8 +554,9 @@ int io_register_zcrx_ifq(struct io_ring_ctx *ctx, return -EPERM; /* mandatory io_uring features for zc rx */ - if (!(ctx->flags & IORING_SETUP_DEFER_TASKRUN && - ctx->flags & IORING_SETUP_CQE32)) + if (!(ctx->flags & IORING_SETUP_DEFER_TASKRUN)) + return -EINVAL; + if (!(ctx->flags & (IORING_SETUP_CQE32|IORING_SETUP_CQE_MIXED))) return -EINVAL; if (copy_from_user(®, arg, sizeof(reg))) return -EFAULT; @@ -920,17 +921,20 @@ static const struct memory_provider_ops io_uring_pp_zc_ops = { static bool io_zcrx_queue_cqe(struct io_kiocb *req, struct net_iov *niov, struct io_zcrx_ifq *ifq, int off, int len) { + struct io_ring_ctx *ctx = req->ctx; struct io_uring_zcrx_cqe *rcqe; struct io_zcrx_area *area; struct io_uring_cqe *cqe; u64 offset; - if (!io_defer_get_uncommited_cqe(req->ctx, &cqe)) + if (!io_defer_get_uncommited_cqe(ctx, &cqe)) return false; cqe->user_data = req->cqe.user_data; cqe->res = len; cqe->flags = IORING_CQE_F_MORE; + if (ctx->flags & IORING_SETUP_CQE_MIXED) + cqe->flags |= IORING_CQE_F_32; area = io_zcrx_iov_to_area(niov); offset = off + (net_iov_idx(niov) << PAGE_SHIFT); |