From patchwork Mon Jul 24 14:22:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Breno Leitao X-Patchwork-Id: 125050 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9010:0:b0:3e4:2afc:c1 with SMTP id l16csp1845283vqg; Mon, 24 Jul 2023 07:41:07 -0700 (PDT) X-Google-Smtp-Source: APBJJlFDHogrfWPRfUFFgOSeeHLMKKHSLCfaFJ7qcSarjWNUULZN96XSz4L8UAVjBKxavijPWKNM X-Received: by 2002:a05:6358:931b:b0:130:f1e5:acc6 with SMTP id x27-20020a056358931b00b00130f1e5acc6mr10692296rwa.8.1690209667474; Mon, 24 Jul 2023 07:41:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690209667; cv=none; d=google.com; s=arc-20160816; b=iq5R+zG18plL/YUU9VX+Lxh0wyypWt07WPsoUHF7//5bMgKLmiR9l+082RTCwpv2p2 AaGoy/wBvdLVWOWChoG34aYvCaC9UX2WvcRRtGPE1xs3H1RW+iFAkJ79fNZG6ZT9C1DC ih29AebEtu4DVnVWkOsE88J2grIWDQR/cfZZCVcnSoLIqvk5dZGWIbs9v055QDK1Aip9 2ZSGjOuL4QUsEFilN1ReJdbtnpieXtuRxONUqrVvtTjFrwWhxYd9rsNQ48S7qGqUHn49 UG+h90L1I7obR+ytGJoTjcKcHPvtHB4onPySvOGpcGaB/WEdZlFPjM4pweHl8khqpvNK YP+w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=ChPT/lHzXHpKHyXlCB2W1LoY3mnd1UwLMSxiYiQjKmg=; fh=6XoySB/6rAPgV/aZqq1NMd9MO1LT68BjVOV4C4ECcCI=; b=SRyT5dG966Tec4/e/T6AbFTYLJi3rRVymdhTQxQ5BLw1PP3q5AQTBRd9aufCt8Pgm2 URe1Vw73t+XGI1m3g2AkbTAULblIvjeLWv0RbHNCbnr3kDVOmTmGNp6CP7Wycf9ZmwXd 5tUs9jzCg83t/yraYHNhG/6nvnRGOro2DSdVGkYETL589KNYq1ETyYp0LcVrZWcWL5P4 v7EdsZgpcrZw9kUySxhZuBW7Z1YPGdKsm784+WJETaDZOaB2zy6+1aePTnS+PVGCK4v+ WfXWCg+HMndQB03gdlUGzJ8Lf7wpRUJpvfj5eOuOIl0AQZdtOemeV+2bZ+qRw10/cBmu WCAw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id w21-20020a639355000000b00553ebb05d26si9034719pgm.108.2023.07.24.07.40.54; Mon, 24 Jul 2023 07:41:07 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231981AbjGXOYD (ORCPT + 99 others); Mon, 24 Jul 2023 10:24:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49592 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231979AbjGXOYB (ORCPT ); Mon, 24 Jul 2023 10:24:01 -0400 Received: from mail-lf1-f49.google.com (mail-lf1-f49.google.com [209.85.167.49]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 51AFE10C3; Mon, 24 Jul 2023 07:23:53 -0700 (PDT) Received: by mail-lf1-f49.google.com with SMTP id 2adb3069b0e04-4faaaa476a9so6705121e87.2; Mon, 24 Jul 2023 07:23:53 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690208631; x=1690813431; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ChPT/lHzXHpKHyXlCB2W1LoY3mnd1UwLMSxiYiQjKmg=; b=X4sufUvUx313D5bZKrfZpnfttnOH0qc75uaSUQY8iTco6wHbtGIxtmk+pCdZCiAg5I mWT5uFi+UXheWqhYlsXACOieHsMVQQl+rg5EVHXgjd7hH1h6WYrUNMVOslNEp1OmZOBS mov6/QteUErk8VGB0URwmQPyDTBd31czj/C6YjcyCea/wf5B5cNrLFw0sEbOP491JEOk /gpAb8x7981SH3Pzx3Zu6i5oL0YfiCtWXt0I3qyeXHc0rMmlOK2MR0aTu+duFkl25eLx dGEl9U8/uPUjVqdcsIJ8nzt2TCsAvVfPCWT0yhuhyVjua6dU/GHUje6RabfRudBcsi6y Vtcg== X-Gm-Message-State: ABy/qLYBtDOp8RBGgTc3EABtKmqktgOf9QbPJMNz73iDapzJsrgCEfyV 5NSpeaCiCnVBFEVFv0jbOzdEOp7I3t0= X-Received: by 2002:a05:6512:3083:b0:4f8:4512:c846 with SMTP id z3-20020a056512308300b004f84512c846mr5794975lfd.49.1690208631269; Mon, 24 Jul 2023 07:23:51 -0700 (PDT) Received: from localhost (fwdproxy-cln-011.fbsv.net. [2a03:2880:31ff:b::face:b00c]) by smtp.gmail.com with ESMTPSA id lr20-20020a170906fb9400b00992b3ea1ee4sm6948428ejb.149.2023.07.24.07.23.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Jul 2023 07:23:50 -0700 (PDT) From: Breno Leitao To: asml.silence@gmail.com, axboe@kernel.dk, "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Cc: io-uring@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, leit@meta.com Subject: [PATCH 1/4] net: expose sock_use_custom_sol_socket Date: Mon, 24 Jul 2023 07:22:34 -0700 Message-Id: <20230724142237.358769-2-leitao@debian.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230724142237.358769-1-leitao@debian.org> References: <20230724142237.358769-1-leitao@debian.org> MIME-Version: 1.0 X-Spam-Status: No, score=-1.4 required=5.0 tests=BAYES_00, FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS, RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1772313292283648241 X-GMAIL-MSGID: 1772313292283648241 Exposing function sock_use_custom_sol_socket(), so it could be used by io_uring subsystem. This function will be used in the function io_uring_cmd_setsockopt() in the coming patch, so, let's move it to the socket.h header file. Signed-off-by: Breno Leitao --- include/linux/net.h | 5 +++++ net/socket.c | 5 ----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/linux/net.h b/include/linux/net.h index 41c608c1b02c..14a956e4530e 100644 --- a/include/linux/net.h +++ b/include/linux/net.h @@ -355,4 +355,9 @@ u32 kernel_sock_ip_overhead(struct sock *sk); #define MODULE_ALIAS_NET_PF_PROTO_NAME(pf, proto, name) \ MODULE_ALIAS("net-pf-" __stringify(pf) "-proto-" __stringify(proto) \ name) + +static inline bool sock_use_custom_sol_socket(const struct socket *sock) +{ + return test_bit(SOCK_CUSTOM_SOCKOPT, &sock->flags); +} #endif /* _LINUX_NET_H */ diff --git a/net/socket.c b/net/socket.c index 1dc23f5298ba..8df54352af83 100644 --- a/net/socket.c +++ b/net/socket.c @@ -2216,11 +2216,6 @@ SYSCALL_DEFINE4(recv, int, fd, void __user *, ubuf, size_t, size, return __sys_recvfrom(fd, ubuf, size, flags, NULL, NULL); } -static bool sock_use_custom_sol_socket(const struct socket *sock) -{ - return test_bit(SOCK_CUSTOM_SOCKOPT, &sock->flags); -} - /* * Set a socket option. Because we don't know the option lengths we have * to pass the user mode parameter for the protocols to sort out. From patchwork Mon Jul 24 14:22:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Breno Leitao X-Patchwork-Id: 125053 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9010:0:b0:3e4:2afc:c1 with SMTP id l16csp1845627vqg; Mon, 24 Jul 2023 07:41:49 -0700 (PDT) X-Google-Smtp-Source: APBJJlGAE3DyvXXVW8KZ7b9zTHCDWVXWmb+kSu16oWs5cFaoFw2vE/o7e731kHvQfMwUCrkhYWyf X-Received: by 2002:a17:90a:e7c8:b0:268:107b:ba66 with SMTP id kb8-20020a17090ae7c800b00268107bba66mr2297719pjb.29.1690209709470; Mon, 24 Jul 2023 07:41:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690209709; cv=none; d=google.com; s=arc-20160816; b=DQmNt1hDdjuEaQVvzpjmQwP1Y2RzP5Sq88DVn61cup4V6MDDjeKJIscCaEktdGgIcU 69vK5bUIAVmhm/aFgoAmTllRS+01c1xazk4VJOICRDTeSWZWQEDurzECMboZdtxtY05v zzaF6axq02E/mYsWLDsppKBP0gNTUnpxuwxJZfBlO5Aa6vYwG7culznzoyJN+REIjX5E UznLqM6lgivQqlSh1+6i2KH5vVgzeRD1WXo9u86tnSDKNm+z+6V8a+KpJ0tYhJJWWmXY wpELNcqYQnrqblj3vStMaLzC64QvWPMZmQhDIDYynrJjqTZ8ncTT4z2mTBAadFwcuZBa Mdwg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=uNsYJZWwOrHCH/sJVncer8wWx/Kh/edw84SCouspcyA=; fh=cl1KgUwAZ0tdftZMcFCuNRV2QxDqPcsKXd9k46OghIc=; b=aqBPXuxXKCXQg3+WU7ypiyloGDIjTBxOE292dlfbmO4J4a1GpeMWDk2zrS/OSHu4fu WbYcQ2BAo4T9YOgqgfN60SZY5qnbcaZXujuvwiY3bVKMChEFVbsaBB6wrf92ZZlQS1s+ dgat9BNO18FORrYLwtUTEReLDG31rZpDEB0uAZH3aZS0T2/ygISxQ9NJHHmQJJZj8Kf0 uLhhIjAa+rpsBr9HfxYOhy+XZAfQdmH3GAgoW2Ga1jCJy3jiJOVDyMZfeWA8bsYhRVKC 5zBtYMiH6RpIyNZQf4d1GQfmbPuP4OK0D2FR0erfEMPdx5QV+Jo115wNba94Fihi3NUf GoOQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id pc5-20020a17090b3b8500b0024e37ccb3fesi10060467pjb.68.2023.07.24.07.41.33; Mon, 24 Jul 2023 07:41:49 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232000AbjGXOYL (ORCPT + 99 others); Mon, 24 Jul 2023 10:24:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49638 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229937AbjGXOYF (ORCPT ); Mon, 24 Jul 2023 10:24:05 -0400 Received: from mail-lf1-f48.google.com (mail-lf1-f48.google.com [209.85.167.48]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D959AE63; Mon, 24 Jul 2023 07:23:54 -0700 (PDT) Received: by mail-lf1-f48.google.com with SMTP id 2adb3069b0e04-4fdea55743eso3230709e87.2; Mon, 24 Jul 2023 07:23:54 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690208633; x=1690813433; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=uNsYJZWwOrHCH/sJVncer8wWx/Kh/edw84SCouspcyA=; b=e/xBohH/50oRB6zrqoVZWgRo172FH873dB9JgE5Nk7U7KEdHAL6FXr9Rw26k/QJWeO hjVCJTfNP7AkUKw2cC4JEJevlWa2VK0/IyJm9gnc9sa6KUAHvQ5bjgrPh2xYaAzSZuyM 0uJIVREtHdi/5Z5W5oUAyDhPHfOFHc4Mixod2eeXZrh1F33NdDYvEI77ZVxIqjhiThXe XPO5KUc6WOk96Ya396c+S4crlwv2HBmP8xLVkgJ4VA9aGpXrZffhDVJCKkGPkga3oJJO gciSroK0SPuiupcKe6bmrzql0rdjfhpH1Th2+3ukTapKYy2qd+NSt7xw+CDI0HgZMVya ZMUA== X-Gm-Message-State: ABy/qLbiKk6wOxEwrj8fCgeHr615fFVwBveqS74CUDvma8b6TjIAkXRJ dhzwqS2wa+BM3Gb2CvzfPNA= X-Received: by 2002:a05:6512:4002:b0:4fb:89cd:9616 with SMTP id br2-20020a056512400200b004fb89cd9616mr6091098lfb.0.1690208632870; Mon, 24 Jul 2023 07:23:52 -0700 (PDT) Received: from localhost (fwdproxy-cln-006.fbsv.net. [2a03:2880:31ff:6::face:b00c]) by smtp.gmail.com with ESMTPSA id ba28-20020a0564021adc00b0051e2670d599sm6313052edb.4.2023.07.24.07.23.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Jul 2023 07:23:52 -0700 (PDT) From: Breno Leitao To: asml.silence@gmail.com, axboe@kernel.dk Cc: io-uring@vger.kernel.org, netdev@vger.kernel.org, davem@davemloft.net, kuba@kernel.org, edumazet@google.com, pabeni@redhat.com, linux-kernel@vger.kernel.org, leit@meta.com Subject: [PATCH 2/4] io_uring/cmd: Introduce SOCKET_URING_OP_GETSOCKOPT Date: Mon, 24 Jul 2023 07:22:35 -0700 Message-Id: <20230724142237.358769-3-leitao@debian.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230724142237.358769-1-leitao@debian.org> References: <20230724142237.358769-1-leitao@debian.org> MIME-Version: 1.0 X-Spam-Status: No, score=-1.4 required=5.0 tests=BAYES_00, FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS, RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1772313336357235512 X-GMAIL-MSGID: 1772313336357235512 Add support for getsockopt command (SOCKET_URING_OP_GETSOCKOPT), where level is SOL_SOCKET. This is leveraging the sockptr_t infrastructure, where a sockptr_t is either userspace or kernel space, and handled as such. Function io_uring_cmd_getsockopt() is inspired by __sys_getsockopt(). Differently from the getsockopt(2), the optlen field is not a userspace pointers. In getsockopt(2), userspace provides optlen pointer, which is overwritten by the kernel. In this implementation, userspace passes a u32, and the new value is returned in cqe->res. I.e., optlen is not a pointer. Important to say that userspace needs to keep the pointer alive until the CQE is completed. Signed-off-by: Breno Leitao --- include/uapi/linux/io_uring.h | 7 ++++++ io_uring/uring_cmd.c | 43 +++++++++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+) diff --git a/include/uapi/linux/io_uring.h b/include/uapi/linux/io_uring.h index 9fc7195f25df..8152151080db 100644 --- a/include/uapi/linux/io_uring.h +++ b/include/uapi/linux/io_uring.h @@ -43,6 +43,10 @@ struct io_uring_sqe { union { __u64 addr; /* pointer to buffer or iovecs */ __u64 splice_off_in; + struct { + __u32 level; + __u32 optname; + }; }; __u32 len; /* buffer size or number of iovecs */ union { @@ -79,6 +83,7 @@ struct io_uring_sqe { union { __s32 splice_fd_in; __u32 file_index; + __u32 optlen; struct { __u16 addr_len; __u16 __pad3[1]; @@ -89,6 +94,7 @@ struct io_uring_sqe { __u64 addr3; __u64 __pad2[1]; }; + __u64 optval; /* * If the ring is initialized with IORING_SETUP_SQE128, then * this field is used for 80 bytes of arbitrary command data @@ -729,6 +735,7 @@ struct io_uring_recvmsg_out { enum { SOCKET_URING_OP_SIOCINQ = 0, SOCKET_URING_OP_SIOCOUTQ, + SOCKET_URING_OP_GETSOCKOPT, }; #ifdef __cplusplus diff --git a/io_uring/uring_cmd.c b/io_uring/uring_cmd.c index 8e7a03c1b20e..16c857cbf3b0 100644 --- a/io_uring/uring_cmd.c +++ b/io_uring/uring_cmd.c @@ -166,6 +166,47 @@ int io_uring_cmd_import_fixed(u64 ubuf, unsigned long len, int rw, } EXPORT_SYMBOL_GPL(io_uring_cmd_import_fixed); +static inline int io_uring_cmd_getsockopt(struct socket *sock, + struct io_uring_cmd *cmd) +{ + void __user *optval = u64_to_user_ptr(READ_ONCE(cmd->sqe->optval)); + int optname = READ_ONCE(cmd->sqe->optname); + int optlen = READ_ONCE(cmd->sqe->optlen); + int level = READ_ONCE(cmd->sqe->level); + void *koptval; + int err; + + err = security_socket_getsockopt(sock, level, optname); + if (err) + return err; + + koptval = kmalloc(optlen, GFP_KERNEL); + if (!koptval) + return -ENOMEM; + + err = copy_from_user(koptval, optval, optlen); + if (err) + goto fail; + + err = -EOPNOTSUPP; + if (level == SOL_SOCKET) { + err = sk_getsockopt(sock->sk, level, optname, + KERNEL_SOCKPTR(koptval), + KERNEL_SOCKPTR(&optlen)); + if (err) + goto fail; + } + + err = copy_to_user(optval, koptval, optlen); + +fail: + kfree(koptval); + if (err) + return err; + else + return optlen; +} + int io_uring_cmd_sock(struct io_uring_cmd *cmd, unsigned int issue_flags) { struct socket *sock = cmd->file->private_data; @@ -187,6 +228,8 @@ int io_uring_cmd_sock(struct io_uring_cmd *cmd, unsigned int issue_flags) if (ret) return ret; return arg; + case SOCKET_URING_OP_GETSOCKOPT: + return io_uring_cmd_getsockopt(sock, cmd); default: return -EOPNOTSUPP; } From patchwork Mon Jul 24 14:22:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Breno Leitao X-Patchwork-Id: 125054 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9010:0:b0:3e4:2afc:c1 with SMTP id l16csp1845645vqg; Mon, 24 Jul 2023 07:41:50 -0700 (PDT) X-Google-Smtp-Source: APBJJlFBnoA1cP0m+afFBJl1ugr3+Oujtm4b78q7Z1TAdc6H1R3IFkDGzhFocxi38JjrWiOgXMs/ X-Received: by 2002:a05:6a20:914e:b0:134:1d88:1d88 with SMTP id x14-20020a056a20914e00b001341d881d88mr7805154pzc.58.1690209710445; Mon, 24 Jul 2023 07:41:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690209710; cv=none; d=google.com; s=arc-20160816; b=Jcw85cz84y0vTP4DFf8o+G74YFJlOiaVu7MgYnr51sPcafh95KAiuUOdc02DM0jxEE yzc4XtHOTL2iskVepsGLxNnFdKifKkRoZOYvdI+QK4qdMuwas80DfKWKfHmSy2zGprDq kLeV0gynmvXL8Bw7DQlImCaF3bTzgnuhsNbCxNnFx2K35p368+xwkBKwEg5lwpnqtOnB RyplBKhLLzUDiQ5OOIIklkon6kp6z/+TCiRhgkAhEOeAanHOcIipe/Vf9+mkanmojfUg CsdGKZJijDSY0EBE+L7GIZ1DyUDHVtk4XJ8GYX/wefwFvWlinppnRJ3/6SMfdQHHcyXp 0aPg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=bOToxxMOJSR6oGgH66HubRQXkmn+GAGTh6HLEh6tf7M=; fh=cl1KgUwAZ0tdftZMcFCuNRV2QxDqPcsKXd9k46OghIc=; b=nFw8Pba+2I4htEJJ9LOAgTa7kXvgBhycpJZPniODAVa0RDNlehBIiCAGeqAqf1enw4 OrRXMvzwsPxmrSw0HTkRhlyG87QJAEVa9VQjmFXldqDj4ByGS5a9jyDONbSMguu8ggxQ lYdwU3dcvSIeKjGOMlEJA1VLmChk4hk/95rHHqNRAJF/DI55YPjh8TRuh9zO6ujk1rdR KPdNG+0sCuw0EWOV8DnAofP0Nt8E3BTofGvme4qwZMsALMqkl3HuYZYOXsMnO5zmH6KR T6sBZfVaehad4gAjrby4A4P5O+ZQkggn2llPnGNyxDqxZmvpKMtBLYvXfiVAVRkhgfRL AdAw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id s42-20020a056a0017aa00b0065b4e2b52c5si9692814pfg.196.2023.07.24.07.41.36; Mon, 24 Jul 2023 07:41:50 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232011AbjGXOYN (ORCPT + 99 others); Mon, 24 Jul 2023 10:24:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49676 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231576AbjGXOYH (ORCPT ); Mon, 24 Jul 2023 10:24:07 -0400 Received: from mail-ed1-f51.google.com (mail-ed1-f51.google.com [209.85.208.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 279FD10D1; Mon, 24 Jul 2023 07:23:56 -0700 (PDT) Received: by mail-ed1-f51.google.com with SMTP id 4fb4d7f45d1cf-51bece5d935so6773698a12.1; Mon, 24 Jul 2023 07:23:56 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690208634; x=1690813434; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=bOToxxMOJSR6oGgH66HubRQXkmn+GAGTh6HLEh6tf7M=; b=JwzrUIHZgzQhbJQEqerBA6RBVWqLwTsiXqA7ryzqbd/jT+exopK+AgMcHLcKIuCs32 T+kURX6Il+6TpAPAS4ngbQklGBsLXi6svTBye3ETBDFEGWKIs0dZT0eNBOvBUVU83vmf dj8p6zEAOOAgFuXXNoYQCjjxu8K7dJCbyJoohK+Fv9q+q5u335uVm4i3fWnOaMVG7rqs oKSU3ZIooKjWRxH5pT77ZOAi3tFCa1dL37BqTQLMQBv7NqbpiYZqpXSzKQYoC2fPeIdH Y+GUibY5sEljLUI+nzhHlsDoY+Ko9WDp8b+BUyTchOcHBzR3JzgesN/neyaBaqkSN5x4 VuJw== X-Gm-Message-State: ABy/qLYtSGoOvuWpmBLPhbogrKrfXT8GZVzFox4XnjWazkhRCRzb580X 2OYF82C41HUj8g//97H6C1eZ5HV1oIk= X-Received: by 2002:aa7:d315:0:b0:522:38f9:e653 with SMTP id p21-20020aa7d315000000b0052238f9e653mr1183931edq.30.1690208634391; Mon, 24 Jul 2023 07:23:54 -0700 (PDT) Received: from localhost (fwdproxy-cln-117.fbsv.net. [2a03:2880:31ff:75::face:b00c]) by smtp.gmail.com with ESMTPSA id f9-20020a056402150900b005222005e361sm2928296edw.45.2023.07.24.07.23.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Jul 2023 07:23:54 -0700 (PDT) From: Breno Leitao To: asml.silence@gmail.com, axboe@kernel.dk Cc: io-uring@vger.kernel.org, netdev@vger.kernel.org, davem@davemloft.net, kuba@kernel.org, edumazet@google.com, pabeni@redhat.com, linux-kernel@vger.kernel.org, leit@meta.com Subject: [PATCH 3/4] io_uring/cmd: Introduce SOCKET_URING_OP_SETSOCKOPT Date: Mon, 24 Jul 2023 07:22:36 -0700 Message-Id: <20230724142237.358769-4-leitao@debian.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230724142237.358769-1-leitao@debian.org> References: <20230724142237.358769-1-leitao@debian.org> MIME-Version: 1.0 X-Spam-Status: No, score=-1.4 required=5.0 tests=BAYES_00, FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS, RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1772313337220451834 X-GMAIL-MSGID: 1772313337220451834 Add initial support for SOCKET_URING_OP_SETSOCKOPT. This new command is similar to setsockopt. This initial implementation just cares about SOL_SOCKET level for now. The next patch implements the generic case. Function io_uring_cmd_setsockopt() is inspired by the function __sys_setsockopt(). "optval" is currently copied to kernel space in io_uring_cmd_setsockopt(), so, the setsockopt() protocol callbacks operate on kernel space memory after io_uring handlers. Important to say that userspace needs to keep the pointer's memory alive until the operation is completed. Signed-off-by: Breno Leitao --- include/uapi/linux/io_uring.h | 1 + io_uring/uring_cmd.c | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+) diff --git a/include/uapi/linux/io_uring.h b/include/uapi/linux/io_uring.h index 8152151080db..3fe82df06abf 100644 --- a/include/uapi/linux/io_uring.h +++ b/include/uapi/linux/io_uring.h @@ -736,6 +736,7 @@ enum { SOCKET_URING_OP_SIOCINQ = 0, SOCKET_URING_OP_SIOCOUTQ, SOCKET_URING_OP_GETSOCKOPT, + SOCKET_URING_OP_SETSOCKOPT, }; #ifdef __cplusplus diff --git a/io_uring/uring_cmd.c b/io_uring/uring_cmd.c index 16c857cbf3b0..d63a3b0f93a3 100644 --- a/io_uring/uring_cmd.c +++ b/io_uring/uring_cmd.c @@ -207,6 +207,39 @@ static inline int io_uring_cmd_getsockopt(struct socket *sock, return optlen; } +static inline int io_uring_cmd_setsockopt(struct socket *sock, + struct io_uring_cmd *cmd) +{ + void __user *optval = u64_to_user_ptr(READ_ONCE(cmd->sqe->optval)); + int optname = READ_ONCE(cmd->sqe->optname); + int optlen = READ_ONCE(cmd->sqe->optlen); + int level = READ_ONCE(cmd->sqe->level); + void *koptval; + int err; + + err = security_socket_setsockopt(sock, level, optname); + if (err) + return err; + + koptval = kmalloc(optlen, GFP_KERNEL); + if (!koptval) + return -ENOMEM; + + err = copy_from_user(koptval, optval, optlen); + if (err) + goto fail; + + err = -EOPNOTSUPP; + if (level == SOL_SOCKET && !sock_use_custom_sol_socket(sock)) { + err = sock_setsockopt(sock, level, optname, + KERNEL_SOCKPTR(koptval), optlen); + } + +fail: + kfree(koptval); + return err; +} + int io_uring_cmd_sock(struct io_uring_cmd *cmd, unsigned int issue_flags) { struct socket *sock = cmd->file->private_data; @@ -230,6 +263,8 @@ int io_uring_cmd_sock(struct io_uring_cmd *cmd, unsigned int issue_flags) return arg; case SOCKET_URING_OP_GETSOCKOPT: return io_uring_cmd_getsockopt(sock, cmd); + case SOCKET_URING_OP_SETSOCKOPT: + return io_uring_cmd_setsockopt(sock, cmd); default: return -EOPNOTSUPP; } From patchwork Mon Jul 24 14:22:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Breno Leitao X-Patchwork-Id: 125052 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9010:0:b0:3e4:2afc:c1 with SMTP id l16csp1845432vqg; Mon, 24 Jul 2023 07:41:26 -0700 (PDT) X-Google-Smtp-Source: APBJJlGfODuc9+5W8tdxFYTzTdGnoZ2aqSVXGdbAKr/6ceR2zOXsfg1GlbK+EWu/Zblm8s51+Vj+ X-Received: by 2002:a05:6358:913:b0:139:71af:ed0f with SMTP id r19-20020a056358091300b0013971afed0fmr1033287rwi.1.1690209685891; Mon, 24 Jul 2023 07:41:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690209685; cv=none; d=google.com; s=arc-20160816; b=bwKqvXrURPmRVg/AQ63Di/HfsEv4Z1TXOhs6kXpKVrsWf7p6FyFNUBYssxw2zvyBEY h7K6E7ZnKyF3URoD9s7dNJfOTjfv2IKliw2bJLVuLoCU7lww7QIHq1r+vgFBlnxPSkvf A7p6oHFsdrjUv68Vr12TDHs/KwWhHU2U/LVIkdZhGMy8jJ6/Xaf1bAQghg4HPMrC8GdP /p1MC0WHR3eKfYvCqBlGblSZhA4WY2cJFN8UbFjKw3AAOm7+mH2wy1RvS0Ohc0/JUR4g CKDH2yvcxeoTWmAbX2/N48xUxo4UngsWzFrltBHNsci0hVa5XAgNf4S1XQXt4OEqS/Cw 2Usw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=InNH0JvJZ59G15aPVaduy0ZgdUUB/VBaXGV72FTdLX8=; fh=cl1KgUwAZ0tdftZMcFCuNRV2QxDqPcsKXd9k46OghIc=; b=nYbTgX7NLMFoK0upt1B4WpuI3qy03V5MlyNWk9jrUtMiBIHf4enjYXFKF40EOQAYX2 CWDyK5CKoYDdIU9aDi+PqBW5nFXvlwfeiZJqFTvM1IO4i4MAKanidTeOPs6HU9CW8Vo/ Um1ayoOiZsLUesvpZQFquxJ3578lzKu1NqKbrbNEpcwcvLZ+2YLF/ZKtUsdKtWKqzaMp Cocs3apSEQK9S4jbtG3tpcIbQHgfxxRlf9AI0ZFh3qGVtl8VdhYN9h6x2QQua0jfIecQ rHluZjiHXQa9U9bSVZsI7VrEc3t0kdEbjs1B4q1BvsS/Yiz1mCasxlm0izKAnfH7SaeN rLCg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id d71-20020a63364a000000b0055c07307e5bsi8891104pga.64.2023.07.24.07.41.12; Mon, 24 Jul 2023 07:41:25 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231987AbjGXOYJ (ORCPT + 99 others); Mon, 24 Jul 2023 10:24:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49662 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231979AbjGXOYH (ORCPT ); Mon, 24 Jul 2023 10:24:07 -0400 Received: from mail-ed1-f49.google.com (mail-ed1-f49.google.com [209.85.208.49]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 570F010D3; Mon, 24 Jul 2023 07:23:57 -0700 (PDT) Received: by mail-ed1-f49.google.com with SMTP id 4fb4d7f45d1cf-5222c5d71b8so1553196a12.2; Mon, 24 Jul 2023 07:23:57 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690208636; x=1690813436; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=InNH0JvJZ59G15aPVaduy0ZgdUUB/VBaXGV72FTdLX8=; b=PYUlNukPVxUwY1QQYwf/qlDPShjGJ+4xeD7y6lWy0BUSgUhPS0PhCLGOe0LqI0kLeC owuJ2sG/PXQm3HOmWtIZEgzjy/mgukxjY7WYc2+0XSb+ygRzKZnxstdQIZkzhSknBmjD u+B6fFRvyZWf04u36cvx9zp46mHZT6gihvnCaVkd6Rir+8AOp0+I3nUS3AagGw544grG qyeQZtKrS3Tt9fjrl42HJB4+EAfXP9GaNrMgvhSzZfcuwPxPo/IrGxtS55wWlQ0zBJzo apw+OP0dWOqNm6A2zakXpLDIwK5p8SLPFCS3y9SL3EAyv9bz4tmOIgyy+KXUE30wkGk3 hheA== X-Gm-Message-State: ABy/qLaf+FiOaf63W0JvyEAP+sBqaJRejKjfH1PwNWlk0tLTrikO+fH6 MJg6GtxHpWIJ1A/sSOGv0hE= X-Received: by 2002:aa7:c2ca:0:b0:51e:677:603f with SMTP id m10-20020aa7c2ca000000b0051e0677603fmr8335834edp.38.1690208635735; Mon, 24 Jul 2023 07:23:55 -0700 (PDT) Received: from localhost (fwdproxy-cln-120.fbsv.net. [2a03:2880:31ff:78::face:b00c]) by smtp.gmail.com with ESMTPSA id a23-20020aa7cf17000000b005221f0b75b7sm3118092edy.27.2023.07.24.07.23.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Jul 2023 07:23:55 -0700 (PDT) From: Breno Leitao To: asml.silence@gmail.com, axboe@kernel.dk Cc: io-uring@vger.kernel.org, netdev@vger.kernel.org, davem@davemloft.net, kuba@kernel.org, edumazet@google.com, pabeni@redhat.com, linux-kernel@vger.kernel.org, leit@meta.com Subject: [PATCH 4/4] io_uring/cmd: Extend support beyond SOL_SOCKET Date: Mon, 24 Jul 2023 07:22:37 -0700 Message-Id: <20230724142237.358769-5-leitao@debian.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230724142237.358769-1-leitao@debian.org> References: <20230724142237.358769-1-leitao@debian.org> MIME-Version: 1.0 X-Spam-Status: No, score=-1.4 required=5.0 tests=BAYES_00, FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS, RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1772313311260747940 X-GMAIL-MSGID: 1772313311260747940 Add generic support for SOCKET_URING_OP_SETSOCKOPT, expanding the current case, that just execute if level is SOL_SOCKET. This implementation basically calls sock->ops->setsockopt() with a kernel allocated optval; Since the callback for ops->setsockopt() is already using sockptr_t, then the callbacks are leveraged to be called directly, similarly to __sys_setsockopt(). Signed-off-by: Breno Leitao --- io_uring/uring_cmd.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/io_uring/uring_cmd.c b/io_uring/uring_cmd.c index d63a3b0f93a3..ff438826e63f 100644 --- a/io_uring/uring_cmd.c +++ b/io_uring/uring_cmd.c @@ -229,11 +229,14 @@ static inline int io_uring_cmd_setsockopt(struct socket *sock, if (err) goto fail; - err = -EOPNOTSUPP; - if (level == SOL_SOCKET && !sock_use_custom_sol_socket(sock)) { + if (level == SOL_SOCKET && !sock_use_custom_sol_socket(sock)) err = sock_setsockopt(sock, level, optname, KERNEL_SOCKPTR(koptval), optlen); - } + else if (unlikely(!sock->ops->setsockopt)) + err = -EOPNOTSUPP; + else + err = sock->ops->setsockopt(sock, level, optname, + KERNEL_SOCKPTR(koptval), optlen); fail: kfree(koptval);