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;
From:   Jonas Rabenstein <rabenstein@cs.fau.de>
To:     Jiri Olsa <jolsa@kernel.org>
Cc:     Jonas Rabenstein <rabenstein@cs.fau.de>,
        Song Liu <song@kernel.org>,
        Alexei Starovoitov <ast@kernel.org>,
        Daniel Borkmann <daniel@iogearbox.net>,
        Andrii Nakryiko <andrii@kernel.org>,
        Martin KaFai Lau <martin.lau@linux.dev>,
        Yonghong Song <yhs@fb.com>,
        John Fastabend <john.fastabend@gmail.com>,
        KP Singh <kpsingh@kernel.org>,
        Stanislav Fomichev <sdf@google.com>,
        Hao Luo <haoluo@google.com>,
        Steven Rostedt <rostedt@goodmis.org>,
        Masami Hiramatsu <mhiramat@kernel.org>, bpf@vger.kernel.org,
        linux-kernel@vger.kernel.org
Subject: [PATCH] bpf: mark get_entry_ip as __maybe_unused
Date:   Thu,  3 Nov 2022 16:03:03 +0100
Message-Id: <20221103150303.974028-1-rabenstein@cs.fau.de>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Precedence: bulk

Commit c09eb2e578eb1668bbc ("bpf: Adjust kprobe_multi entry_ip
for CONFIG_X86_KERNEL_IBT") introduced the get_entry_ip() function.
Depending on CONFIG_X86_KERNEL_IBT it is a static function or only
a macro definition. The only user of this symbol so far is in
kprobe_multi_link_handler() if CONFIG_FPROBE is enabled.
If CONFIG_FROBE is not set, the symbol is not used and - depending
on CONFIG_X86_KERNEL_IBT - a warning for get_entry_ip() is emitted.
To solve this, the function should be marked as __maybe_unused.

Signed-off-by: Jonas Rabenstein <rabenstein@cs.fau.de>
---
 kernel/trace/bpf_trace.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel/trace/bpf_trace.c b/kernel/trace/bpf_trace.c
index f2d8d070d024..19131aae0bc3 100644
--- a/kernel/trace/bpf_trace.c
+++ b/kernel/trace/bpf_trace.c
@@ -1032,7 +1032,7 @@ static const struct bpf_func_proto bpf_get_func_ip_proto_tracing = {
 };
 
 #ifdef CONFIG_X86_KERNEL_IBT
-static unsigned long get_entry_ip(unsigned long fentry_ip)
+static unsigned long __maybe_unused get_entry_ip(unsigned long fentry_ip)
 {
 	u32 instr;
 
-- 
2.37.4