From patchwork Wed May 17 12:56:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 95235 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp1125220vqo; Wed, 17 May 2023 06:12:33 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7pYW2Ivtm18NUA0i0xwA4+WVgSwbFdVk8ZRI8yYogIHjS4CMAz4shdA06IqdLZoH3YdJyR X-Received: by 2002:a05:6a20:6a14:b0:d9:250:665c with SMTP id p20-20020a056a206a1400b000d90250665cmr48542372pzk.15.1684329153184; Wed, 17 May 2023 06:12:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684329153; cv=none; d=google.com; s=arc-20160816; b=ykXhEXXNP6zO/x5FmXw5GS6nQEANOR6pIhPWMyZR39t0SLv4QM3znKUOYSgyfd8u7x Pj5XTvftNeHaNIglGQ2GsKjNvM4Rn7AY/9Oxy5tlXrtBGnXmehuWaTSz/vvk48+SEkjk p25B62jlKTVadpuiwTgXWy8krT2JEy1IVSpVQw+ByPVNlZ96EI1u1sNgzsnP3UWFVset OWhKLTWCZ5SGb+TNXMbTAx+xjCZjw0EkgZkFcFEWPtU3x2TFWNX3NomlJtX68aAXdzHt HfYk5PcvcW4lF03CxgxeFCA75dFnonPCzdmgNwyQxqqmNwkOOfo851RihIiktHyV8jdf 2WVg== 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=jnUdP49jN07jGOXnwxumuoOiEQsEb3q1kybEv2CG0N0=; b=Jx4MY5o7+m1sit+JslnjSjW8+YuP2XXJKexouIBdHu7QxZiigUe9aoOEATj7K4kDzD a7ponPpQKARpI15BbYAXGt7EXZ7xECllpqWmAPnxFklZkT5g5B3IayIFsS58Y6RO3SEM KvF2IVfeef9FLpHMkmrCCT1svetuwZTNeGa5ENw5pNbKaJedaOm0FnhzLUmj3++apczk 5Xhh7dreoafOLLDUJVEqr+6EvaLVUD0Sct47jRL8nrwprovTNhhDWw/KkbD37qUaIIok QrniqgWx9bhRJIogH8+ot9z2vpZxj9tg2XFb7J0RIJ3+LRTYzLGSOEeXF//T8kNggb1i gctQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=RwYMMQws; 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 v202-20020a6361d3000000b0052c4296d8casi20231148pgb.325.2023.05.17.06.12.18; Wed, 17 May 2023 06:12:33 -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=RwYMMQws; 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 S230301AbjEQM42 (ORCPT + 99 others); Wed, 17 May 2023 08:56:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37838 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229959AbjEQM41 (ORCPT ); Wed, 17 May 2023 08:56:27 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 622FB35A4 for ; Wed, 17 May 2023 05:56:26 -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 F3E0264052 for ; Wed, 17 May 2023 12:56:25 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4E768C433EF; Wed, 17 May 2023 12:56:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1684328185; bh=aFRrYAqDSJxn8HKtK8TeJ3ohzNrp0EBecEl3zcAiyt8=; h=From:To:Cc:Subject:Date:From; b=RwYMMQwsvv4e5jkEclWn763W6XRr9IKHeCWmYki3sfUxAoo+EqonowM7V8dRIqL+p 3orWIahvQw8w2LKaHGl/rXoaP4rzg+KNOid/e541r6UQsX2u7o8czOd4HE7mBIfrYf d5avXK6rec78PIwHP674iqTZKSz0jlt3+J3D/Dq+F5Kpq9CP43IZp4dgz9jBDwVMtZ 65m6G+Dl54pK4akJff1zvPe6dWjQH+loEXhXOlzUDKlou8DNnq56k9FKfTsnTR8Opm 536gkKzV1O8mRdIIMKZh5EAmbqJXnKS9Q5SAnGBG7wg6S5OE24Pi+GBv6JjCtj0I9V 0tgr12efNB3Ow== From: Arnd Bergmann To: 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" , Kumar Kartikeya Dwivedi , Delyan Kratunov , Ilya Leoshkevich , Menglong Dong , Yafang Shao , bpf@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/2] bpf: hide unused bpf_patch_call_args Date: Wed, 17 May 2023 14:56:08 +0200 Message-Id: <20230517125617.931437-1-arnd@kernel.org> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 X-Spam-Status: No, score=-7.1 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?1766147126014203311?= X-GMAIL-MSGID: =?utf-8?q?1766147126014203311?= From: Arnd Bergmann This function has no callers and no declaration when CONFIG_BPF_JIT_ALWAYS_ON is enabled: kernel/bpf/core.c:2075:6: error: no previous prototype for 'bpf_patch_call_args' [-Werror=missing-prototypes] Hide the definition as well. Signed-off-by: Arnd Bergmann --- kernel/bpf/core.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/kernel/bpf/core.c b/kernel/bpf/core.c index 7421487422d4..6f5ede31e471 100644 --- a/kernel/bpf/core.c +++ b/kernel/bpf/core.c @@ -2064,7 +2064,7 @@ 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, +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) @@ -2072,6 +2072,7 @@ 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 +2081,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, From patchwork Wed May 17 12:56:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 95255 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp1135336vqo; Wed, 17 May 2023 06:27:01 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5paHkb68kTP9Qx10VwG5wIktVf0GxJxwEDyZSgoXvhaA+Gp6p6I4G+q3sMPnFQf+WZsz4y X-Received: by 2002:a17:90a:7bcc:b0:252:27d9:7ef0 with SMTP id d12-20020a17090a7bcc00b0025227d97ef0mr23201360pjl.27.1684330021631; Wed, 17 May 2023 06:27:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684330021; cv=none; d=google.com; s=arc-20160816; b=Ore+TOykR4kKFgK439wo1chIXdqta1MuKplPI51TGJ8dMBwwfXuvlq/FPKX9MnO9fJ WL93Z8dm008+mpWuaXm2TmtLkPpX5byepewRLSPLwmTZbL5LmRGs/r4CfPzG7a9gYZn0 izMDkroKAcmFHVDADr0gkMPff8BC9yW43q4e65DmT5nYKFy1W59ZInAXhX3ssjEIJMc9 XRMquPY9XDl8GXyrwacTm6V7tSzEZoprBnyjZ0QcSx00ffmvnIcc5EddtUy8GHJr76FW kxb/thbTVzZwotSiaw0J8vGUhUwWfCMzOkm24ckEkZahAj7BkYJJNQgTO4xDX4diW34O YpDw== 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 :dkim-signature; bh=d+qE+cT4VjUfhBqVb2+yssDUdZwD3LOvvWXbx7iLMy4=; b=uFZaQ2HxZ4UOuVF7TOjkhgkN/yShQuCAchtS2aE8n8pQpgAzqC4o5798Z8+6ZGGPTb J0iJwYLPooO7KrEOsYDmTP8xbiCWUP5waxxVMFe9xkDRfLThzs6ZgtrBjHcsViLhB4LK Z3pn3TtEd78np/VMZSkaYXVwH9w0HXmMuN4Wch3Lsxr3I7T1V4qEAKv3jVicWcMoSrAk RkQgat9/gNYl3w2Vlk5Yx0wzh7iJyESunJEfH22FaZ3UZv/ybJ++6lMnZqYFXkfi9Bj7 hxKP4rXIzbjo/RErL8bKS3dqwojoirhFfpOpUwE9mwGdShLtU/apMXTkNLrqYlKuzHU4 fHcA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="uchGo/0h"; 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 h2-20020a17090acf0200b00250cb2a2000si1829071pju.113.2023.05.17.06.26.49; Wed, 17 May 2023 06:27: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; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="uchGo/0h"; 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 S231559AbjEQM4j (ORCPT + 99 others); Wed, 17 May 2023 08:56:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38044 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231824AbjEQM4h (ORCPT ); Wed, 17 May 2023 08:56:37 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 819E26E8E for ; Wed, 17 May 2023 05:56:35 -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 18D42646CD for ; Wed, 17 May 2023 12:56:35 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 61242C433EF; Wed, 17 May 2023 12:56:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1684328194; bh=N5w8zSa8G+0c9DkpbjE5wIaKBUm//T9/7Q6k5MttMfE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=uchGo/0hNRi3WLSo7De+RlxONVgD8OJPqYVjxWuzaj2A9/g+DTrC/u2XF3QdKsCqp xiODetgRLJ0K1RrqEUwzh77ytfS219TLPWyOQoinx4clc4O0qkeZ93kIuk2KeuRzw/ ry2g0IvnbkmEgNL8KBD9F+JTdQAO99ZI1TnWacdtPnq/jG5cqG26On1N0cQruzK2dh i6gX9tgaDXTR1mXBu3e9V1k/hqB5Bck/7b/lQvZpcuhrj3spgl8Tmis4wlSxneZmND eXF+r1mtAWkZE5DLxiSdfSe4Z8x1YjoQtOHm/+RHhzX5MO9c8A0Bth6m7q6dbdhgyI Qcv54fzjRhIwQ== From: Arnd Bergmann To: 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" , Kumar Kartikeya Dwivedi , Delyan Kratunov , Ilya Leoshkevich , Menglong Dong , Yafang Shao , bpf@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/2] bpf: add bpf_probe_read_kernel declaration Date: Wed, 17 May 2023 14:56:09 +0200 Message-Id: <20230517125617.931437-2-arnd@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230517125617.931437-1-arnd@kernel.org> References: <20230517125617.931437-1-arnd@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-7.1 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?1766148036553924692?= X-GMAIL-MSGID: =?utf-8?q?1766148036553924692?= From: Arnd Bergmann bpf_probe_read_kernel() has a __weak definition in core.c and another definition with an incompatible prototype in kernel/trace/bpf_trace.c, when CONFIG_BPF_EVENTS is enabled. Since the two are incompatible, there cannot be a shared declaration in a header file, but the lack of a prototype causes a W=1 warning: kernel/bpf/core.c:1638:12: error: no previous prototype for 'bpf_probe_read_kernel' [-Werror=missing-prototypes] Add a prototype directly in front of the function instead to shut up the warning. Also, to avoid having an incompatible function override the __weak definition, use an #ifdef to ensure that only one of the two is ever defined. I'm not sure what can be done to make the two prototypes match. Signed-off-by: Arnd Bergmann --- kernel/bpf/core.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kernel/bpf/core.c b/kernel/bpf/core.c index 6f5ede31e471..38762a784b86 100644 --- a/kernel/bpf/core.c +++ b/kernel/bpf/core.c @@ -1635,11 +1635,14 @@ bool bpf_opcode_in_insntable(u8 code) } #ifndef CONFIG_BPF_JIT_ALWAYS_ON -u64 __weak bpf_probe_read_kernel(void *dst, u32 size, const void *unsafe_ptr) +u64 bpf_probe_read_kernel(void *dst, u32 size, const void *unsafe_ptr); +#ifndef CONFIG_BPF_EVENTS +u64 bpf_probe_read_kernel(void *dst, u32 size, const void *unsafe_ptr) { memset(dst, 0, size); return -EFAULT; } +#endif /** * ___bpf_prog_run - run eBPF program on a given context