io_uring: mark opcodes that always need io-wq punt

Add an opdef bit for them, and set it for the opcodes where we always
need io-wq punt. With that done, exclude them from the file_can_poll()
check in terms of whether or not we need to punt them if any of the
NO_OFFLOAD flags are set.

Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/io_uring/io_uring.c b/io_uring/io_uring.c
index c67e87c5909e9d4d0eb8fbf9c9a69bca1eabcdbd..389503b28d7c8b40013abcc208f8993ad1b8c9b9 100644 (file)
--- a/io_uring/io_uring.c
+++ b/io_uring/io_uring.c
@@ -1948,7 +1948,7 @@ static int io_issue_sqe(struct io_kiocb *req, unsigned int issue_flags)
                return -EBADF;
 
        if (issue_flags & IO_URING_F_NO_OFFLOAD &&
-           (!req->file || !file_can_poll(req->file)))
+           (!req->file || !file_can_poll(req->file) || def->always_iowq))
                issue_flags &= ~IO_URING_F_NONBLOCK;
 
        if (unlikely((req->flags & REQ_F_CREDS) && req->creds != current_cred()))

diff --git a/io_uring/opdef.c b/io_uring/opdef.c
index cca7c5b55208792ffe1eee4cdf32482a60b139e9..686d46001622903e2a708ba3b79a4b9da21d7d7d 100644 (file)
--- a/io_uring/opdef.c
+++ b/io_uring/opdef.c
@@ -82,6 +82,7 @@ const struct io_issue_def io_issue_defs[] = {
        [IORING_OP_FSYNC] = {
                .needs_file             = 1,
                .audit_skip             = 1,
+               .always_iowq            = 1,
                .prep                   = io_fsync_prep,
                .issue                  = io_fsync,
        },
@@ -125,6 +126,7 @@ const struct io_issue_def io_issue_defs[] = {
        [IORING_OP_SYNC_FILE_RANGE] = {
                .needs_file             = 1,
                .audit_skip             = 1,
+               .always_iowq            = 1,
                .prep                   = io_sfr_prep,
                .issue                  = io_sync_file_range,
        },
@@ -202,6 +204,7 @@ const struct io_issue_def io_issue_defs[] = {
        },
        [IORING_OP_FALLOCATE] = {
                .needs_file             = 1,
+               .always_iowq            = 1,
                .prep                   = io_fallocate_prep,
                .issue                  = io_fallocate,
        },
@@ -221,6 +224,7 @@ const struct io_issue_def io_issue_defs[] = {
        },
        [IORING_OP_STATX] = {
                .audit_skip             = 1,
+               .always_iowq            = 1,
                .prep                   = io_statx_prep,
                .issue                  = io_statx,
        },
@@ -253,11 +257,13 @@ const struct io_issue_def io_issue_defs[] = {
        [IORING_OP_FADVISE] = {
                .needs_file             = 1,
                .audit_skip             = 1,
+               .always_iowq            = 1,
                .prep                   = io_fadvise_prep,
                .issue                  = io_fadvise,
        },
        [IORING_OP_MADVISE] = {
                .audit_skip             = 1,
+               .always_iowq            = 1,
                .prep                   = io_madvise_prep,
                .issue                  = io_madvise,
        },
@@ -308,6 +314,7 @@ const struct io_issue_def io_issue_defs[] = {
                .hash_reg_file          = 1,
                .unbound_nonreg_file    = 1,
                .audit_skip             = 1,
+               .always_iowq            = 1,
                .prep                   = io_splice_prep,
                .issue                  = io_splice,
        },
@@ -328,11 +335,13 @@ const struct io_issue_def io_issue_defs[] = {
                .hash_reg_file          = 1,
                .unbound_nonreg_file    = 1,
                .audit_skip             = 1,
+               .always_iowq            = 1,
                .prep                   = io_tee_prep,
                .issue                  = io_tee,
        },
        [IORING_OP_SHUTDOWN] = {
                .needs_file             = 1,
+               .always_iowq            = 1,
 #if defined(CONFIG_NET)
                .prep                   = io_shutdown_prep,
                .issue                  = io_shutdown,
@@ -343,22 +352,27 @@ const struct io_issue_def io_issue_defs[] = {
        [IORING_OP_RENAMEAT] = {
                .prep                   = io_renameat_prep,
                .issue                  = io_renameat,
+               .always_iowq            = 1,
        },
        [IORING_OP_UNLINKAT] = {
                .prep                   = io_unlinkat_prep,
                .issue                  = io_unlinkat,
+               .always_iowq            = 1,
        },
        [IORING_OP_MKDIRAT] = {
                .prep                   = io_mkdirat_prep,
                .issue                  = io_mkdirat,
+               .always_iowq            = 1,
        },
        [IORING_OP_SYMLINKAT] = {
                .prep                   = io_symlinkat_prep,
                .issue                  = io_symlinkat,
+               .always_iowq            = 1,
        },
        [IORING_OP_LINKAT] = {
                .prep                   = io_linkat_prep,
                .issue                  = io_linkat,
+               .always_iowq            = 1,
        },
        [IORING_OP_MSG_RING] = {
                .needs_file             = 1,
@@ -367,20 +381,24 @@ const struct io_issue_def io_issue_defs[] = {
                .issue                  = io_msg_ring,
        },
        [IORING_OP_FSETXATTR] = {
-               .needs_file = 1,
+               .needs_file             = 1,
+               .always_iowq            = 1,
                .prep                   = io_fsetxattr_prep,
                .issue                  = io_fsetxattr,
        },
        [IORING_OP_SETXATTR] = {
+               .always_iowq            = 1,
                .prep                   = io_setxattr_prep,
                .issue                  = io_setxattr,
        },
        [IORING_OP_FGETXATTR] = {
-               .needs_file = 1,
+               .needs_file             = 1,
+               .always_iowq            = 1,
                .prep                   = io_fgetxattr_prep,
                .issue                  = io_fgetxattr,
        },
        [IORING_OP_GETXATTR] = {
+               .always_iowq            = 1,
                .prep                   = io_getxattr_prep,
                .issue                  = io_getxattr,
        },

diff --git a/io_uring/opdef.h b/io_uring/opdef.h
index c22c8696e749ba7098bf4ad77f67bdececd98740..657a831249ff238a758346b3947054e26c0b78e5 100644 (file)
--- a/io_uring/opdef.h
+++ b/io_uring/opdef.h
@@ -29,6 +29,8 @@ struct io_issue_def {
        unsigned                iopoll_queue : 1;
        /* opcode specific path will handle ->async_data allocation if needed */
        unsigned                manual_alloc : 1;
+       /* op always needs io-wq offload */
+       unsigned                always_iowq : 1;
 
        int (*issue)(struct io_kiocb *, unsigned int);
        int (*prep)(struct io_kiocb *, const struct io_uring_sqe *);