From patchwork Thu Oct 17 21:28:56 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jens Axboe X-Patchwork-Id: 1178993 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=kernel.dk Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=kernel-dk.20150623.gappssmtp.com header.i=@kernel-dk.20150623.gappssmtp.com header.b="drb8GIXs"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 46vMjx654Kz9sPT for ; Fri, 18 Oct 2019 08:29:09 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2503658AbfJQV3I (ORCPT ); Thu, 17 Oct 2019 17:29:08 -0400 Received: from mail-pg1-f195.google.com ([209.85.215.195]:36760 "EHLO mail-pg1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2503649AbfJQV3H (ORCPT ); Thu, 17 Oct 2019 17:29:07 -0400 Received: by mail-pg1-f195.google.com with SMTP id 23so2090293pgk.3 for ; Thu, 17 Oct 2019 14:29:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel-dk.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=92CYtTRoYQ39d46k61SL6rtGzWXElvZP8rT1pbbx14I=; b=drb8GIXsLGMmBXEwez6fklfxs4YzPgKuEtRwcZZj/pxkrrf1TdJuvM94qU90HWW3k6 tsjMmQ9PekHc61/M30oibRHORCDFGnxCrMU7avMUx9dndND6uNcIovXO605z4qCtD/SE rHQbOrvxbPAUUe532OhbMl9X4Jf/QFdBq735dGzJRVuEiq5FgH53SmCGnR2J4Wm1aSGS dw5nNouwe0WhfwLmjhnX4FSIxAQbGLbvclKixz85IRxfjD8UBbVFJwxNoCl9WuggMu/0 QcrwVNIWodhl0qaMjTx2mLnNbGZvoNMicRA6BJdaab9o05iARGWbb53/ZBu+nZy70+gg vJRA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=92CYtTRoYQ39d46k61SL6rtGzWXElvZP8rT1pbbx14I=; b=KwEs80z2wMMd695eQIJg2bhJsvX9amFrvYQakqLgDq39WI7c4lmHxZnmap3avEIvdt LsMSWdsi1ASLTKrhmdpUG6OWQmPa7oqxQ7+lhjOBae6B45EOGI37TSV+D5GAPvb6wUDQ dxUtEt/jP6dbrlvxW2tinjUYPx0Wj3o9bq26oaCGWaOHOaL0qthArwIJCHLfj4+USEhI 52jfabTyAagcVGFQ3UjYxdNHsNUzvI89Vf91Mw2lYNd4jIuRMUJgh30ke8+ie94PDtgy 0slKUPvs5KSr3gF1oMyVUltisaFQt6onVvSNtHsaS6pBaMMrG1O9+78k2l+Ue7syRVdA 0Pcw== X-Gm-Message-State: APjAAAUB47cyVLdjWTHwXuq05GmA9bim/PVtes3DBRHZdcDvxb1MRFec jDwfSRaYRv9lI3BPm9fn4mF0IY9YyuDL0g== X-Google-Smtp-Source: APXvYqwm6GLu+zFMnlkzYvu+ZSQTI4qYWKTk3BDgsOmRpNYNQA9qzo5v+4MOGw8e3K+rfAcgXcbalw== X-Received: by 2002:a17:90a:8c14:: with SMTP id a20mr6821770pjo.77.1571347746552; Thu, 17 Oct 2019 14:29:06 -0700 (PDT) Received: from x1.thefacebook.com ([2620:10d:c090:180::e2ce]) by smtp.gmail.com with ESMTPSA id w6sm4296446pfw.84.2019.10.17.14.29.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Oct 2019 14:29:05 -0700 (PDT) From: Jens Axboe To: linux-block@vger.kernel.org Cc: davem@davemloft.net, netdev@vger.kernel.org, Jens Axboe Subject: [PATCH 1/3] io_uring: add support for async work inheriting files table Date: Thu, 17 Oct 2019 15:28:56 -0600 Message-Id: <20191017212858.13230-2-axboe@kernel.dk> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191017212858.13230-1-axboe@kernel.dk> References: <20191017212858.13230-1-axboe@kernel.dk> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This is in preparation for adding opcodes that need to modify files in a process file table, either adding new ones or closing old ones. If an opcode needs this, it must set REQ_F_NEED_FILES in the request structure. If work that needs to get punted to async context have this set, they will grab a reference to the process file table. When the work is completed, the reference is dropped again. Signed-off-by: Jens Axboe --- fs/io_uring.c | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/fs/io_uring.c b/fs/io_uring.c index 635856023fdf..ad462237275e 100644 --- a/fs/io_uring.c +++ b/fs/io_uring.c @@ -267,10 +267,11 @@ struct io_ring_ctx { struct sqe_submit { const struct io_uring_sqe *sqe; unsigned short index; + bool has_user : 1; + bool in_async : 1; + bool needs_fixed_file : 1; u32 sequence; - bool has_user; - bool in_async; - bool needs_fixed_file; + struct files_struct *files; }; /* @@ -323,6 +324,7 @@ struct io_kiocb { #define REQ_F_FAIL_LINK 256 /* fail rest of links */ #define REQ_F_SHADOW_DRAIN 512 /* link-drain shadow req */ #define REQ_F_TIMEOUT 1024 /* timeout request */ +#define REQ_F_NEED_FILES 2048 /* needs to assume file table */ u64 user_data; u32 result; u32 sequence; @@ -2191,6 +2193,7 @@ static inline bool io_sqe_needs_user(const struct io_uring_sqe *sqe) static void io_sq_wq_submit_work(struct work_struct *work) { struct io_kiocb *req = container_of(work, struct io_kiocb, work); + struct files_struct *old_files = NULL; struct io_ring_ctx *ctx = req->ctx; struct mm_struct *cur_mm = NULL; struct async_list *async_list; @@ -2220,6 +2223,10 @@ static void io_sq_wq_submit_work(struct work_struct *work) set_fs(USER_DS); } } + if (s->files && !old_files) { + old_files = current->files; + current->files = s->files; + } if (!ret) { s->has_user = cur_mm != NULL; @@ -2312,6 +2319,11 @@ static void io_sq_wq_submit_work(struct work_struct *work) unuse_mm(cur_mm); mmput(cur_mm); } + if (old_files) { + struct files_struct *files = current->files; + current->files = old_files; + put_files_struct(files); + } } /* @@ -2413,6 +2425,8 @@ static int __io_queue_sqe(struct io_ring_ctx *ctx, struct io_kiocb *req, s->sqe = sqe_copy; memcpy(&req->submit, s, sizeof(*s)); + if (req->flags & REQ_F_NEED_FILES) + req->submit.files = get_files_struct(current); list = io_async_list_from_sqe(ctx, s->sqe); if (!io_add_to_prev_work(list, req)) { if (list) @@ -2633,6 +2647,7 @@ static bool io_get_sqring(struct io_ring_ctx *ctx, struct sqe_submit *s) s->index = head; s->sqe = &ctx->sq_sqes[head]; s->sequence = ctx->cached_sq_head; + s->files = NULL; ctx->cached_sq_head++; return true; } From patchwork Thu Oct 17 21:28:57 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jens Axboe X-Patchwork-Id: 1178994 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=kernel.dk Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=kernel-dk.20150623.gappssmtp.com header.i=@kernel-dk.20150623.gappssmtp.com header.b="fL/x/mF0"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 46vMk11Wlfz9sPK for ; Fri, 18 Oct 2019 08:29:13 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2503654AbfJQV3L (ORCPT ); Thu, 17 Oct 2019 17:29:11 -0400 Received: from mail-pf1-f196.google.com ([209.85.210.196]:38177 "EHLO mail-pf1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2503649AbfJQV3K (ORCPT ); Thu, 17 Oct 2019 17:29:10 -0400 Received: by mail-pf1-f196.google.com with SMTP id h195so2444314pfe.5 for ; Thu, 17 Oct 2019 14:29:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel-dk.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=t/7vAwNRes/OgSWHDpsbdJG9hBx8gt3i+4E5Djauy08=; b=fL/x/mF0mKRLsVdh+dTKxKht0va6UZTptQijstDQ+mxE+lCA1zJctEyFbJr4ZUr+gW 4gapsi0HxqSDjYfpJkRzfarcajQPqxe60/hKp9nfil6uBJRunxv79YdmKYJP6oT+e+qB 2Otk4ugVGzFYcr6i6yqzC9VQP6W8wjQ+mUmvm5gWPV1dIp4C0fs+ejMrlQqhZ/nVtSLT 3M/VS7nMXGNwFPa1EYwt7GWtomVU3RoeGX5nTBwlsHy7rfB36fiPFmPTR+eIsGGq7z76 mT2aNP4IsQWJtUIOpxsxFyI0kj16+JfsRBf/0gzcHBuvPlu0KT+w+RWxTbWHdHfxtG6s m3SQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=t/7vAwNRes/OgSWHDpsbdJG9hBx8gt3i+4E5Djauy08=; b=kCda0QNyqydkekN10zFGw0Mfelcp+H8Cx81dMfJeExxfxsytiW3Zb91jbyAnnSJEyO mG4uwIN1MdjwBb25jgKFP322XXSpO20uKH5MlA6NmnM2sR3KIXv+/qJ+eiPeYIGQkdQT wRsF+qw81E7GLxKpLICR0kbsRkedDv0vPqhW0NeLz/kkdDkqc8Qn8/WdhY6xl8mbuODB Km6uyYsZJvAdSMjNc71P7Ua0/u1vU24CK/xiW0Mt44LE4h8kPOQhh95nMdMOjBVyPToF LB6H2Pl5tfalTgtdLx6DwJvoz26J9tWTlJYJhF7ctsidkM7gts3C0b0MncioybJb+1je gTtA== X-Gm-Message-State: APjAAAWpAn48JaZGfQP61P+sIH9sK2y1TJi5FHWz8x5pLbygjnDkoQc4 FZ1sIMPkQXZqufujFTkWk5O/Rw== X-Google-Smtp-Source: APXvYqw65pCCcLYeaf21mep1NwRzBJTCNVlFgTO5nxL3xO5V1yrj/5N6zT0zFBgarGPJ//ENeBWVpQ== X-Received: by 2002:a17:90a:6508:: with SMTP id i8mr6863936pjj.44.1571347749177; Thu, 17 Oct 2019 14:29:09 -0700 (PDT) Received: from x1.thefacebook.com ([2620:10d:c090:180::e2ce]) by smtp.gmail.com with ESMTPSA id w6sm4296446pfw.84.2019.10.17.14.29.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Oct 2019 14:29:08 -0700 (PDT) From: Jens Axboe To: linux-block@vger.kernel.org Cc: davem@davemloft.net, netdev@vger.kernel.org, Jens Axboe Subject: [PATCH 2/3] net: add __sys_accept4_file() helper Date: Thu, 17 Oct 2019 15:28:57 -0600 Message-Id: <20191017212858.13230-3-axboe@kernel.dk> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191017212858.13230-1-axboe@kernel.dk> References: <20191017212858.13230-1-axboe@kernel.dk> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This is identical to __sys_accept4(), 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. Cc: David Miller Cc: netdev@vger.kernel.org Signed-off-by: Jens Axboe --- include/linux/socket.h | 3 ++ net/socket.c | 65 ++++++++++++++++++++++++++---------------- 2 files changed, 44 insertions(+), 24 deletions(-) diff --git a/include/linux/socket.h b/include/linux/socket.h index fc0bed59fc84..dd061f741bc1 100644 --- a/include/linux/socket.h +++ b/include/linux/socket.h @@ -392,6 +392,9 @@ extern int __sys_recvfrom(int fd, void __user *ubuf, size_t size, extern int __sys_sendto(int fd, void __user *buff, size_t len, unsigned int flags, struct sockaddr __user *addr, int addr_len); +extern int __sys_accept4_file(struct file *file, unsigned file_flags, + struct sockaddr __user *upeer_sockaddr, + int __user *upeer_addrlen, int flags); 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); diff --git a/net/socket.c b/net/socket.c index 6a9ab7a8b1d2..40ab39f6c5d8 100644 --- a/net/socket.c +++ b/net/socket.c @@ -1690,24 +1690,13 @@ SYSCALL_DEFINE2(listen, int, fd, int, backlog) return __sys_listen(fd, backlog); } -/* - * For accept, we attempt to create a new socket, set up the link - * with the client, wake up the client, then return the new - * connected fd. We collect the address of the connector in kernel - * space and move it to user at the very end. This is unclean because - * we open the socket then return an error. - * - * 1003.1g adds the ability to recvmsg() to query connection pending - * status to recvmsg. We need to add that support in a way thats - * clean when we restructure accept also. - */ - -int __sys_accept4(int fd, struct sockaddr __user *upeer_sockaddr, - int __user *upeer_addrlen, int flags) +int __sys_accept4_file(struct file *file, unsigned file_flags, + struct sockaddr __user *upeer_sockaddr, + int __user *upeer_addrlen, int flags) { struct socket *sock, *newsock; struct file *newfile; - int err, len, newfd, fput_needed; + int err, len, newfd; struct sockaddr_storage address; if (flags & ~(SOCK_CLOEXEC | SOCK_NONBLOCK)) @@ -1716,14 +1705,14 @@ int __sys_accept4(int fd, struct sockaddr __user *upeer_sockaddr, if (SOCK_NONBLOCK != O_NONBLOCK && (flags & SOCK_NONBLOCK)) flags = (flags & ~SOCK_NONBLOCK) | O_NONBLOCK; - sock = sockfd_lookup_light(fd, &err, &fput_needed); + sock = sock_from_file(file, &err); if (!sock) goto out; err = -ENFILE; newsock = sock_alloc(); if (!newsock) - goto out_put; + goto out; newsock->type = sock->type; newsock->ops = sock->ops; @@ -1738,20 +1727,21 @@ int __sys_accept4(int fd, struct sockaddr __user *upeer_sockaddr, if (unlikely(newfd < 0)) { err = newfd; sock_release(newsock); - goto out_put; + goto out; } newfile = sock_alloc_file(newsock, flags, sock->sk->sk_prot_creator->name); if (IS_ERR(newfile)) { err = PTR_ERR(newfile); put_unused_fd(newfd); - goto out_put; + goto out; } err = security_socket_accept(sock, newsock); if (err) goto out_fd; - err = sock->ops->accept(sock, newsock, sock->file->f_flags, false); + err = sock->ops->accept(sock, newsock, sock->file->f_flags | file_flags, + false); if (err < 0) goto out_fd; @@ -1772,15 +1762,42 @@ int __sys_accept4(int fd, struct sockaddr __user *upeer_sockaddr, fd_install(newfd, newfile); err = newfd; - -out_put: - fput_light(sock->file, fput_needed); out: return err; out_fd: fput(newfile); put_unused_fd(newfd); - goto out_put; + goto out; + +} + +/* + * For accept, we attempt to create a new socket, set up the link + * with the client, wake up the client, then return the new + * connected fd. We collect the address of the connector in kernel + * space and move it to user at the very end. This is unclean because + * we open the socket then return an error. + * + * 1003.1g adds the ability to recvmsg() to query connection pending + * status to recvmsg. We need to add that support in a way thats + * clean when we restructure accept also. + */ + +int __sys_accept4(int fd, struct sockaddr __user *upeer_sockaddr, + int __user *upeer_addrlen, int flags) +{ + int ret = -EBADF; + struct fd f; + + f = fdget(fd); + if (f.file) { + ret = __sys_accept4_file(f.file, 0, upeer_sockaddr, + upeer_addrlen, flags); + if (f.flags) + fput(f.file); + } + + return ret; } SYSCALL_DEFINE4(accept4, int, fd, struct sockaddr __user *, upeer_sockaddr, From patchwork Thu Oct 17 21:28:58 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jens Axboe X-Patchwork-Id: 1178995 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=kernel.dk Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=kernel-dk.20150623.gappssmtp.com header.i=@kernel-dk.20150623.gappssmtp.com header.b="hPSBkvGi"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 46vMk31qSmz9sP7 for ; Fri, 18 Oct 2019 08:29:15 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2503659AbfJQV3O (ORCPT ); Thu, 17 Oct 2019 17:29:14 -0400 Received: from mail-pf1-f193.google.com ([209.85.210.193]:40282 "EHLO mail-pf1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2503649AbfJQV3M (ORCPT ); Thu, 17 Oct 2019 17:29:12 -0400 Received: by mail-pf1-f193.google.com with SMTP id x127so2436054pfb.7 for ; Thu, 17 Oct 2019 14:29:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel-dk.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=doYdHShm7Cj6c5yy0xMLHFKPEk8aJtR5YML+JUnmtX8=; b=hPSBkvGihBWMfS/THlqQxutH+w1AuaWzHDziJJpI2bdMNmcS9hr71S7mmR59eGs6tO m+lypp2NuuiH6ZEKSdXFuXQmhwpCT4hHn2SnqGc/h00eWTlsYA9+hXmUNTV2byEWJOdw erCSC+bcyauQNJHW1EnbnfqdleE2R7/boxRATJz8tnhrn/8jYRhx0QFoaJ4iVg9YNxxo gyNEC9Nr+vGrAGYjna0SYqIptcQ6CeZ+mrTsIuNlZSHsmAJd/tkpgaTYq+Xoa3hftBkB PgVrtlzpfPdDuBZTRJYhkH24W3SEeJyJmQwKvhJZerHEMVfhwBhm9c5V93wEAKC6hoUI yPBw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=doYdHShm7Cj6c5yy0xMLHFKPEk8aJtR5YML+JUnmtX8=; b=XvBuH+zsFh2XFLSn6DVvRRaVHm7axU6BCjn4QZTeu1Vi3flkqA7aiPrdQPj6M9FAtL n/uMMTk3Dlnpglra6gO44mx4KwbKQbXarDbXOsEyqW/thUli72dt+MuU0CR5uMBvtX5k IB9C7A4CZShuzktr/kRYqeXKkaXaSUhWznyT4nkR6F5Klwq7LIVsD4YZHPeSXQ4e01e7 ok+dGQ18ieEffYo51N0wO1mP6aOg5v8IjuKjq2FmPDKsVBMnAgsfGp1ID9Y64WCVk9sM HiSeogzL6T+pg2WxzMI64ajOCMVcib86QVG5mAi3tajK80KsSsegrd7jrId6xpQoQEKR Y2fQ== X-Gm-Message-State: APjAAAVQag+mb5AKD3x42+gyMo6GGHMcrCURIx2y8qhEdnT/1nn0CFGL 1TiVQG69yZMU2GnXmYSpbuS8gg== X-Google-Smtp-Source: APXvYqyEn7Tz/OO0FGVOq3vwqrkRJjAra9c1NDd8sbbDTq7xFSlmrOLUotkwy3IcJD1TD48GEh9BrQ== X-Received: by 2002:a17:90a:17e1:: with SMTP id q88mr6872814pja.134.1571347751462; Thu, 17 Oct 2019 14:29:11 -0700 (PDT) Received: from x1.thefacebook.com ([2620:10d:c090:180::e2ce]) by smtp.gmail.com with ESMTPSA id w6sm4296446pfw.84.2019.10.17.14.29.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Oct 2019 14:29:10 -0700 (PDT) From: Jens Axboe To: linux-block@vger.kernel.org Cc: davem@davemloft.net, netdev@vger.kernel.org, Jens Axboe Subject: [PATCH 3/3] io_uring: add support for IORING_OP_ACCEPT Date: Thu, 17 Oct 2019 15:28:58 -0600 Message-Id: <20191017212858.13230-4-axboe@kernel.dk> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191017212858.13230-1-axboe@kernel.dk> References: <20191017212858.13230-1-axboe@kernel.dk> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This allows an application to call accept4() in an async fashion. Like other opcodes, we first try a non-blocking accept, then punt to async context if we have to. Signed-off-by: Jens Axboe --- fs/io_uring.c | 35 +++++++++++++++++++++++++++++++++++ include/uapi/linux/io_uring.h | 7 ++++++- 2 files changed, 41 insertions(+), 1 deletion(-) diff --git a/fs/io_uring.c b/fs/io_uring.c index ad462237275e..8d183a6b08d4 100644 --- a/fs/io_uring.c +++ b/fs/io_uring.c @@ -1694,6 +1694,38 @@ static int io_recvmsg(struct io_kiocb *req, const struct io_uring_sqe *sqe, #endif } +static int io_accept(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; + int __user *addr_len; + unsigned file_flags; + int flags, ret; + + if (unlikely(req->ctx->flags & IORING_SETUP_IOPOLL)) + return -EINVAL; + + addr = (struct sockaddr __user *) READ_ONCE(sqe->addr); + addr_len = (int __user *) READ_ONCE(sqe->addr2); + flags = READ_ONCE(sqe->accept_flags); + file_flags = force_nonblock ? O_NONBLOCK : 0; + + ret = __sys_accept4_file(req->file, file_flags, addr, addr_len, flags); + if (ret == -EAGAIN && force_nonblock) { + req->flags |= REQ_F_NEED_FILES; + return -EAGAIN; + } + if (ret < 0 && (req->flags & REQ_F_LINK)) + req->flags |= REQ_F_FAIL_LINK; + io_cqring_add_event(req->ctx, sqe->user_data, ret); + io_put_req(req, nxt); + return 0; +#else + return -EOPNOTSUPP; +#endif +} + static void io_poll_remove_one(struct io_kiocb *req) { struct io_poll_iocb *poll = &req->poll; @@ -2144,6 +2176,9 @@ static int __io_submit_sqe(struct io_ring_ctx *ctx, struct io_kiocb *req, case IORING_OP_TIMEOUT_REMOVE: ret = io_timeout_remove(req, s->sqe); break; + case IORING_OP_ACCEPT: + ret = io_accept(req, s->sqe, nxt, force_nonblock); + break; default: ret = -EINVAL; break; diff --git a/include/uapi/linux/io_uring.h b/include/uapi/linux/io_uring.h index 6dc5ced1c37a..f82d90e617a6 100644 --- a/include/uapi/linux/io_uring.h +++ b/include/uapi/linux/io_uring.h @@ -19,7 +19,10 @@ struct io_uring_sqe { __u8 flags; /* IOSQE_ flags */ __u16 ioprio; /* ioprio for the request */ __s32 fd; /* file descriptor to do IO on */ - __u64 off; /* offset into file */ + union { + __u64 off; /* offset into file */ + __u64 addr2; + }; __u64 addr; /* pointer to buffer or iovecs */ __u32 len; /* buffer size or number of iovecs */ union { @@ -29,6 +32,7 @@ struct io_uring_sqe { __u32 sync_range_flags; __u32 msg_flags; __u32 timeout_flags; + __u32 accept_flags; }; __u64 user_data; /* data to be passed back at completion time */ union { @@ -65,6 +69,7 @@ struct io_uring_sqe { #define IORING_OP_RECVMSG 10 #define IORING_OP_TIMEOUT 11 #define IORING_OP_TIMEOUT_REMOVE 12 +#define IORING_OP_ACCEPT 13 /* * sqe->fsync_flags