| Message ID | 20230314190310.275222361@goodmis.org |
|---|---|
| State | New |
| Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org>
Delivered-To: ouuuleilei@gmail.com
Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp1940151wrd;
Tue, 14 Mar 2023 12:19:37 -0700 (PDT)
X-Google-Smtp-Source:
AK7set+VTZo98HCaFwDHB/TKXUhfikBBnoxIzgW90VoiP6oU0OWVy4doLnoWWTQUMa4OZj+dPyl9
X-Received: by 2002:a05:6a20:7d88:b0:cc:32a8:323d with SMTP id
v8-20020a056a207d8800b000cc32a8323dmr13854352pzj.28.1678821576922;
Tue, 14 Mar 2023 12:19:36 -0700 (PDT)
ARC-Seal: i=1; a=rsa-sha256; t=1678821576; cv=none;
d=google.com; s=arc-20160816;
b=RZmjRDrQsDvDOKULIRWYiqdyoGMwh9XTx1urwlWrv9UKmYgkn26YL0NLB+CbdbgIfz
4w2zeTovF8py+W1fXxguZFgkNs+WDYGWbY2HHlsT4YYPjgNSJdfOE+1DAVQGlM2DsK4v
TGieszhKRrReoWjhuAOeepvNtxgQwPDuq3RVKyCG0cqEM3/q0BaQY1QEWSf9lvYGcDLa
BKJLcgG83v5+YHCmILh5YnA1HZ6uca/QzqFFV+pNZKXkEcuWtOargn3SPgo+15Gc/5Eq
TBAi66xhFV2p0hG/j3VrtNQmZB0SF0H7wsEl90OS8AmuIzGM7bbvFsd+5cyi+Sc7Fmy7
BPkA==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com;
s=arc-20160816;
h=list-id:precedence:mime-version:references:subject:cc:to:from:date
:user-agent:message-id;
bh=s8dl8cDaOIoIiR4JXF2tHEsnk2to/X51MQCUBfV7zXM=;
b=v168wvttJMvMGQz8pwSpqZZp47G2VrAVHIGrs6VaSe6SENjd4nR8kU5SfygEDHUM5/
z5AlYTy4XCrNJvuxaMCh3AMWzqtBTLsIqpCaokLr/LzWEvoZRzY0ojzYF5T7eBPO+wjL
goGt+l937IW/nrEpg8ZloG/3OYJXw73g+asUd7ZFJDYjVAMFUUrAsR+egz4x1j7+6bHd
m9hf0s/1N8wEcBf+S0Q2dDKIKONKvVlv1UGm6agQgIJYn45qJGl2r3kuT5mkZPas1qfe
RbZ9xrxpExD+L9TJuAFA0AENxszuKsmSDQwxhP+zwCZmTFwpCw4pJYRqO6vH68g2In1d
sAvA==
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
a14-20020a634d0e000000b004fc2413ec5esi2678905pgb.189.2023.03.14.12.19.21;
Tue, 14 Mar 2023 12:19:36 -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 S231360AbjCNTIT (ORCPT <rfc822;realc9580@gmail.com> + 99 others);
Tue, 14 Mar 2023 15:08:19 -0400
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35330 "EHLO
lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
with ESMTP id S231343AbjCNTIR (ORCPT
<rfc822;linux-kernel@vger.kernel.org>);
Tue, 14 Mar 2023 15:08:17 -0400
Received: from ams.source.kernel.org (ams.source.kernel.org
[IPv6:2604:1380:4601:e00::1])
by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 236B64FA94
for <linux-kernel@vger.kernel.org>;
Tue, 14 Mar 2023 12:08:14 -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 ams.source.kernel.org (Postfix) with ESMTPS id 91B8EB81B60
for <linux-kernel@vger.kernel.org>;
Tue, 14 Mar 2023 19:03:12 +0000 (UTC)
Received: by smtp.kernel.org (Postfix) with ESMTPSA id 62B19C433A1;
Tue, 14 Mar 2023 19:03:11 +0000 (UTC)
Received: from rostedt by gandalf.local.home with local (Exim 4.96)
(envelope-from <rostedt@goodmis.org>)
id 1pc9vS-009tzD-1V;
Tue, 14 Mar 2023 15:03:10 -0400
Message-ID: <20230314190310.275222361@goodmis.org>
User-Agent: quilt/0.66
Date: Tue, 14 Mar 2023 15:02:40 -0400
From: Steven Rostedt <rostedt@goodmis.org>
To: linux-kernel@vger.kernel.org
Cc: Masami Hiramatsu <mhiramat@kernel.org>,
Andrew Morton <akpm@linux-foundation.org>,
Peter Zijlstra <peterz@infradead.org>,
Mark Rutland <mark.rutland@arm.com>,
Thomas Gleixner <tglx@linutronix.de>,
Ingo Molnar <mingo@redhat.com>, Borislav Petkov <bp@alien8.de>,
Dave Hansen <dave.hansen@linux.intel.com>,
"H. Peter Anvin" <hpa@zytor.com>,
Josh Poimboeuf <jpoimboe@kernel.org>,
Arnd Bergmann <arnd@arndb.de>
Subject: [for-linus][PATCH 4/5] ftrace,kcfi: Define ftrace_stub_graph
conditionally
References: <20230314190236.203370742@goodmis.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Spam-Status: No, score=-4.0 required=5.0 tests=BAYES_00,
HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_MED,SPF_HELO_NONE,SPF_PASS
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: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?=
X-GMAIL-THRID: =?utf-8?q?1760372013840464893?=
X-GMAIL-MSGID: =?utf-8?q?1760372013840464893?=
|
| Series |
tracing: Fixes for v6.3
|
|
Commit Message
Steven Rostedt
March 14, 2023, 7:02 p.m. UTC
From: Arnd Bergmann <arnd@arndb.de> When CONFIG_FUNCTION_GRAPH_TRACER is disabled, __kcfi_typeid_ftrace_stub_graph is missing, causing a link failure: ld.lld: error: undefined symbol: __kcfi_typeid_ftrace_stub_graph referenced by arch/x86/kernel/ftrace_64.o:(__cfi_ftrace_stub_graph) in archive vmlinux.a Mark the reference to it as conditional on the same symbol, as is done on arm64. Link: https://lore.kernel.org/linux-trace-kernel/20230131093643.3850272-1-arnd@kernel.org Cc: Peter Zijlstra <peterz@infradead.org> Cc: Masami Hiramatsu <mhiramat@kernel.org> Cc: Mark Rutland <mark.rutland@arm.com> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Ingo Molnar <mingo@redhat.com> Cc: Borislav Petkov <bp@alien8.de> Cc: Dave Hansen <dave.hansen@linux.intel.com> Cc: "H. Peter Anvin" <hpa@zytor.com> Cc: Josh Poimboeuf <jpoimboe@kernel.org> Fixes: 883bbbffa5a4 ("ftrace,kcfi: Separate ftrace_stub() and ftrace_stub_graph()") See-also: 2598ac6ec493 ("arm64: ftrace: Define ftrace_stub_graph only with FUNCTION_GRAPH_TRACER") Signed-off-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org> --- arch/x86/kernel/ftrace_64.S | 2 ++ 1 file changed, 2 insertions(+)
diff --git a/arch/x86/kernel/ftrace_64.S b/arch/x86/kernel/ftrace_64.S index 1265ad519249..fb4f1e01b64a 100644 --- a/arch/x86/kernel/ftrace_64.S +++ b/arch/x86/kernel/ftrace_64.S @@ -136,10 +136,12 @@ SYM_TYPED_FUNC_START(ftrace_stub) RET SYM_FUNC_END(ftrace_stub) +#ifdef CONFIG_FUNCTION_GRAPH_TRACER SYM_TYPED_FUNC_START(ftrace_stub_graph) CALL_DEPTH_ACCOUNT RET SYM_FUNC_END(ftrace_stub_graph) +#endif #ifdef CONFIG_DYNAMIC_FTRACE