lkml.org 
[lkml]   [2021]   [Jul]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4/4] io_uring: accept directly into fixed file table
    Date
    As done with open opcodes, allow accept to skip installing fd into
    processes' file tables and put it directly into io_uring's fixed file
    table. Same restrictions and design as for open.

    Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
    ---
    fs/io_uring.c | 21 +++++++++++++++------
    1 file changed, 15 insertions(+), 6 deletions(-)

    diff --git a/fs/io_uring.c b/fs/io_uring.c
    index fd0dcee251b0..f7db43bf7dad 100644
    --- a/fs/io_uring.c
    +++ b/fs/io_uring.c
    @@ -4675,14 +4675,17 @@ static int io_accept_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe)

    if (unlikely(req->ctx->flags & IORING_SETUP_IOPOLL))
    return -EINVAL;
    - if (sqe->ioprio || sqe->len || sqe->buf_index)
    + if (sqe->ioprio || sqe->len)
    return -EINVAL;

    accept->addr = u64_to_user_ptr(READ_ONCE(sqe->addr));
    accept->addr_len = u64_to_user_ptr(READ_ONCE(sqe->addr2));
    accept->flags = READ_ONCE(sqe->accept_flags);
    accept->nofile = rlimit(RLIMIT_NOFILE);
    + req->buf_index = READ_ONCE(sqe->file_index);

    + if (req->buf_index && (accept->flags & SOCK_CLOEXEC))
    + return -EINVAL;
    if (accept->flags & ~(SOCK_CLOEXEC | SOCK_NONBLOCK))
    return -EINVAL;
    if (SOCK_NONBLOCK != O_NONBLOCK && (accept->flags & SOCK_NONBLOCK))
    @@ -4695,28 +4698,34 @@ static int io_accept(struct io_kiocb *req, unsigned int issue_flags)
    struct io_accept *accept = &req->accept;
    bool force_nonblock = issue_flags & IO_URING_F_NONBLOCK;
    unsigned int file_flags = force_nonblock ? O_NONBLOCK : 0;
    + bool fixed = !!req->buf_index;
    struct file *file;
    int ret, fd;

    if (req->file->f_flags & O_NONBLOCK)
    req->flags |= REQ_F_NOWAIT;

    - fd = __get_unused_fd_flags(accept->flags, accept->nofile);
    - if (unlikely(fd < 0))
    - return fd;
    -
    + if (!fixed) {
    + fd = __get_unused_fd_flags(accept->flags, accept->nofile);
    + if (unlikely(fd < 0))
    + return fd;
    + }
    file = do_accept(req->file, file_flags, accept->addr, accept->addr_len,
    accept->flags);
    if (IS_ERR(file)) {
    + if (!fixed)
    + put_unused_fd(fd);
    ret = PTR_ERR(file);
    if (ret == -EAGAIN && force_nonblock)
    return -EAGAIN;
    if (ret == -ERESTARTSYS)
    ret = -EINTR;
    req_set_fail(req);
    - } else {
    + } else if (!fixed) {
    fd_install(fd, file);
    ret = fd;
    + } else {
    + ret = io_install_fixed_file(req, file, issue_flags);
    }
    __io_req_complete(req, issue_flags, ret, 0);
    return 0;
    --
    2.32.0
    \
     
     \ /
      Last update: 2021-07-07 13:40    [W:3.405 / U:0.024 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site