io_uring: add support for connect()
Subsystems (5)
Jens Axboe
maintainercover io_uring: add support for connect()
Pretty trivially done, now that we support file table inheritance. This is done in a similar fashion to the accept4() support, by adding a __sys_connect_file() helper and using that from io_uring.
fs/io_uring.c | 37 +++++++++++++++++++++++++++++++++++ include/linux/socket.h | 3 +++ include/uapi/linux/io_uring.h | 1 + net/socket.c | 30 ++++++++++++++++++++-------- 4 files changed, 63 insertions(+), 8 deletions(-)
Signature · 1 line
Jens Axboe
Jens Axboe
maintainerPATCH 1/2 net: add __sys_connect_file() helper
This is identical to __sys_connect(), except it takes a struct file instead of an fd, and it also allows passing in extra file->f_flags flags. The latter is done to support masking in O_NONBLOCK without manipulating the original file flags.
No functional changes in this patch.
--- include/linux/socket.h | 3 +++ net/socket.c | 30 ++++++++++++++++++++++-------- 2 files changed, 25 insertions(+), 8 deletions(-)
include/linux/socket.h +3 -0
@@ -399,6 +399,9 @@ extern int __sys_accept4(int fd, struct sockaddr __user *upeer_sockaddr, int __user *upeer_addrlen, int flags);extern int __sys_socket (int family,int type,int protocol);extern int __sys_bind (int fd,struct sockaddr __user *umyaddr,int addrlen); +extern int __sys_connect_file (struct file *file, +struct sockaddr __user *uservaddr,int addrlen, +int file_flags);extern int __sys_connect (int fd,struct sockaddr __user *uservaddr,int addrlen);extern int __sys_listen (int fd,int backlog);
net/socket.c +22 -8
@@ -1824,32 +1824,46 @@ SYSCALL_DEFINE3(accept, int, fd, struct sockaddr __user *, upeer_sockaddr,* include the -EINPROGRESS status for such sockets. */ -int __sys_connect (int fd,struct sockaddr __user *uservaddr,int addrlen) +int __sys_connect_file (struct file *file,struct sockaddr __user *uservaddr, +int addrlen,int file_flags) {struct socket *sock;struct sockaddr_storage address; -int err, fput_needed; +int err; - sock =sockfd_lookup_light (fd, &err, &fput_needed); + sock =sock_from_file (file, &err);if (!sock) goto out; err =move_addr_to_kernel (uservaddr, addrlen, &address);if (err <0 ) - goto out_put; + goto out; err =security_socket_connect (sock, (struct sockaddr *)&address, addrlen);if (err) - goto out_put; + goto out; err = sock->ops->connect (sock, (struct sockaddr *)&address, addrlen, - sock->file->f_flags); -out_put: -fput_light (sock->file, fput_needed); + sock->file->f_flags | file_flags); out:return err; } +int __sys_connect (int fd,struct sockaddr __user *uservaddr,int addrlen) +{ +int ret = -EBADF ; +struct fd f; + + f =fdget (fd); +if (f.file) { + ret =__sys_connect_file (f.file, uservaddr, addrlen,0 ); +if (f.flags) +fput (f.file); + } + +return ret; +} + SYSCALL_DEFINE3(connect, int, fd, struct sockaddr __user *, uservaddr, int, addrlen) {
Signature · 1 line
2.24.0
Jens Axboe
maintainerPATCH 2/2 io_uring: add support for IORING_OP_CONNECT
In reply to Jens AxboeThis allows an application to call connect() in an async fashion. Like other opcodes, we first try a non-blocking accept, then punt to async context if we have to.
--- fs/io_uring.c | 37 +++++++++++++++++++++++++++++++++++ include/uapi/linux/io_uring.h | 1 + 2 files changed, 38 insertions(+)
fs/io_uring.c +37 -0
@@ -1968,6 +1968,40 @@ static int io_accept(struct io_kiocb *req, const struct io_uring_sqe *sqe,#endif } +static int io_connect (struct io_kiocb *req,const struct io_uring_sqe *sqe, +struct io_kiocb **nxt,bool force_nonblock) +{ +#if defined(CONFIG_NET ) +struct sockaddr __user *addr; +unsigned file_flags; +int addr_len, ret; + +if (unlikely (req->ctx->flags & (IORING_SETUP_IOPOLL |IORING_SETUP_SQPOLL ))) +return -EINVAL ; +if (sqe->ioprio || sqe->off || sqe->len || sqe->buf_index || sqe->flags) +return -EINVAL ; + + addr = (struct sockaddr __user *) (unsigned long )READ_ONCE (sqe->addr); + addr_len =READ_ONCE (sqe->addr2); + file_flags = force_nonblock ?O_NONBLOCK :0 ; + + ret =__sys_connect_file (req->file, addr, addr_len, file_flags); +if ((ret == -EAGAIN || ret == -EINPROGRESS ) && force_nonblock) { + req->work.flags |=IO_WQ_WORK_NEEDS_FILES ; +return -EAGAIN ; + } +if (ret == -ERESTARTSYS ) + ret = -EINTR ; +if (ret <0 && (req->flags &REQ_F_LINK )) + req->flags |=REQ_F_FAIL_LINK ; +io_cqring_add_event (req, ret); +io_put_req_find_next (req, nxt); +return 0 ; +#else +return -EOPNOTSUPP ; +#endif +} +static inline void io_poll_remove_req (struct io_kiocb *req) {if (!RB_EMPTY_NODE (&req->rb_node)) {
@@ -2622,6 +2656,9 @@ static int io_issue_sqe(struct io_kiocb *req, struct io_kiocb **nxt,case IORING_OP_ACCEPT : ret =io_accept (req, s->sqe, nxt, force_nonblock);break ; +case IORING_OP_CONNECT : + ret =io_connect (req, s->sqe, nxt, force_nonblock); +break ;case IORING_OP_ASYNC_CANCEL : ret =io_async_cancel (req, s->sqe, nxt);break ;
include/uapi/linux/io_uring.h +1 -0
@@ -73,6 +73,7 @@ struct io_uring_sqe {#define IORING_OP_ACCEPT 13#define IORING_OP_ASYNC_CANCEL 14#define IORING_OP_LINK_TIMEOUT 15 +#define IORING_OP_CONNECT 16/* * sqe->fsync_flags
Signature · 1 line
2.24.0