From patchwork Fri Jun 2 13:50:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 102573 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp1057840vqr; Fri, 2 Jun 2023 07:12:17 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4XrIYAvOZpqG8k+QnAWEcEO99KcVQ2W0Y2ogby+KwRb/wi3Wb9IMmbBJuETAvZVRg3IWR6 X-Received: by 2002:a17:902:f68a:b0:1a6:71b1:a0b9 with SMTP id l10-20020a170902f68a00b001a671b1a0b9mr66742plg.47.1685715137175; Fri, 02 Jun 2023 07:12:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685715137; cv=none; d=google.com; s=arc-20160816; b=aNDLNZsPNLfFvQ2E9O3qHAmfqL+ExGW3lMtfijSLkXdjHJjVgRv+n25JC+IDJltDrZ p5rM+B83tesmh5KybSqqF+m6NdKPEReI6AARDIFbaMBG+QeSBCqdz8x0s8W+6idyI10k dJO9lKtxQE16IKsiAaAu+2qKNsaTidWPW1cYpWLs0sFe+V3wAnGNHzVs3mGGt4UwI6oB 5BFlF3q2gKsdtyVNKeEDkWEk1sKQjJeA7SyRvYgyXAtGH58kapSdDuM4zFXEzIV660uP 6n8Wkn2FZz7um54+TrY7tKih/dVHhHk80YIPQAW2aS8idUTzebGRLBErkIk904ANacoR Aeig== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=y7pqZuXb/bgwaJTja55aeHuQtUDrvAB4eTr+2EXEou0=; b=otA+TC6vRfMs7KWf+E5Jo+YGFL5iQTJ5lNi3m0XVYKwIYQ4pCENJB4NVf/M8I+u/ta r7Ix/ymZJEghZQ2QeyQibJsWUbERunUh0frN8qX/V78OTM0E/Bnq2Bal8Pve76UDmR4R D9+E5Cr/RSSZFlc6f2z0ToJuiNr6XQWZyK+iqxSBHiJfbu2ErrFUp04LKOfCxTLJq3Hr ig7SniATi+Y4I/8qMKX7Aoi8nNLecvZrfCS1NiU0KW39Lo6ri0cY0wBrvtI5vafU1L5l 48s+fYidzANpsX62Onqrge55QX4FxMAWDScGDe5LHVywAxYgR3G0BW5NsVKbVji7RBS5 Obtg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=ImH0SK4x; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id c10-20020a170903234a00b001ac47a1578asi1015045plh.232.2023.06.02.07.11.54; Fri, 02 Jun 2023 07:12:17 -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; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=ImH0SK4x; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235885AbjFBNvk (ORCPT + 99 others); Fri, 2 Jun 2023 09:51:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51150 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232213AbjFBNvi (ORCPT ); Fri, 2 Jun 2023 09:51:38 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 060D1137 for ; Fri, 2 Jun 2023 06:51:38 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 97DD26100A for ; Fri, 2 Jun 2023 13:51:37 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A1BA4C433D2; Fri, 2 Jun 2023 13:51:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1685713897; bh=+FsSpx9RH7B04NclB3EiDSdjh3wRRkb9YV3Jl0GU0lc=; h=From:To:Cc:Subject:Date:From; b=ImH0SK4xMGhP5BS50S2vxwDTc+bpUVKnvvZjh7vAUdBlhNZMJysg3FXiYW8H6EkN/ UgkvcuTKbQqVz4wvwQ3QO8S6g9oVMGJSyyvWTGmlUOLe/0/dE+18ECounmjtPb4diM mRHFBW5qp2ooJ2KsVn7pbkE+867c5SoCklzFvLUpKQV/tB/dXZloj6Kf5hf6Occ6mw Zb1mGaUEITebvwkKJ9px3QU6VoCROvvl0mTAgxRbUgkAdsFxG2Qc9zlL20muWFexkn aFAc/sr/8x5vtC5yCu2zBulNEG0XNwTUZxPakRGMIa9OtNDsR7GMzjgGGFXiOoMHTN qSHCZ4+FSD2MA== From: Arnd Bergmann To: Yonghong Song , Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko Cc: Arnd Bergmann , John Fastabend , Martin KaFai Lau , Song Liu , Yonghong Song , KP Singh , Stanislav Fomichev , Hao Luo , Jiri Olsa , "Jason A. Donenfeld" , bpf@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/2] [v3] bpf: hide unused bpf_patch_call_args Date: Fri, 2 Jun 2023 15:50:18 +0200 Message-Id: <20230602135128.1498362-1-arnd@kernel.org> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 X-Spam-Status: No, score=-7.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham 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: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1767600435936767425?= X-GMAIL-MSGID: =?utf-8?q?1767600435936767425?= From: Arnd Bergmann This function is only used when CONFIG_BPF_JIT_ALWAYS_ON is disabled, but CONFIG_BPF_SYSCALL is enabled. When both are turned off, the prototype is missing but the unused function is still compiled, as seen from this W=1 warning: kernel/bpf/core.c:2075:6: error: no previous prototype for 'bpf_patch_call_args' [-Werror=missing-prototypes] Add a matching #ifdef for the definition to leave it out. Signed-off-by: Arnd Bergmann Acked-by: Yonghong Song --- v3: fix incorrect changelog text v2: change indentation to align arguments better. Still not great as the line is just too long --- kernel/bpf/core.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/kernel/bpf/core.c b/kernel/bpf/core.c index 7421487422d48..0926714641eb5 100644 --- a/kernel/bpf/core.c +++ b/kernel/bpf/core.c @@ -2064,14 +2064,16 @@ EVAL4(PROG_NAME_LIST, 416, 448, 480, 512) }; #undef PROG_NAME_LIST #define PROG_NAME_LIST(stack_size) PROG_NAME_ARGS(stack_size), -static u64 (*interpreters_args[])(u64 r1, u64 r2, u64 r3, u64 r4, u64 r5, - const struct bpf_insn *insn) = { +static __maybe_unused +u64 (*interpreters_args[])(u64 r1, u64 r2, u64 r3, u64 r4, u64 r5, + const struct bpf_insn *insn) = { EVAL6(PROG_NAME_LIST, 32, 64, 96, 128, 160, 192) EVAL6(PROG_NAME_LIST, 224, 256, 288, 320, 352, 384) EVAL4(PROG_NAME_LIST, 416, 448, 480, 512) }; #undef PROG_NAME_LIST +#ifdef CONFIG_BPF_SYSCALL void bpf_patch_call_args(struct bpf_insn *insn, u32 stack_depth) { stack_depth = max_t(u32, stack_depth, 1); @@ -2080,6 +2082,7 @@ void bpf_patch_call_args(struct bpf_insn *insn, u32 stack_depth) __bpf_call_base_args; insn->code = BPF_JMP | BPF_CALL_ARGS; } +#endif #else static unsigned int __bpf_prog_ret0_warn(const void *ctx,