Received: by 2002:a05:6a10:7420:0:0:0:0 with SMTP id hk32csp581907pxb; Tue, 15 Feb 2022 22:49:13 -0800 (PST) X-Google-Smtp-Source: ABdhPJxwpyPLPKClHiDoNEta0RIj7UfpnegbBPGyzlWHUie67opWic102KCz20yYMDmdhqeP+oHL X-Received: by 2002:a17:902:6942:b0:14c:b20e:2b1a with SMTP id k2-20020a170902694200b0014cb20e2b1amr1238686plt.112.1644994153571; Tue, 15 Feb 2022 22:49:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1644994153; cv=none; d=google.com; s=arc-20160816; b=mUOBJBMUS+U2JcWb/oXoo9JPlVsNtdgH8Nwt891R2L1+igwFQpxgnwgiATGgBdpfId DdpBGa2e7CiVzJ1lIOrKx6JdkJMIz1M+JrmrDD0PKMDZikuyyuJR4zjLJAEFcUWdhObr FxOfuIVNCu+P1EX//8CXRnkCuJXfpXPPHImgvpXBTNn3i3r3RLwvSYGTY/WPBUgep3gS cf86a3NSsGL1UbwzYlWQlGfNyF0nxGFn92KG0wp0ZrezAXjkckkeRibQk6zg1Lt094S6 VCt9fJQZSj/Iz8qbKRVjbj5DnUUpVpZoO9eBWyJG/ubsbeSvmLR4VDK9mBnYH3ROtzYc pkrA== 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; bh=muh1lfIg9hrHFDgt0QSK8KgY5RgXFhqp/cildTsRyus=; b=wf2yLJKODxYKDfGmFilTRE05G2kVYa8a9M4qRIwz3taRzYx9V7GYzutHYnNg+3jCGI 2JcQzLUtKekUja9y+hxSYa8nHOtqxqugP85MeEgD5AWIlDHrbMuWIBCRgrPDCRv9ZArc zIVP+PVz4sc396PJmqahlDWN1iMlTZeQsuDxIaYbyBw4VUsAhZBLfDwqvktBv8Yd/R2S OHQC9sbFcV2X1QmL/V3tbAnuXP2mq7xRM3KCBGuF6EyXyiftOL7+X/Fvy8ZRyXkHhOym VyX8gUb8kSdUxpWWpIepo0p+PXwsnypA+Hi3bXX5z60iIieCQZHd/OVm8rWu3FAn7jM8 jVXA== 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:18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net. [2620:137:e000::1:18]) by mx.google.com with ESMTPS id k10si36824012pff.167.2022.02.15.22.49.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Feb 2022 22:49:13 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) client-ip=2620:137:e000::1:18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 7D852210AC6; Tue, 15 Feb 2022 22:35:23 -0800 (PST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243079AbiBOScN (ORCPT + 99 others); Tue, 15 Feb 2022 13:32:13 -0500 Received: from mxb-00190b01.gslb.pphosted.com ([23.128.96.19]:49596 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241463AbiBOScL (ORCPT ); Tue, 15 Feb 2022 13:32:11 -0500 Received: from pegase2.c-s.fr (pegase2.c-s.fr [93.17.235.10]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DBFC81C904 for ; Tue, 15 Feb 2022 10:31:55 -0800 (PST) Received: from localhost (mailhub3.si.c-s.fr [172.26.127.67]) by localhost (Postfix) with ESMTP id 4JyqSB2KLhz9sSH; Tue, 15 Feb 2022 19:31:54 +0100 (CET) X-Virus-Scanned: amavisd-new at c-s.fr Received: from pegase2.c-s.fr ([172.26.127.65]) by localhost (pegase2.c-s.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id vEPz7MoYcChe; Tue, 15 Feb 2022 19:31:54 +0100 (CET) Received: from messagerie.si.c-s.fr (messagerie.si.c-s.fr [192.168.25.192]) by pegase2.c-s.fr (Postfix) with ESMTP id 4JyqSB1NMXz9sS8; Tue, 15 Feb 2022 19:31:54 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 13C8D8B77C; Tue, 15 Feb 2022 19:31:54 +0100 (CET) X-Virus-Scanned: amavisd-new at c-s.fr Received: from messagerie.si.c-s.fr ([127.0.0.1]) by localhost (messagerie.si.c-s.fr [127.0.0.1]) (amavisd-new, port 10023) with ESMTP id Hukjm0T6YJMZ; Tue, 15 Feb 2022 19:31:54 +0100 (CET) Received: from PO20335.IDSI0.si.c-s.fr (unknown [192.168.6.174]) by messagerie.si.c-s.fr (Postfix) with ESMTP id B91368B763; Tue, 15 Feb 2022 19:31:53 +0100 (CET) Received: from PO20335.IDSI0.si.c-s.fr (localhost [127.0.0.1]) by PO20335.IDSI0.si.c-s.fr (8.17.1/8.16.1) with ESMTPS id 21FIVibp146768 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Tue, 15 Feb 2022 19:31:44 +0100 Received: (from chleroy@localhost) by PO20335.IDSI0.si.c-s.fr (8.17.1/8.17.1/Submit) id 21FIVekA146765; Tue, 15 Feb 2022 19:31:40 +0100 X-Authentication-Warning: PO20335.IDSI0.si.c-s.fr: chleroy set sender to christophe.leroy@csgroup.eu using -f From: Christophe Leroy To: Steven Rostedt , Ingo Molnar , Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman Cc: Christophe Leroy , linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, "Naveen N . Rao" Subject: [PATCH v1 1/4] powerpc/ftrace: Also save r1 in ftrace_caller() Date: Tue, 15 Feb 2022 19:31:22 +0100 Message-Id: X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Developer-Signature: v=1; a=ed25519-sha256; t=1644949837; l=958; s=20211009; h=from:subject:message-id; bh=+OAg1QzN1NMzv44Zc4NhQPMtO25ighAEmulpyJpzi0c=; b=Kh1iOWwIhYp3Z2Get6F5yyQrTLYSQ2xMN5f0BMD83MYtCy5UVrelHZPaV059aJhmeYRcZKc+o7aT TiwQEc3WA20xbgX+qBkm2EHwfRONuIg6jjKhPnZiQLc1qUHZtG2P X-Developer-Key: i=christophe.leroy@csgroup.eu; a=ed25519; pk=HIzTzUj91asvincQGOFx6+ZF5AoUuP9GdOtQChs7Mm0= Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RDNS_NONE, SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=no 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 Also save r1 in ftrace_caller() r1 is needed during unwinding when the function_graph tracer is active. Reported-by: Naveen N. Rao Fixes: 830213786c49 ("powerpc/ftrace: directly call of function graph tracer by ftrace caller") Signed-off-by: Christophe Leroy --- arch/powerpc/kernel/trace/ftrace_mprofile.S | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/powerpc/kernel/trace/ftrace_mprofile.S b/arch/powerpc/kernel/trace/ftrace_mprofile.S index 56da60e98327..8443902d5a05 100644 --- a/arch/powerpc/kernel/trace/ftrace_mprofile.S +++ b/arch/powerpc/kernel/trace/ftrace_mprofile.S @@ -173,6 +173,10 @@ _GLOBAL(ftrace_caller) beq ftrace_no_trace #endif + /* Save previous stack pointer (r1) */ + addi r8, r1, SWITCH_FRAME_SIZE + PPC_STL r8, GPR1(r1) + /* Get the _mcount() call site out of LR */ mflr r7 PPC_STL r7, _NIP(r1) -- 2.34.1