Commit 2bb04df7 authored by Stefan Roesch's avatar Stefan Roesch Committed by Jens Axboe
Browse files

io_uring: support CQE32 for nop operation 



This adds support for filling the extra1 and extra2 fields for large
CQE's.

Co-developed-by: default avatarJens Axboe <axboe@kernel.dk>
Signed-off-by: default avatarStefan Roesch <shr@fb.com>
Reviewed-by: default avatarKanchan Joshi <joshi.k@samsung.com>
Link: https://lore.kernel.org/r/20220426182134.136504-13-shr@fb.com


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 76c68fbf

fs/io_uring.c

+26 −2
Original line number Diff line number Diff line
@@ -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;

};
@@ -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;
@@ -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)

{

	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;

}
@@ -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: