From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_SANE_2 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C1B94C432C0 for ; Mon, 18 Nov 2019 14:51:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 91C7F20722 for ; Mon, 18 Nov 2019 14:51:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727146AbfKROvH (ORCPT ); Mon, 18 Nov 2019 09:51:07 -0500 Received: from mail.kernel.org ([198.145.29.99]:58908 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726830AbfKROvH (ORCPT ); Mon, 18 Nov 2019 09:51:07 -0500 Received: from oasis.local.home (cpe-66-24-58-225.stny.res.rr.com [66.24.58.225]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 1607A2071B; Mon, 18 Nov 2019 14:51:06 +0000 (UTC) Date: Mon, 18 Nov 2019 09:51:04 -0500 From: Steven Rostedt To: Qian Cai Cc: Stephen Rothwell , Catalin Marinas , Will Deacon , Mark Rutland , Michael Ellerman , linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org Subject: Re: powerpc ftrace broken due to "manual merge of the ftrace tree with the arm64 tree" Message-ID: <20191118095104.0daebbc3@oasis.local.home> In-Reply-To: <1573851994.5937.138.camel@lca.pw> References: <1573849732.5937.136.camel@lca.pw> <20191115160230.78871d8f@gandalf.local.home> <1573851994.5937.138.camel@lca.pw> X-Mailer: Claws Mail 3.17.3 (GTK+ 2.24.32; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, 15 Nov 2019 16:06:34 -0500 Qian Cai wrote: > > Test this commit please: b83b43ffc6e4b514ca034a0fbdee01322e2f7022 > > # git reset --hard b83b43ffc6e4b514ca034a0fbdee01322e2f7022 > > Yes, that one is bad. Can you see if this patch fixes the issue for you? Thanks! -- Steve diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h index 0f358be551cd..fd8f4dc661dc 100644 --- a/include/asm-generic/vmlinux.lds.h +++ b/include/asm-generic/vmlinux.lds.h @@ -109,6 +109,13 @@ #define MEM_DISCARD(sec) *(.mem##sec) #endif +/* PowerPC defines ftrace_graph_stub in the code */ +#ifndef CONFIG_PPC +# define DEFINE_FTRACE_GRAPH_STUB ftrace_graph_stub = ftrace_stub; +#else +# define DEFINE_FTRACE_GRAPH_STUB +#endif + #ifdef CONFIG_FTRACE_MCOUNT_RECORD #ifdef CC_USING_PATCHABLE_FUNCTION_ENTRY /* @@ -120,17 +127,17 @@ __start_mcount_loc = .; \ KEEP(*(__patchable_function_entries)) \ __stop_mcount_loc = .; \ - ftrace_graph_stub = ftrace_stub; + DEFINE_FTRACE_GRAPH_STUB #else #define MCOUNT_REC() . = ALIGN(8); \ __start_mcount_loc = .; \ KEEP(*(__mcount_loc)) \ __stop_mcount_loc = .; \ - ftrace_graph_stub = ftrace_stub; + DEFINE_FTRACE_GRAPH_STUB #endif #else # ifdef CONFIG_FUNCTION_TRACER -# define MCOUNT_REC() ftrace_graph_stub = ftrace_stub; +# define MCOUNT_REC() DEFINE_FTRACE_GRAPH_STUB # else # define MCOUNT_REC() # endif