From patchwork Wed Jul 19 10:27: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: 122539 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c923:0:b0:3e4:2afc:c1 with SMTP id j3csp2345990vqt; Wed, 19 Jul 2023 03:49:29 -0700 (PDT) X-Google-Smtp-Source: APBJJlEQ+UjMVu55AwG79eoh0h1OrsuysB0xiJ9m3tkvTJIcwkahl4JOqfoxSoQHmP4+sv04Dxzi X-Received: by 2002:a17:906:77cf:b0:993:d47f:3c84 with SMTP id m15-20020a17090677cf00b00993d47f3c84mr2334577ejn.7.1689763769465; Wed, 19 Jul 2023 03:49:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689763769; cv=none; d=google.com; s=arc-20160816; b=tRM/QlIU3U+XLKkBMqA3IoebECH6+STrqbI21zQhp3UdzoIdxDXiPgtaAayOHLQus6 AznzyMzJZ8eNeJ36nao6je8kzHaxDyz48DP5OOc9LBy951E6AlLp/x94aPuM6BTRi+M0 1/EYv/vUeKC/QwTp9mdLcnkQWzYqEL+J4ySkcY/eZziVQafvWWZfFC8NLO0dKf+eTXoe eE7MmLMULwJX2Y93hyI1xHsbdvmXnxVKPb1D16GOiTxEDwHxsQ2blysiiiSK0GTA867k RkzubJAZMOU0uFJWO/u5ZNonLLLeZ6+yPsu4Y+aF2GbLAJdxwy3vu8GKwtoyadQ1KysQ m8pg== 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=wo3mf4GiqmDENLHWZ21IVVS9oe1ebd9UEGW3hPKqV+4=; b=SNqkVTR18RtT9R+6gvGWJkKGXDd+xMQ5T39ikiYowNjBPOzPU59mWwibIeWKnwx3ch fM4QchuYb3uqQbUF62xedAj/d/B564NXrt8bhlekW6HGH0IQ9GhMwjZnZ/mQO+64u+WJ m/q7/5pcvCudNEbH8Qx4P3dRKDqm9v05pNWwntbWoxImGIxT74oifhN0Jj2hwi9tUPf4 g7o8tvDKNR12CsKqSNzQwRsrffCaTyPfC1X4C3UHsR4ZyqFVgx2LTR+gaNJNeoT+5uMO Wb3uVa7jwPJh0Zq2ucmM0vc7gncsNMeJ4apJtjxckymJ9+MyAruMHDTDptbF49vwhNEY taZA== 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 t27-20020a1709063e5b00b00992acfe04b8si2653579eji.150.2023.07.19.03.49.04; Wed, 19 Jul 2023 03:49:29 -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 S231364AbjGSK3g (ORCPT + 99 others); Wed, 19 Jul 2023 06:29:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46038 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231292AbjGSK3S (ORCPT ); Wed, 19 Jul 2023 06:29:18 -0400 Received: from mail-wm1-f46.google.com (mail-wm1-f46.google.com [209.85.128.46]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2A9CE2701; Wed, 19 Jul 2023 03:28:44 -0700 (PDT) Received: by mail-wm1-f46.google.com with SMTP id 5b1f17b1804b1-3fbc59de0e2so62471495e9.3; Wed, 19 Jul 2023 03:28:44 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689762477; x=1692354477; 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=ac0dv5CuPxNhSixnj7G/aMAG2v7RmhsTO6Srguly6jqHEuo3f/seW+3CLvA/yXirdL BCG4qEkxQSbu4aI0j1OyKhSxkFcY4uTbaaSqrrhkwsqtcndXo0oYFn9clBO2iBL+6KAT MoeaCcrc84dHLP55rNo65ZoemN+KEOD97TsLBmvVux+IWR/PVCJVrhMD8nJFwG9lvujP 0dIVfFDULDqla+M5TuIU5GyjI0rh/WjY6gtsY271zv1bVL8yYFzeqBEiqA0cK8j3b/YN 68812p6K3h8BnxDJr/QD7n5nrm1xOctTbY90SSvEee15/giuENITbZD/bvK9QTZS3TDU cHuA== X-Gm-Message-State: ABy/qLa+5A66xhNnZBsyd1x3DBwgo3JyHBfqX+YlT6BbzCteFW18Uc/i tAFnOvQOdbf88C9byVO3sew= X-Received: by 2002:a7b:ce15:0:b0:3fb:d68d:4c6f with SMTP id m21-20020a7bce15000000b003fbd68d4c6fmr3780930wmc.14.1689762476806; Wed, 19 Jul 2023 03:27:56 -0700 (PDT) Received: from localhost (fwdproxy-cln-120.fbsv.net. [2a03:2880:31ff:78::face:b00c]) by smtp.gmail.com with ESMTPSA id p13-20020a1c740d000000b003fbb0c01d4bsm1363718wmc.16.2023.07.19.03.27.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Jul 2023 03:27:56 -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 Subject: [RFC PATCH 1/3] net: expose sock_use_custom_sol_socket Date: Wed, 19 Jul 2023 03:27:35 -0700 Message-Id: <20230719102737.2513246-2-leitao@debian.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230719102737.2513246-1-leitao@debian.org> References: <20230719102737.2513246-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_BLOCKED,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: 1771845734389161758 X-GMAIL-MSGID: 1771845734389161758 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 Wed Jul 19 10:27: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: 122543 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c923:0:b0:3e4:2afc:c1 with SMTP id j3csp2349405vqt; Wed, 19 Jul 2023 03:58:01 -0700 (PDT) X-Google-Smtp-Source: APBJJlGITQlTS6PsG+bia5wt10ibjfZ9zlm67if75B6dqWGgmZElSwI4qkK1HM9WLnjE6OLD+Q61 X-Received: by 2002:a17:906:5a70:b0:993:d617:bdc5 with SMTP id my48-20020a1709065a7000b00993d617bdc5mr1874464ejc.37.1689764281498; Wed, 19 Jul 2023 03:58:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689764281; cv=none; d=google.com; s=arc-20160816; b=dp3LlPcq0Hv2JWCsLodXaw11hUe1z0inXb35jFPzBifnEBrCREyCXb7h1CoqtjBwNR 1CRacPtctMOeY1avhrzuioieBBxJgTkYHIu+ls2q5olm6Tom8BC1RvzaVQeHO9AHcDdC qO9IgBfKDGMmchRvB/09AIBopIqfRfIILFVjrOihUEnB1rPJxac95kzqKQu+HtbUggoh OYsWIiCqOttI8pXwNOga2JbfwUKMfFeNJjwO5lR8O8tn/gX8eeMXyZ5NpPqKM14xWiYk pnjksir9JGLnR1tYaqdVDfPpsXz5l1dAmgFO+QQiLprTUCTUU3TbzY60xvnDXEmaGgZZ DCdA== 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=bw5UDGeKJ7BUad+TVKsaKYkD1Z7MysjHU3RtJUQyTus=; fh=5HB2oHcWPycUEd6i2RgRZp6UNgDlvuYe3rlVRPiz3LY=; b=bWwLhEcjffgxyQfzOLopmS7r3G/jRc/k80Gw8CodOgX5cmwhTz3v2e/RWIcvjNW268 QcE5j3QIWtODFhDU1GCLm0akmzfvTnVY8kC4RAlZBa83SvHZxNtfhClCwEQaXP6ufp44 gJuKtyeDHnHL/OS6D7qIL167Ev54akMhOfBCS5eNFEr6/x/KvXwBdDFFmwGV8JmafBVj HhGLcoug2rTVWr7b+7dDmN5bXsS4fQEZZzfhkvRD++zcMKJcd5aXWkhorqYinfER1+vt mtEMphc15LvSCmwOUJB+U95SGSnbJffOiapyFFKaOj4HrAGeXvFOvbM/R2MMdBQcQUZr EUpg== 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 l2-20020a170906414200b00992ae4dfc05si2426118ejk.1021.2023.07.19.03.57.37; Wed, 19 Jul 2023 03:58:01 -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 S229915AbjGSK3b (ORCPT + 99 others); Wed, 19 Jul 2023 06:29:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50692 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231356AbjGSK3Q (ORCPT ); Wed, 19 Jul 2023 06:29:16 -0400 Received: from mail-lf1-f51.google.com (mail-lf1-f51.google.com [209.85.167.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 465BE1BC0; Wed, 19 Jul 2023 03:28:42 -0700 (PDT) Received: by mail-lf1-f51.google.com with SMTP id 2adb3069b0e04-4fba8f2197bso11402351e87.3; Wed, 19 Jul 2023 03:28:42 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689762478; x=1692354478; 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=bw5UDGeKJ7BUad+TVKsaKYkD1Z7MysjHU3RtJUQyTus=; b=QiRIrUtQSOnpg2Z6Q1REzFbHVQcZj2nJ4i2xWZpVGGaHadCRQOeqe2yc4e3sHYr4Ln UFPmjrIo6jv1md6Ssufxzdh+gyVL/4a61z+dyDYXxbU+y9gkYmTekvmWVMktPeEDL5G1 EGXrcyDQGff0qdOb3ry7HInuRgPWWMLdk9QjPqDFGokZf87s8kj+Ft3MOZeTiEWoRKue nnlj0HnPaYLuJpvSqNRodUpzOr7FEGiRgbiAhYPUNvwz+NxyRI5yKE349L4jl6tzp7DI oCwz/xjNjdXorekR1XppntWatgEij20E/vUyohyq2oAdyWjWoplxyoI79L/Hfe+Lmqyw ep9g== X-Gm-Message-State: ABy/qLY0kMpuiV9K2Ia22pHgZVJhDB4m8dKNQj7vV0n1skPBdrM8YlXi 5080BDkq7gaveSbajt7OXDI= X-Received: by 2002:a05:6512:3d89:b0:4f9:6528:fb15 with SMTP id k9-20020a0565123d8900b004f96528fb15mr13879527lfv.12.1689762478288; Wed, 19 Jul 2023 03:27:58 -0700 (PDT) Received: from localhost (fwdproxy-cln-119.fbsv.net. [2a03:2880:31ff:77::face:b00c]) by smtp.gmail.com with ESMTPSA id q14-20020a1cf30e000000b003fbe561f6a3sm1339780wmq.37.2023.07.19.03.27.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Jul 2023 03:27:57 -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 Subject: [RFC PATCH 2/3] io_uring/cmd: Add support for getsockopt command Date: Wed, 19 Jul 2023 03:27:36 -0700 Message-Id: <20230719102737.2513246-3-leitao@debian.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230719102737.2513246-1-leitao@debian.org> References: <20230719102737.2513246-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_BLOCKED,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: 1771846271203069885 X-GMAIL-MSGID: 1771846271203069885 Add support for getsockopt function, 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 a pointer, which is overwritten by the kernel. In this implementation, userspace passes a u32, and the new value is returned in cqe->res. Signed-off-by: Breno Leitao --- include/uapi/linux/io_uring.h | 7 +++++++ io_uring/uring_cmd.c | 27 +++++++++++++++++++++++++++ 2 files changed, 34 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..28fd09351be7 100644 --- a/io_uring/uring_cmd.c +++ b/io_uring/uring_cmd.c @@ -166,6 +166,31 @@ 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 optlen = READ_ONCE(cmd->sqe->optlen); + int optname = READ_ONCE(cmd->sqe->optname); + int level = READ_ONCE(cmd->sqe->level); + int err; + + err = security_socket_getsockopt(sock, level, optname); + if (err) + return err; + + if (level == SOL_SOCKET) { + err = sk_getsockopt(sock->sk, level, optname, + USER_SOCKPTR(optval), + KERNEL_SOCKPTR(&optlen)); + if (err < 0) + return err; + return optlen; + } + + return -EOPNOTSUPP; +} + int io_uring_cmd_sock(struct io_uring_cmd *cmd, unsigned int issue_flags) { struct socket *sock = cmd->file->private_data; @@ -187,6 +212,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 Wed Jul 19 10:27: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: 122540 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c923:0:b0:3e4:2afc:c1 with SMTP id j3csp2347783vqt; Wed, 19 Jul 2023 03:53:54 -0700 (PDT) X-Google-Smtp-Source: APBJJlEiotZctK4QSZ3USlJ1Plkw9Mju6mEW8p0+syVN1Zm/6HobCfn+izB50jU3Lbvu+/spjNDU X-Received: by 2002:a17:906:14e:b0:967:e015:f542 with SMTP id 14-20020a170906014e00b00967e015f542mr2087855ejh.44.1689764033956; Wed, 19 Jul 2023 03:53:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689764033; cv=none; d=google.com; s=arc-20160816; b=0y3Lw5GzeM+l7rdk4zoH5tkTfdd59+BrTrNkeazD4/Atgw46WjAjoY9IhbhQp4rRcb PHBV+LukNl1IPmThFVmO8guLDC9prSTFSX1dAfmqXLqflrylrKutiDJMSds4w3gw9NCN vemQGIK2WgpLG4NUFRS2F0/vl4dMfbrNW+s/EpKAaTh+ByilL1NksZYzJC1jUMYMl4GO GseWiNF7aLjW0f8b/uaf6ISsnlB5nqzGZi+FkMgGuDeAKoVrseRWZ1BwyDxG5+aNr3aH PKksxR9Nr1nF30HD38y6KRorC7Zw0lyBb9BL/yJOcbr7HjZ7yUYk3tToXBVq+wPJGluv 0uaw== 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=x4XUMOf5v4z2uwMw/EOS++l6o91vWfvUqdVme/BSedQ=; fh=5HB2oHcWPycUEd6i2RgRZp6UNgDlvuYe3rlVRPiz3LY=; b=c9P+Qh+GSfntyVcDA3Z3hls6eDhdjGcUvW59ghOFfXp2hGmlVbhJPeFGp6shoR2WNl HeZUCNDJ+v+KQCg/5c6dW8AbqDwrF+7jtBOu8DiadmPBs+LN7w9imAE4BYCc/kaHkIfq wC9WV8H7OPKK1fwPqmm12w5Amj6mw6PeECbNPYmni9FsytQ6koIhfYqZzjZlgyFlDQ1e nyYgbUJkg4exU8a5S+1cvKYxiuEH3es/LB908E36u48tJeUAQHMDlZPIc3jtcirJLlcv ME4K3v6TBNIdXIG+pkCtQMOesv6nhkq1u+xqwgXiStPQMF7U2dYK6/yYuFo32MZyMDQT 0IrQ== 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 gf1-20020a170906e20100b0099270bd1b10si2503203ejb.208.2023.07.19.03.53.30; Wed, 19 Jul 2023 03:53:53 -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 S231411AbjGSK3e (ORCPT + 99 others); Wed, 19 Jul 2023 06:29:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48748 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231364AbjGSK3R (ORCPT ); Wed, 19 Jul 2023 06:29:17 -0400 Received: from mail-lf1-f50.google.com (mail-lf1-f50.google.com [209.85.167.50]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id ED59A1BDC; Wed, 19 Jul 2023 03:28:42 -0700 (PDT) Received: by mail-lf1-f50.google.com with SMTP id 2adb3069b0e04-4fb9ae4cef6so11139788e87.3; Wed, 19 Jul 2023 03:28:42 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689762480; x=1692354480; 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=x4XUMOf5v4z2uwMw/EOS++l6o91vWfvUqdVme/BSedQ=; b=d+meDbA1AG2AppxzWprtgd/ccVuXUnY/ujzGhYSs6ks2W6FFiyb2Ks9QUppDpKh9y/ 11JLb+5gF6foaHLDyK6yV4hw9TXuPp+gQ+OkdxN3bfuMgQJkAR/v+qPU8BqDwcpxzcte 0HQQswkv1HkQCRZw5LoqKSWkYBu1URIopR4Fk5m0eDNgteu41FoV9n6be4eFYhjLwj4A ZH7cQ7Q1x2jl5gGVxKyzQmVCIcSOzftfl4XsDBtNCDsz/et642KujKIxU8ZxKFCpxnRY sq5ePNfi2wUxNZaHfpI7v3niJV8+tJfjybNclzGJGYer15q8HMAOlsA6aktKbJKUKn4n ZLLA== X-Gm-Message-State: ABy/qLYvML/X0rIpC5r4hv6FRgQiTfPEgFDWIcermVC1LCY80REOcUDx DDHrtirSj4WDv/GD1wUSi0A= X-Received: by 2002:a05:6512:a8d:b0:4f9:5426:6622 with SMTP id m13-20020a0565120a8d00b004f954266622mr13413608lfu.69.1689762479710; Wed, 19 Jul 2023 03:27:59 -0700 (PDT) Received: from localhost (fwdproxy-cln-000.fbsv.net. [2a03:2880:31ff::face:b00c]) by smtp.gmail.com with ESMTPSA id x15-20020a05600c21cf00b003fbbe41fd78sm1380429wmj.10.2023.07.19.03.27.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Jul 2023 03:27:59 -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 Subject: [RFC PATCH 3/3] io_uring/cmd: Add support for set_sockopt Date: Wed, 19 Jul 2023 03:27:37 -0700 Message-Id: <20230719102737.2513246-4-leitao@debian.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230719102737.2513246-1-leitao@debian.org> References: <20230719102737.2513246-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_BLOCKED,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: 1771846011261483946 X-GMAIL-MSGID: 1771846011261483946 Add initial support for setsockopt for SOL_SOCKET level, by leveraging the sockptr infrastructure. Function io_uring_cmd_setsockopt is inspired by the function __sys_setsockopt(), which handles the system call case. Signed-off-by: Breno Leitao --- include/uapi/linux/io_uring.h | 1 + io_uring/uring_cmd.c | 24 ++++++++++++++++++++++++ 2 files changed, 25 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 28fd09351be7..7c06634e744a 100644 --- a/io_uring/uring_cmd.c +++ b/io_uring/uring_cmd.c @@ -191,6 +191,28 @@ static inline int io_uring_cmd_getsockopt(struct socket *sock, return -EOPNOTSUPP; } +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 optlen = READ_ONCE(cmd->sqe->optlen); + int optname = READ_ONCE(cmd->sqe->optname); + int level = READ_ONCE(cmd->sqe->level); + int err; + + err = security_socket_setsockopt(sock, level, optname); + if (err) + return err; + + if (level == SOL_SOCKET && !sock_use_custom_sol_socket(sock)) { + err = sock_setsockopt(sock, level, optname, + USER_SOCKPTR(optval), optlen); + return err; + } + + return -EOPNOTSUPP; +} + int io_uring_cmd_sock(struct io_uring_cmd *cmd, unsigned int issue_flags) { struct socket *sock = cmd->file->private_data; @@ -214,6 +236,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; }