Skip to content

Commit

Permalink
io_uring: support CQE32 for nop operation
Browse files Browse the repository at this point in the history
This adds support for filling the extra1 and extra2 fields for large
CQE's.

Co-developed-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Stefan Roesch <shr@fb.com>
Reviewed-by: Kanchan Joshi <joshi.k@samsung.com>
Link: https://lore.kernel.org/r/20220426182134.136504-13-shr@fb.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
  • Loading branch information
Stefan Roesch authored and Jens Axboe committed May 9, 2022
1 parent 76c68fb commit 2bb04df
Showing 1 changed file with 26 additions and 2 deletions.
28 changes: 26 additions & 2 deletions fs/io_uring.c
Original file line number Diff line number Diff line change
Expand Up @@ -767,6 +767,12 @@ struct io_msg {
u32 len;
};

struct io_nop {
struct file *file;
u64 extra1;
u64 extra2;
};

struct io_async_connect {
struct sockaddr_storage address;
};
Expand Down Expand Up @@ -965,6 +971,7 @@ struct io_kiocb {
struct io_msg msg;
struct io_xattr xattr;
struct io_socket sock;
struct io_nop nop;
};

u8 opcode;
Expand Down Expand Up @@ -5040,12 +5047,29 @@ static int io_splice(struct io_kiocb *req, unsigned int issue_flags)
return 0;
}

static int io_nop_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe)
{
/*
* If the ring is setup with CQE32, relay back addr/addr
*/
if (req->ctx->flags & IORING_SETUP_CQE32) {
req->nop.extra1 = READ_ONCE(sqe->addr);
req->nop.extra2 = READ_ONCE(sqe->addr2);
}

return 0;
}

/*
* IORING_OP_NOP just posts a completion event, nothing else.
*/
static int io_nop(struct io_kiocb *req, unsigned int issue_flags)
{
__io_req_complete(req, issue_flags, 0, 0);
if (!(req->ctx->flags & IORING_SETUP_CQE32))
__io_req_complete(req, issue_flags, 0, 0);
else
__io_req_complete32(req, issue_flags, 0, 0, req->nop.extra1,
req->nop.extra2);
return 0;
}

Expand Down Expand Up @@ -7647,7 +7671,7 @@ static int io_req_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe)
{
switch (req->opcode) {
case IORING_OP_NOP:
return 0;
return io_nop_prep(req, sqe);
case IORING_OP_READV:
case IORING_OP_READ_FIXED:
case IORING_OP_READ:
Expand Down

0 comments on commit 2bb04df

Please sign in to comment.