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.