io_uring: enable file table usage for SQPOLL rings
Jens Axboe
maintainerPATCH 1/1 io_uring: enable file table usage for SQPOLL rings
Now that SQPOLL supports non-registered files and grabs the file table, we can relax the restriction on open/close/accept/connect and allow them on a ring that is setup with IORING_SETUP_SQPOLL.
Signed-off-by Jens Axboe <[email protected]>
---
Jann, I seem to recall some discussion on closing of files being tricky with this, maybe you can refresh my memory? If so, we could just continue excluding IORING_OP_CLOSE for this.
fs/io_uring.c +4 -4
@@ -3593,7 +3593,7 @@ static int __io_openat_prep(struct io_kiocb *req, const struct io_uring_sqe *sqeconst char __user *fname;int ret; -if (unlikely (req->ctx->flags & (IORING_SETUP_IOPOLL |IORING_SETUP_SQPOLL ))) +if (unlikely (req->ctx->flags &IORING_SETUP_IOPOLL ))return -EINVAL ;if (unlikely (sqe->ioprio || sqe->buf_index))return -EINVAL ;
@@ -4014,7 +4014,7 @@ static int io_close_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe)io_req_init_async (req); req->work.flags |=IO_WQ_WORK_NO_CANCEL ; -if (unlikely (req->ctx->flags & (IORING_SETUP_IOPOLL |IORING_SETUP_SQPOLL ))) +if (unlikely (req->ctx->flags &IORING_SETUP_IOPOLL ))return -EINVAL ;if (sqe->ioprio || sqe->off || sqe->addr || sqe->len || sqe->rw_flags || sqe->buf_index)
@@ -4500,7 +4500,7 @@ static int io_accept_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe) {struct io_accept *accept = &req->accept; -if (unlikely (req->ctx->flags & (IORING_SETUP_IOPOLL |IORING_SETUP_SQPOLL ))) +if (unlikely (req->ctx->flags &IORING_SETUP_IOPOLL ))return -EINVAL ;if (sqe->ioprio || sqe->len || sqe->buf_index)return -EINVAL ;
@@ -4541,7 +4541,7 @@ static int io_connect_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe)struct io_connect *conn = &req->connect;struct io_async_ctx *io = req->io; -if (unlikely (req->ctx->flags & (IORING_SETUP_IOPOLL |IORING_SETUP_SQPOLL ))) +if (unlikely (req->ctx->flags &IORING_SETUP_IOPOLL ))return -EINVAL ;if (sqe->ioprio || sqe->len || sqe->buf_index || sqe->rw_flags)return -EINVAL ;
Signature · 1 line
Jens Axboe