From patchwork Thu Dec 30 17:52:30 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ammar Faizi X-Patchwork-Id: 12701580 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 CCFE9C433EF for ; Thu, 30 Dec 2021 17:52:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236869AbhL3Rwp (ORCPT ); Thu, 30 Dec 2021 12:52:45 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56136 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236799AbhL3Rwn (ORCPT ); Thu, 30 Dec 2021 12:52:43 -0500 Received: from mail-pf1-x432.google.com (mail-pf1-x432.google.com [IPv6:2607:f8b0:4864:20::432]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BE783C06173F; Thu, 30 Dec 2021 09:52:43 -0800 (PST) Received: by mail-pf1-x432.google.com with SMTP id t123so21879155pfc.13; Thu, 30 Dec 2021 09:52:43 -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=M0liyv0ToSBMIYrvXZ3u/lR+qbXOeZrNLleid0iHOqc=; b=UwhACIBMpTCqTeFWIIpIThAcu9FScxwgeEAnCYARFR9ysWAujmW9SpDFIpxQEnizu0 k7ZibOsX//is819Hm1qg8Wt2FKNxuJNRMpap95Nka/cbp70hchsYoV/M6zqdJYQ8U2Gi /1YFE/fZx24scTmFrF/k/byN/84jHyJJRCxLOFglcehsCTOQPLcXX6IfnkfGHjZcCqmH 0P55b2MtFmbvXEGKmQeuVhaslguC0N6dKFaRCnF1rlwFBJ1Wq9ErfoXqc68xp46X7r3/ 008ExkCC4Brr4PGjqLOY+r20w00urdMGk3ZlDy9YZk9tJ0tvFWe9soVRtmOnbVNQpuYS Y2zQ== 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=M0liyv0ToSBMIYrvXZ3u/lR+qbXOeZrNLleid0iHOqc=; b=fYLobNTY6dF46RrK+YN9PvYUZcqtZRGdbPIOphvULC0PtMevdDXAlYzjEI00qkWwRh IvaY7gRZydOepfIWqHDxrIOU9hMp6XgyO+rGnlQsPDtipuXSiF39oIYFw+u/r9AQCVDB LpfwJ6NZqMyOkAg3FyDbOH6DZ+je+tqicFZj4oCB95rZe3tAFXPy/h27sv4n0bfRtnsH 05BGpywBjqZXFuYQofGGCuEDNIiL2QWJAh8UeUc7bF6cNvcT6akdbvZxR3EXOVxdhGxC lxf3p/4XUzmhY1fwZ5G7R7NpeiJscprFJUl50NLE/CiGJH6CUak/5ZDHqpJ5YLlQpi6I idVA== X-Gm-Message-State: AOAM530L9Pl7s1OJ7CfYE07rcI6BYjB+DOiEfNhCn4iq57m6deMn8wYS DRv2KfIZ7R/VU40YDV+Ag0c= X-Google-Smtp-Source: ABdhPJx3Nv4l80f/k9aApZ3ZA5UFPLCE2tYfT4ZuKxdOQuBZkyk3a5zKThldi1/+NOo/V8UUA4xQvg== X-Received: by 2002:aa7:8188:0:b0:4ae:db42:6f98 with SMTP id g8-20020aa78188000000b004aedb426f98mr32726332pfi.26.1640886763240; Thu, 30 Dec 2021 09:52:43 -0800 (PST) Received: from integral2.. ([180.254.126.2]) by smtp.gmail.com with ESMTPSA id 185sm9244188pfe.26.2021.12.30.09.52.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Dec 2021 09:52:42 -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 v3 1/3] io_uring: Rename `io_{send,recv}` to `io_{sendto,recvfrom}` Date: Fri, 31 Dec 2021 00:52:30 +0700 Message-Id: <20211230173126.174350-2-ammar.faizi@intel.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211230173126.174350-1-ammar.faizi@intel.com> References: <20211230115057.139187-3-ammar.faizi@intel.com> <20211230173126.174350-1-ammar.faizi@intel.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-State: RFC 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 --- v3: - Fix build error when CONFIG_NET is undefined for PATCH 1/3. I tried to fix it in PATCH 3/3, but it should be fixed in PATCH 1/3, otherwise it breaks the build in PATCH 1/3. v2: - Added Nugra to CC list (tester). --- fs/io_uring.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/fs/io_uring.c b/fs/io_uring.c index 90002bb3fdf4..7adcb591398f 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; } -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 = &req->sr_msg; struct msghdr msg; @@ -5499,7 +5499,7 @@ static int io_recvmsg(struct io_kiocb *req, unsigned int issue_flags) return 0; } -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 = &req->sr_msg; @@ -5707,8 +5707,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 */ struct io_poll_table { @@ -7061,13 +7061,13 @@ static int io_issue_sqe(struct io_kiocb *req, unsigned int issue_flags) ret = io_sendmsg(req, issue_flags); break; case IORING_OP_SEND: - ret = io_send(req, issue_flags); + ret = io_sendto(req, issue_flags); break; case IORING_OP_RECVMSG: ret = io_recvmsg(req, issue_flags); break; case IORING_OP_RECV: - ret = io_recv(req, issue_flags); + ret = io_recvfrom(req, issue_flags); break; case IORING_OP_TIMEOUT: ret = io_timeout(req, issue_flags); From patchwork Thu Dec 30 17:52:31 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ammar Faizi X-Patchwork-Id: 12701581 X-Patchwork-Delegate: kuba@kernel.org 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 293A4C433F5 for ; Thu, 30 Dec 2021 17:52:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241540AbhL3Rws (ORCPT ); Thu, 30 Dec 2021 12:52:48 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56154 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236799AbhL3Rwq (ORCPT ); Thu, 30 Dec 2021 12:52:46 -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 9C930C061574; Thu, 30 Dec 2021 09:52:46 -0800 (PST) Received: by mail-pg1-x52f.google.com with SMTP id m15so22008411pgu.11; Thu, 30 Dec 2021 09:52:46 -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=e7GlyC/Fs2J3RuyS0dBbpj6BB6+RlGoWJj21CeQljQI=; b=A5Ku1BpR0ZdzS0wG5MHTg3zWenyjD0JQfpljo4xouQPmUsVbP2YZMXxxtgIpJN6ebG kNZcaIJ2AwUKaZH/kBEA2TWs/lr4GjaenzWa7nWMHkxbumqf/S3pnM3Rpp2HSwyDFJ4k pBXjNSTqRK+WMb13ro2I77titwJntUKBRD0g/WovL3d0DltQ+VglL06baZAax4yH6mxp XxmXAWxmEK5yXnQN6OdU+qEhkefrQwCO7SO75aM3EQq6l5D9baQHw7nDm0IS+2ZHSu3R o2GPZcm3HeA7ptyq9jHtWodN7I49tRGFtptljt/MWTuD17Z4eZM+srvIn2WGHzS608qz sF8A== 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=e7GlyC/Fs2J3RuyS0dBbpj6BB6+RlGoWJj21CeQljQI=; b=JC5jCrnpFSCSX8E0nfguvHl6TKRzqrnd9VVCgT5AeR68EObnsCwB0n4vc8GnBDIskG kSwKiVOdmcvaOqKpk75o50xAn4Cz3ChNYjId/vMgolU+LWV94oalgJWkI3424PRbcf53 N/LMwa48AAmlW+tDe0lKTSrSv/QOGSke54xzvB4BMHSnGU15BjUzHG0ICBZQPf72ll5E mr1tzGoIUDdL7z5fLtuN+dnkTBtqQfiDNezxMgegduedEvDXtxrY90dl3XvCyTB2MyT1 Q/KOuxVy27u6KAnDvQ6dKdq7fRJcSL1SbEXaKqGul27gJFUcP427AckJQP26QWsf3jZq TKdQ== X-Gm-Message-State: AOAM53027PJIqOBs3hOaeJAjSSpTKn9I9MxRW9mkov/5z+kyINav8UQJ OLfI/xaNchsUr2zuPjUE958= X-Google-Smtp-Source: ABdhPJyXvyj3WVCZeYkdQW+c1256QWbj6+k0RymutC3+rKyKWidnoS6KBDSVTvfDmWeYbJJOayj+1Q== X-Received: by 2002:a63:904b:: with SMTP id a72mr28157164pge.28.1640886766213; Thu, 30 Dec 2021 09:52:46 -0800 (PST) Received: from integral2.. ([180.254.126.2]) by smtp.gmail.com with ESMTPSA id 185sm9244188pfe.26.2021.12.30.09.52.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Dec 2021 09:52:45 -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 v3 2/3] net: Make `move_addr_to_user()` be a non static function Date: Fri, 31 Dec 2021 00:52:31 +0700 Message-Id: <20211230173126.174350-3-ammar.faizi@intel.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211230173126.174350-1-ammar.faizi@intel.com> References: <20211230115057.139187-3-ammar.faizi@intel.com> <20211230173126.174350-1-ammar.faizi@intel.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org X-Patchwork-State: RFC 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 --- v3: * No changes * v2: - Added Nugra to CC list (tester). --- 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 extern int move_addr_to_kernel(void __user *uaddr, int ulen, struct sockaddr_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 *data); 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, struct sockaddr_storage *k * specified. Zero is returned for a success. */ -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; From patchwork Thu Dec 30 17:52:32 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ammar Faizi X-Patchwork-Id: 12701582 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 6A276C433EF for ; Thu, 30 Dec 2021 17:52:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241573AbhL3Rwv (ORCPT ); Thu, 30 Dec 2021 12:52:51 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56170 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241577AbhL3Rwt (ORCPT ); Thu, 30 Dec 2021 12:52:49 -0500 Received: from mail-pj1-x1035.google.com (mail-pj1-x1035.google.com [IPv6:2607:f8b0:4864:20::1035]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8CA0CC061401; Thu, 30 Dec 2021 09:52:49 -0800 (PST) Received: by mail-pj1-x1035.google.com with SMTP id o63-20020a17090a0a4500b001b1c2db8145so28579038pjo.5; Thu, 30 Dec 2021 09:52:49 -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=dcBlXZFiwjA71AEHcnKhvkZGJOjelC7heeu53qWimxg=; b=OV8sN2JkxtylbB7LoYCTzmrx77UhGCo5ssLqmcH9QyiMDoG+2gsk4w7hBkLu+KeAht gy7O95n3Ai2G/3OOe612lhPolyFTwivvkNiE1PmcFAkesrEUpBomqt3j0wBIxBSHxk2M u0tCKPHgS3OkrXQIihG6rdwKDf/JD7K4JJVQgZgf5FXCDrCe0+37Wo/dqhsBIm9G07Sc Sh+y21jNYaoMOpx1LpSAZ0AdOudhKL2kb4Vr9ZPuYvAa7ZgIv8QcBnAsPRJc0DdAlAYM hVyCgETDgYsE3NbLYicISsstUh6v3hW4cL7Ly4ti7DBuuF3ISthRP2zYib6fJwktIstF jMqQ== 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=dcBlXZFiwjA71AEHcnKhvkZGJOjelC7heeu53qWimxg=; b=RP5Zm8QfRw5KffHegWTzKwYUfYN4suIpFmSz+aFL+FpNsdUpqTqRxbjW9ciCo1dGB6 U4jaRCM1cOLGCv8Pi1IXSVVVk8Z9NznVAdKXUGh+J3ra1Qs6k4sy646yUPNN2NZ94M2i Cbcd53XwRH8cxUNDyRQEpbQTSlmbM0cTlY1VHtZAzoOZKaPEJGXyxf+ZPje8HW2mGnS3 A1TYHXxnpDtVcn9DsMjsmytSM+xnu2IeS1lXeE0yzVCxz+jN+TM8yDjCxXj7xQfTqPNR 3dCROtaBV7cUsw084OrTW5LDqiRfWi7x77scfu+CIPQslGVV6r0Tmy4NHCct3ElXr13S cNfw== X-Gm-Message-State: AOAM530tVBYV9M1BG878pM9GFSK1+PZg3zcL2ijRBH7Nckg7BcyqS7Xr z7GORaHDAY8zyuTwBDwaiGM= X-Google-Smtp-Source: ABdhPJyzDtTIP4keK4rHYgRg3tve4+Tryzjz8S1GqzA6arlkfArgmE+w2sLOZXLPQLwUCuGDx+QYkg== X-Received: by 2002:a17:902:eb44:b0:148:b1ed:1a33 with SMTP id i4-20020a170902eb4400b00148b1ed1a33mr31814748pli.149.1640886769096; Thu, 30 Dec 2021 09:52:49 -0800 (PST) Received: from integral2.. ([180.254.126.2]) by smtp.gmail.com with ESMTPSA id 185sm9244188pfe.26.2021.12.30.09.52.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Dec 2021 09:52:48 -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 v3 3/3] io_uring: Add `sendto(2)` and `recvfrom(2)` support Date: Fri, 31 Dec 2021 00:52:32 +0700 Message-Id: <20211230173126.174350-4-ammar.faizi@intel.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211230173126.174350-1-ammar.faizi@intel.com> References: <20211230115057.139187-3-ammar.faizi@intel.com> <20211230173126.174350-1-ammar.faizi@intel.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-State: RFC This adds sendto(2) and recvfrom(2) support for io_uring. New opcodes: IORING_OP_SENDTO IORING_OP_RECVFROM Cc: Nugra Tested-by: Nugra Link: https://github.com/axboe/liburing/issues/397 Signed-off-by: Ammar Faizi --- v3: - Fix build error when CONFIG_NET is undefined should be done in the first patch, not this patch. - Add Tested-by tag from Nugra. v2: - In `io_recvfrom()`, mark the error check of `move_addr_to_user()` call as unlikely. - Fix build error when CONFIG_NET is undefined. - Added Nugra to CC list (tester). --- fs/io_uring.c | 80 +++++++++++++++++++++++++++++++++-- include/uapi/linux/io_uring.h | 2 + 2 files changed, 78 insertions(+), 4 deletions(-) diff --git a/fs/io_uring.c b/fs/io_uring.c index 7adcb591398f..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[] = { .needs_file = 1 }, [IORING_OP_GETXATTR] = {}, + [IORING_OP_SENDTO] = { + .needs_file = 1, + .unbound_nonreg_file = 1, + .pollout = 1, + .audit_skip = 1, + }, + [IORING_OP_RECVFROM] = { + .needs_file = 1, + .unbound_nonreg_file = 1, + .pollin = 1, + .buffer_select = 1, + .audit_skip = 1, + }, }; /* requests with any of those set should undergo io_disarm_next() */ @@ -5216,12 +5237,24 @@ static int io_sendmsg_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe) if (unlikely(req->ctx->flags & IORING_SETUP_IOPOLL)) return -EINVAL; + /* + * For IORING_OP_SEND{,TO}, the assignment to @sr->umsg + * is equivalent to an assignment to @sr->buf. + */ sr->umsg = u64_to_user_ptr(READ_ONCE(sqe->addr)); + sr->len = READ_ONCE(sqe->len); sr->msg_flags = READ_ONCE(sqe->msg_flags) | MSG_NOSIGNAL; if (sr->msg_flags & MSG_DONTWAIT) req->flags |= REQ_F_NOWAIT; + if (req->opcode == IORING_OP_SENDTO) { + sr->addr = u64_to_user_ptr(READ_ONCE(sqe->addr2)); + sr->sendto_addr_len = READ_ONCE(sqe->addr3); + } else { + sr->addr = (struct sockaddr __user *) NULL; + } + #ifdef CONFIG_COMPAT if (req->ctx->compat) sr->msg_flags |= MSG_CMSG_COMPAT; @@ -5275,6 +5308,7 @@ static int io_sendmsg(struct io_kiocb *req, unsigned int issue_flags) static int io_sendto(struct io_kiocb *req, unsigned int issue_flags) { + struct sockaddr_storage address; struct io_sr_msg *sr = &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; - msg.msg_name = NULL; + msg.msg_control = NULL; msg.msg_controllen = 0; - msg.msg_namelen = 0; + if (sr->addr) { + ret = move_addr_to_kernel(sr->addr, sr->sendto_addr_len, + &address); + if (unlikely(ret < 0)) + goto fail; + msg.msg_name = (struct sockaddr *) &address; + msg.msg_namelen = sr->sendto_addr_len; + } else { + msg.msg_name = NULL; + msg.msg_namelen = 0; + } flags = 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 int issue_flags) return -EAGAIN; if (ret == -ERESTARTSYS) ret = -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, const struct io_uring_sqe *sqe) if (unlikely(req->ctx->flags & IORING_SETUP_IOPOLL)) return -EINVAL; + /* + * For IORING_OP_RECV{,FROM}, the assignment to @sr->umsg + * is equivalent to an assignment to @sr->buf. + */ sr->umsg = u64_to_user_ptr(READ_ONCE(sqe->addr)); + sr->len = READ_ONCE(sqe->len); sr->bgid = READ_ONCE(sqe->buf_group); sr->msg_flags = READ_ONCE(sqe->msg_flags) | MSG_NOSIGNAL; if (sr->msg_flags & MSG_DONTWAIT) req->flags |= REQ_F_NOWAIT; + if (req->opcode == IORING_OP_RECVFROM) { + sr->addr = u64_to_user_ptr(READ_ONCE(sqe->addr2)); + sr->recvfrom_addr_len = u64_to_user_ptr(READ_ONCE(sqe->addr3)); + } else { + sr->addr = (struct sockaddr __user *) NULL; + } + #ifdef CONFIG_COMPAT if (req->ctx->compat) sr->msg_flags |= 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 = 0; + struct sockaddr_storage address; bool force_nonblock = issue_flags & IO_URING_F_NONBLOCK; sock = 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; - msg.msg_name = NULL; + msg.msg_name = sr->addr ? (struct sockaddr *) &address : NULL; msg.msg_control = NULL; msg.msg_controllen = 0; msg.msg_namelen = 0; @@ -5540,6 +5598,16 @@ static int io_recvfrom(struct io_kiocb *req, unsigned int issue_flags) min_ret = iov_iter_count(&msg.msg_iter); ret = sock_recvmsg(sock, &msg, flags); + + if (ret >= 0 && sr->addr != NULL) { + int tmp; + + tmp = move_addr_to_user(&address, msg.msg_namelen, sr->addr, + sr->recvfrom_addr_len); + if (unlikely(tmp < 0)) + ret = tmp; + } + out_free: if (ret < min_ret) { if (ret == -EAGAIN && force_nonblock) @@ -6778,9 +6846,11 @@ static int io_req_prep(struct io_kiocb *req, const struct 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, unsigned int issue_flags) case IORING_OP_SENDMSG: ret = io_sendmsg(req, issue_flags); break; + case IORING_OP_SENDTO: case IORING_OP_SEND: ret = io_sendto(req, issue_flags); break; case IORING_OP_RECVMSG: ret = io_recvmsg(req, issue_flags); break; + case IORING_OP_RECVFROM: case IORING_OP_RECV: ret = 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, /* this goes last, obviously */ IORING_OP_LAST,