io_uring: support CQE32 for nop operation

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>

diff --git a/fs/io_uring.c b/fs/io_uring.c
index ef23b88d9b108188a14c68b0c42ebd8e9f0feab5..c7e3f7e74d9247701182b84293251f00cb9deea4 100644 (file)
--- a/fs/io_uring.c
+++ b/fs/io_uring.c
@@ -764,6 +764,12 @@ struct io_msg {
        u32 len;
 };
 
+struct io_nop {
+       struct file                     *file;
+       u64                             extra1;
+       u64                             extra2;
+};
+
 struct io_async_connect {
        struct sockaddr_storage         address;
 };
@@ -962,6 +968,7 @@ struct io_kiocb {
                struct io_msg           msg;
                struct io_xattr         xattr;
                struct io_socket        sock;
+               struct io_nop           nop;
        };
 
        u8                              opcode;
@@ -5042,6 +5049,19 @@ done:
        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.
  */
@@ -5052,7 +5072,11 @@ static int io_nop(struct io_kiocb *req, unsigned int issue_flags)
        if (unlikely(ctx->flags & IORING_SETUP_IOPOLL))
                return -EINVAL;
 
-       __io_req_complete(req, issue_flags, 0, 0);
+       if (!(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;
 }
 
@@ -7656,7 +7680,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: