From nobody Wed Jul 1 04:16:44 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8CDDBC433FE for ; Thu, 30 Dec 2021 12:01:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239129AbhL3MBW (ORCPT ); Thu, 30 Dec 2021 07:01:22 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34898 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239136AbhL3MBU (ORCPT ); Thu, 30 Dec 2021 07:01:20 -0500 Received: from mail-pl1-x630.google.com (mail-pl1-x630.google.com [IPv6:2607:f8b0:4864:20::630]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 274A7C061574; Thu, 30 Dec 2021 04:01:20 -0800 (PST) Received: by mail-pl1-x630.google.com with SMTP id c3so4886674pls.5; Thu, 30 Dec 2021 04:01:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Zo8MqU7um74x8FzU/Cge4ipaSqWEBCRhFz3uE6S7/GE=; b=i/HzMOcV4lYhLZ4t43adzpIbSrK5BIqylqbtgWU599ncKVBhXaDK7e+XyQL+ddWLUl tFkSMmjg2+tgtacKhJolp7mUlG/dOIr6Lb2u0eOl8hNgFMnqQBpac2zhn63I8ir/jWsU uB8uoM9zu7bln35zW4m8QIoqEwC3UnkDY4H1hx0DvPfuwo2O/aVm2Q5vRQx8AlvtXnao EXi42044hzYZE3kWJXICzlNirMsOriurO3Ag5TElHlvrh/C454bh/LVzNVodoxeADAk8 lWSFhJOkSynHG0NvBxTYzaQXRAe4mfdcnm53+Bl1i64ihyLTQtvVeVPKUYXgXuDhwkV+ fhsQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Zo8MqU7um74x8FzU/Cge4ipaSqWEBCRhFz3uE6S7/GE=; b=j81mYbkKeIO3h31dATEg3stbbj+9UKEcb0aXBLWvKBurfnZfrtj58J3XbO5eZe8cyl peVtMqXd0kGPbkXfGTVreJZwVeZP+DWZdHcpUz0ceTgfuL+dCnZJqnI+l0/wB79cMZCE EJnQNJEurG5/q46nfQiXSxGAhN2jk05bOtOld/BHYWYR1SPujrQE6lD6XGhqpKboXuh/ oDQf90yG01fm2eV/kJxggyA006ra/nCHDe7lhD9dK+4HLldkcPD851RfTwVLiZDYfVJA 6T/rz3dTlo/YpNn5v5L+TKyMynGgf0o4AncEZ1D6WQD4+WKeFk5XY+qRBsL5LHE/0pfH lDKA== X-Gm-Message-State: AOAM533oc9NoY5Wjbpx8lBnxqgVcu9Q2iISngaZVzUp+nEViun4k3IY4 wnUy/b7apKZtj4jB8YWii7M= X-Google-Smtp-Source: ABdhPJwN2YNvvBPxemF14e5XC0gLkj9dMX87HImTBE8sXe9NgyN2SvD2n20xcRp8cbZn5f6ASrGZpQ== X-Received: by 2002:a17:90a:d3c2:: with SMTP id d2mr17592450pjw.219.1640865679742; Thu, 30 Dec 2021 04:01:19 -0800 (PST) Received: from integral2.. ([180.254.126.2]) by smtp.gmail.com with ESMTPSA id nn16sm30121257pjb.54.2021.12.30.04.01.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Dec 2021 04:01:19 -0800 (PST) From: Ammar Faizi To: Jens Axboe Cc: io-uring Mailing List , Pavel Begunkov , "David S . Miller" , Jakub Kicinski , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Ammar Faizi , Nugra Subject: [RFC PATCH v2 1/3] io_uring: Rename `io_{send,recv}` to `io_{sendto,recvfrom}` Date: Thu, 30 Dec 2021 19:00:42 +0700 Message-Id: <20211230115057.139187-1-ammar.faizi@intel.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211230114846.137954-1-ammar.faizi@intel.com> References: <20211230114846.137954-1-ammar.faizi@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Currently we can perform `send` and `recv` via io_uring. And now, we are going to add `sendto` and `recvfrom` support for io_uring. Note that: Calling `send(fd, buf, len, flags)` is equivalent to calling `sendto(fd, buf, len, flags, NULL, 0)`. Therefore, `sendto` is a superset of `send`. Calling `recv(fd, buf, len, flags)` is equivalent to calling `recvfrom(fd, buf, len, flags, NULL, NULL)`. Therefore, `recvfrom` is a superset of `recv`. As such, let's direct the current supported `IORING_OP_{SEND,RECV}` to `io_{sendto,recvfrom}`. These functions will also be used for `IORING_OP_{SENDTO,RECVFROM}` operation in the next patches. Cc: Nugra Signed-off-by: Ammar Faizi --- fs/io_uring.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/fs/io_uring.c b/fs/io_uring.c index 90002bb3fdf4..d564f98d5d3b 100644 --- a/fs/io_uring.c +++ b/fs/io_uring.c @@ -5273,7 +5273,7 @@ static int io_sendmsg(struct io_kiocb *req, unsigned = int issue_flags) return 0; } =20 -static int io_send(struct io_kiocb *req, unsigned int issue_flags) +static int io_sendto(struct io_kiocb *req, unsigned int issue_flags) { struct io_sr_msg *sr =3D &req->sr_msg; struct msghdr msg; @@ -5499,7 +5499,7 @@ static int io_recvmsg(struct io_kiocb *req, unsigned = int issue_flags) return 0; } =20 -static int io_recv(struct io_kiocb *req, unsigned int issue_flags) +static int io_recvfrom(struct io_kiocb *req, unsigned int issue_flags) { struct io_buffer *kbuf; struct io_sr_msg *sr =3D &req->sr_msg; @@ -7061,13 +7061,13 @@ static int io_issue_sqe(struct io_kiocb *req, unsig= ned int issue_flags) ret =3D io_sendmsg(req, issue_flags); break; case IORING_OP_SEND: - ret =3D io_send(req, issue_flags); + ret =3D io_sendto(req, issue_flags); break; case IORING_OP_RECVMSG: ret =3D io_recvmsg(req, issue_flags); break; case IORING_OP_RECV: - ret =3D io_recv(req, issue_flags); + ret =3D io_recvfrom(req, issue_flags); break; case IORING_OP_TIMEOUT: ret =3D io_timeout(req, issue_flags); --=20 2.32.0 From nobody Wed Jul 1 04:16:44 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 07C50C433FE for ; Thu, 30 Dec 2021 12:01:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239145AbhL3MB2 (ORCPT ); Thu, 30 Dec 2021 07:01:28 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34926 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239155AbhL3MBZ (ORCPT ); Thu, 30 Dec 2021 07:01:25 -0500 Received: from mail-pg1-x52f.google.com (mail-pg1-x52f.google.com [IPv6:2607:f8b0:4864:20::52f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BDD73C061401; Thu, 30 Dec 2021 04:01:24 -0800 (PST) Received: by mail-pg1-x52f.google.com with SMTP id i8so12753680pgt.13; Thu, 30 Dec 2021 04:01:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=SXKZhmw0DntqN3lXPBfZG3vOv+diEwlNuMVW/hXFmB8=; b=FuycI1w5QoYAIOIjm3+OLASs6NMDHAtJkXwijUjprxcbNcvLfv13lzRQVcNWPCitJL /n0oZqiSiKp8z2vBLP6AUxXw9wpyqHnk5mxG8a0q9GeiBUd38WoWBEF0MWW8ie+kVgeA Gb3PWTHuM+15EETXLutKCUrdCBOLCAtsF0RgGJ/jH0vY/3gF8ejzmtiow0fbZT0cn8Ud G6G7LF5iDiDt2aRuz5cfoEXXcuXlY4fd7G3OwQn2W2v1Cg1kPfM3eaO+uJRRoeLPn02s E0F/UQukUpq+cAyStAhrG6yw73UN/HSswXtOJyg4D35jKWL8qN3mN2Vdd5WfL/Fdbtpq /OIg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=SXKZhmw0DntqN3lXPBfZG3vOv+diEwlNuMVW/hXFmB8=; b=UTKo4hFyX9FvmMB7l8kyjiAcSIK2NLIkkdSS+2UiitoOVORoSATqHzY97C1Tp1Ac8E z73lXKiXDYsv10RL6d9Ize57kYYqbXRD9dw0jha0YSWpRZ4zWZXTCl5wSuJxpiBAfiOS nC0RREulauPCtkKRJSQslkVR0UMoAjEPAB0JWubEF2MUWRSfmuadR3e+2QOXH0dBbgqS OAELIJmLrVDgIpM6Yp0JEGSRKwm78q0qRRWTsvToGF9B6i0Fcjh2sctj+8VO0ilWKFJq f47hx7X7VPm6ZpGrAc/wox3MnHXGitqHmcDVi8vGWVZkaFqxGBSwg6dymBYoDJQ5Sm/R 2Ncw== X-Gm-Message-State: AOAM531nYJqc2eQTFfTyCJtQIEbnT7mWz2cCA2Yl64eofiYh5eYaXkiv ccUv7Dbnkds7Ai3NFlh/UY4= X-Google-Smtp-Source: ABdhPJxqwj4rnHI59Om5vv6n74ym0YPBO1MS9r0VaQft8oeHyB3/O16wNyW0L4xbHc74ZDUADNtTQQ== X-Received: by 2002:a62:b503:0:b0:4bc:657e:cfa6 with SMTP id y3-20020a62b503000000b004bc657ecfa6mr1033254pfe.25.1640865684242; Thu, 30 Dec 2021 04:01:24 -0800 (PST) Received: from integral2.. ([180.254.126.2]) by smtp.gmail.com with ESMTPSA id nn16sm30121257pjb.54.2021.12.30.04.01.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Dec 2021 04:01:23 -0800 (PST) From: Ammar Faizi To: Jens Axboe Cc: io-uring Mailing List , Pavel Begunkov , "David S . Miller" , Jakub Kicinski , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Ammar Faizi , Nugra Subject: [RFC PATCH v2 2/3] net: Make `move_addr_to_user()` be a non static function Date: Thu, 30 Dec 2021 19:00:43 +0700 Message-Id: <20211230115057.139187-2-ammar.faizi@intel.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211230114846.137954-1-ammar.faizi@intel.com> References: <20211230114846.137954-1-ammar.faizi@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" In order to add recvfrom support for io_uring, we need to call `move_addr_to_user()` in fs/io_uring.c. This makes `move_addr_to_user()` be a non static function so we can call it from io_uring. Cc: "David S. Miller" Cc: Jakub Kicinski Cc: netdev@vger.kernel.org Cc: Nugra Signed-off-by: Ammar Faizi --- include/linux/socket.h | 2 ++ net/socket.c | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/include/linux/socket.h b/include/linux/socket.h index 8ef26d89ef49..0d0bc1ace50c 100644 --- a/include/linux/socket.h +++ b/include/linux/socket.h @@ -371,6 +371,8 @@ struct ucred { #define IPX_TYPE 1 =20 extern int move_addr_to_kernel(void __user *uaddr, int ulen, struct sockad= dr_storage *kaddr); +extern int move_addr_to_user(struct sockaddr_storage *kaddr, int klen, + void __user *uaddr, int __user *ulen); extern int put_cmsg(struct msghdr*, int level, int type, int len, void *da= ta); =20 struct timespec64; diff --git a/net/socket.c b/net/socket.c index 7f64a6eccf63..af521d351c8a 100644 --- a/net/socket.c +++ b/net/socket.c @@ -267,8 +267,8 @@ int move_addr_to_kernel(void __user *uaddr, int ulen, s= truct sockaddr_storage *k * specified. Zero is returned for a success. */ =20 -static int move_addr_to_user(struct sockaddr_storage *kaddr, int klen, - void __user *uaddr, int __user *ulen) +int move_addr_to_user(struct sockaddr_storage *kaddr, int klen, + void __user *uaddr, int __user *ulen) { int err; int len; --=20 2.32.0 From nobody Wed Jul 1 04:16:44 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id CB11DC433F5 for ; Thu, 30 Dec 2021 12:01:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239166AbhL3MBa (ORCPT ); Thu, 30 Dec 2021 07:01:30 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34942 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239155AbhL3MB2 (ORCPT ); Thu, 30 Dec 2021 07:01:28 -0500 Received: from mail-pl1-x62a.google.com (mail-pl1-x62a.google.com [IPv6:2607:f8b0:4864:20::62a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A6C32C061574; Thu, 30 Dec 2021 04:01:28 -0800 (PST) Received: by mail-pl1-x62a.google.com with SMTP id u16so18099454plg.9; Thu, 30 Dec 2021 04:01:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=TDgv196gWb07CUyUUcwYdYWixQvIpSIJ3cIHNOMMxdA=; b=h2E5pj3CBlbfIatpL/8mghPAEsde92sVrILb0KJsZOaoWzMBWAKlozW0XVAzLgVtrX 3N2oOmWrlihbXpVJbdRwHtW/jTsaFaPkTdOtQaTH4suqdLxSRFZ0wFCKMwIlUrP1PkeY U6d8IU6ah+7xRYShRqLAhtlBO3gcky4wiy85UR66CLHZhIcpOsmN3pBgbqeGkIhwUV/D luX6UwRh6c4e0T96thxfdgi6HrnwQ3hwSeUu9IxLxWkujfZeUJY9zzd5QM6PDBWod5Cz oXjG1dX2ePP1EcPRJeclyb3W6avcmC/S1gxrvx6ZWsCOuPeV1Ny2bMHdBVelKOROSA8k Ptxw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=TDgv196gWb07CUyUUcwYdYWixQvIpSIJ3cIHNOMMxdA=; b=Gat45n+t/zU4dO9SFnzjn9g0t0yfZdMeliPNUpTom8R23h1KoFkiJgdtX5hvlDk/IX rdcL46YLwiVjQ01+4yhve/lbn19WQdknzR4uIOxf6LVWBeednYnIa3s/VoBH/uUorS/i P4AjDZiDccAv02aqXeE5kW4+ZWnintBpElT63NSd5j5YwWYxyYqlrFkipWhzlwm6/+9s oGaODvF1Vneesz3LMIgiR276liNQdjoZK8u7SUsdg5mPcYHv5Fuxvfi5pfXOiKRy+2vg MxZ/3LYZf3z9gzpDfDwzoRPDIXq674qmC3LtOWnWFPeG1go7MyHpEgdsjdXGLqeVnsCF qUtQ== X-Gm-Message-State: AOAM533hIWsyF2c+g+i1BjCu4WvNo8uuN1yTHjNYGfvzavda8hnL889q qobp/53Q6i2r2ZFpWajAq5A= X-Google-Smtp-Source: ABdhPJxaQCUygBLiCTLvaAZ6SpNVkdZhcWBaL38Hipx0lk3rO69WkkThN8edSm63kJ3fnFp0c2cMGw== X-Received: by 2002:a17:903:11c5:b0:149:a8cf:37da with SMTP id q5-20020a17090311c500b00149a8cf37damr1350032plh.132.1640865688190; Thu, 30 Dec 2021 04:01:28 -0800 (PST) Received: from integral2.. ([180.254.126.2]) by smtp.gmail.com with ESMTPSA id nn16sm30121257pjb.54.2021.12.30.04.01.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Dec 2021 04:01:27 -0800 (PST) From: Ammar Faizi To: Jens Axboe Cc: io-uring Mailing List , Pavel Begunkov , "David S . Miller" , Jakub Kicinski , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Ammar Faizi , Nugra Subject: [RFC PATCH v2 3/3] io_uring: Add `sendto(2)` and `recvfrom(2)` support Date: Thu, 30 Dec 2021 19:00:44 +0700 Message-Id: <20211230115057.139187-3-ammar.faizi@intel.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211230114846.137954-1-ammar.faizi@intel.com> References: <20211230114846.137954-1-ammar.faizi@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" This adds sendto(2) and recvfrom(2) support for io_uring. New opcodes: IORING_OP_SENDTO IORING_OP_RECVFROM Cc: Nugra Link: https://github.com/axboe/liburing/issues/397 Signed-off-by: Ammar Faizi --- v2: - In `io_recvfrom()`, mark the error check of `move_addr_to_user()` call as unlikely. - Fix build error when CONFIG_NET is undefined. fs/io_uring.c | 84 ++++++++++++++++++++++++++++++++--- include/uapi/linux/io_uring.h | 2 + 2 files changed, 80 insertions(+), 6 deletions(-) diff --git a/fs/io_uring.c b/fs/io_uring.c index d564f98d5d3b..3726958f8f58 100644 --- a/fs/io_uring.c +++ b/fs/io_uring.c @@ -575,7 +575,15 @@ struct io_sr_msg { union { struct compat_msghdr __user *umsg_compat; struct user_msghdr __user *umsg; - void __user *buf; + + struct { + void __user *buf; + struct sockaddr __user *addr; + union { + int sendto_addr_len; + int __user *recvfrom_addr_len; + }; + }; }; int msg_flags; int bgid; @@ -1133,6 +1141,19 @@ static const struct io_op_def io_op_defs[] =3D { .needs_file =3D 1 }, [IORING_OP_GETXATTR] =3D {}, + [IORING_OP_SENDTO] =3D { + .needs_file =3D 1, + .unbound_nonreg_file =3D 1, + .pollout =3D 1, + .audit_skip =3D 1, + }, + [IORING_OP_RECVFROM] =3D { + .needs_file =3D 1, + .unbound_nonreg_file =3D 1, + .pollin =3D 1, + .buffer_select =3D 1, + .audit_skip =3D 1, + }, }; =20 /* requests with any of those set should undergo io_disarm_next() */ @@ -5216,12 +5237,24 @@ static int io_sendmsg_prep(struct io_kiocb *req, co= nst struct io_uring_sqe *sqe) if (unlikely(req->ctx->flags & IORING_SETUP_IOPOLL)) return -EINVAL; =20 + /* + * For IORING_OP_SEND{,TO}, the assignment to @sr->umsg + * is equivalent to an assignment to @sr->buf. + */ sr->umsg =3D u64_to_user_ptr(READ_ONCE(sqe->addr)); + sr->len =3D READ_ONCE(sqe->len); sr->msg_flags =3D READ_ONCE(sqe->msg_flags) | MSG_NOSIGNAL; if (sr->msg_flags & MSG_DONTWAIT) req->flags |=3D REQ_F_NOWAIT; =20 + if (req->opcode =3D=3D IORING_OP_SENDTO) { + sr->addr =3D u64_to_user_ptr(READ_ONCE(sqe->addr2)); + sr->sendto_addr_len =3D READ_ONCE(sqe->addr3); + } else { + sr->addr =3D (struct sockaddr __user *) NULL; + } + #ifdef CONFIG_COMPAT if (req->ctx->compat) sr->msg_flags |=3D MSG_CMSG_COMPAT; @@ -5275,6 +5308,7 @@ static int io_sendmsg(struct io_kiocb *req, unsigned = int issue_flags) =20 static int io_sendto(struct io_kiocb *req, unsigned int issue_flags) { + struct sockaddr_storage address; struct io_sr_msg *sr =3D &req->sr_msg; struct msghdr msg; struct iovec iov; @@ -5291,10 +5325,20 @@ static int io_sendto(struct io_kiocb *req, unsigned= int issue_flags) if (unlikely(ret)) return ret; =20 - msg.msg_name =3D NULL; + msg.msg_control =3D NULL; msg.msg_controllen =3D 0; - msg.msg_namelen =3D 0; + if (sr->addr) { + ret =3D move_addr_to_kernel(sr->addr, sr->sendto_addr_len, + &address); + if (unlikely(ret < 0)) + goto fail; + msg.msg_name =3D (struct sockaddr *) &address; + msg.msg_namelen =3D sr->sendto_addr_len; + } else { + msg.msg_name =3D NULL; + msg.msg_namelen =3D 0; + } =20 flags =3D req->sr_msg.msg_flags; if (issue_flags & IO_URING_F_NONBLOCK) @@ -5309,6 +5353,7 @@ static int io_sendto(struct io_kiocb *req, unsigned i= nt issue_flags) return -EAGAIN; if (ret =3D=3D -ERESTARTSYS) ret =3D -EINTR; + fail: req_set_fail(req); } __io_req_complete(req, issue_flags, ret, 0); @@ -5427,13 +5472,25 @@ static int io_recvmsg_prep(struct io_kiocb *req, co= nst struct io_uring_sqe *sqe) if (unlikely(req->ctx->flags & IORING_SETUP_IOPOLL)) return -EINVAL; =20 + /* + * For IORING_OP_RECV{,FROM}, the assignment to @sr->umsg + * is equivalent to an assignment to @sr->buf. + */ sr->umsg =3D u64_to_user_ptr(READ_ONCE(sqe->addr)); + sr->len =3D READ_ONCE(sqe->len); sr->bgid =3D READ_ONCE(sqe->buf_group); sr->msg_flags =3D READ_ONCE(sqe->msg_flags) | MSG_NOSIGNAL; if (sr->msg_flags & MSG_DONTWAIT) req->flags |=3D REQ_F_NOWAIT; =20 + if (req->opcode =3D=3D IORING_OP_RECVFROM) { + sr->addr =3D u64_to_user_ptr(READ_ONCE(sqe->addr2)); + sr->recvfrom_addr_len =3D u64_to_user_ptr(READ_ONCE(sqe->addr3)); + } else { + sr->addr =3D (struct sockaddr __user *) NULL; + } + #ifdef CONFIG_COMPAT if (req->ctx->compat) sr->msg_flags |=3D MSG_CMSG_COMPAT; @@ -5509,6 +5566,7 @@ static int io_recvfrom(struct io_kiocb *req, unsigned= int issue_flags) struct iovec iov; unsigned flags; int ret, min_ret =3D 0; + struct sockaddr_storage address; bool force_nonblock =3D issue_flags & IO_URING_F_NONBLOCK; =20 sock =3D sock_from_file(req->file); @@ -5526,7 +5584,7 @@ static int io_recvfrom(struct io_kiocb *req, unsigned= int issue_flags) if (unlikely(ret)) goto out_free; =20 - msg.msg_name =3D NULL; + msg.msg_name =3D sr->addr ? (struct sockaddr *) &address : NULL; msg.msg_control =3D NULL; msg.msg_controllen =3D 0; msg.msg_namelen =3D 0; @@ -5540,6 +5598,16 @@ static int io_recvfrom(struct io_kiocb *req, unsigne= d int issue_flags) min_ret =3D iov_iter_count(&msg.msg_iter); =20 ret =3D sock_recvmsg(sock, &msg, flags); + + if (ret >=3D 0 && sr->addr !=3D NULL) { + int tmp; + + tmp =3D move_addr_to_user(&address, msg.msg_namelen, sr->addr, + sr->recvfrom_addr_len); + if (unlikely(tmp < 0)) + ret =3D tmp; + } + out_free: if (ret < min_ret) { if (ret =3D=3D -EAGAIN && force_nonblock) @@ -5707,8 +5775,8 @@ IO_NETOP_PREP_ASYNC(sendmsg); IO_NETOP_PREP_ASYNC(recvmsg); IO_NETOP_PREP_ASYNC(connect); IO_NETOP_PREP(accept); -IO_NETOP_FN(send); -IO_NETOP_FN(recv); +IO_NETOP_FN(sendto); +IO_NETOP_FN(recvfrom); #endif /* CONFIG_NET */ =20 struct io_poll_table { @@ -6778,9 +6846,11 @@ static int io_req_prep(struct io_kiocb *req, const s= truct io_uring_sqe *sqe) case IORING_OP_SYNC_FILE_RANGE: return io_sfr_prep(req, sqe); case IORING_OP_SENDMSG: + case IORING_OP_SENDTO: case IORING_OP_SEND: return io_sendmsg_prep(req, sqe); case IORING_OP_RECVMSG: + case IORING_OP_RECVFROM: case IORING_OP_RECV: return io_recvmsg_prep(req, sqe); case IORING_OP_CONNECT: @@ -7060,12 +7130,14 @@ static int io_issue_sqe(struct io_kiocb *req, unsig= ned int issue_flags) case IORING_OP_SENDMSG: ret =3D io_sendmsg(req, issue_flags); break; + case IORING_OP_SENDTO: case IORING_OP_SEND: ret =3D io_sendto(req, issue_flags); break; case IORING_OP_RECVMSG: ret =3D io_recvmsg(req, issue_flags); break; + case IORING_OP_RECVFROM: case IORING_OP_RECV: ret =3D io_recvfrom(req, issue_flags); break; diff --git a/include/uapi/linux/io_uring.h b/include/uapi/linux/io_uring.h index efc7ac9b3a6b..a360069d1e8e 100644 --- a/include/uapi/linux/io_uring.h +++ b/include/uapi/linux/io_uring.h @@ -150,6 +150,8 @@ enum { IORING_OP_SETXATTR, IORING_OP_FGETXATTR, IORING_OP_GETXATTR, + IORING_OP_SENDTO, + IORING_OP_RECVFROM, =20 /* this goes last, obviously */ IORING_OP_LAST, --=20 2.32.0