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 Received: from bombadil.infradead.org (unknown [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 0B6B3C433EF for ; Sat, 9 Apr 2022 15:38:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:Cc :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=ya6WU00FpzYIeeFHFtH/jCcuAqIaNhrLZRUkv078eJA=; b=ibPLGqdXds2Plr DAmHI33DV5m4bvCbDRP9xNkwwd588zBxtuAdCpGSOnOBCbtFmFeQDqPClBk27GdmeiE39pqcuaFiD 8+bcvQoboKEeCQCCEYPYcHIgZ09ns3YXRaZrDlh+MAUd6TdilgIsMKsnE3MT8r08wxhnpzKsSFcvw hZfyYcs9A3DGLmF1GLcVvPn/fbHSn41X6aYtiPKR6YJD7fz74ezTr32PouE+reuSD4VPMa6Pj1NGM dlbKq7H8HDlRTxM0xTGecAEguyS+JAIy60UkTBtGDCm3UZVjcDZQircewQY7XkuUipcPD4bUKyA5w 3j2A7lHMs7HMGLgWOz/g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1ndD8S-003QAO-Ba; Sat, 09 Apr 2022 15:36:24 +0000 Received: from mail-pj1-x102b.google.com ([2607:f8b0:4864:20::102b]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1ndD8O-003Q8z-E1 for linux-arm-kernel@lists.infradead.org; Sat, 09 Apr 2022 15:36:22 +0000 Received: by mail-pj1-x102b.google.com with SMTP id nt14-20020a17090b248e00b001ca601046a4so14473891pjb.0 for ; Sat, 09 Apr 2022 08:36:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance-com.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=8MqG/9eNugQ5tJ/Rtq+PYRLEoeHJFnYsCD3SnMQn4kg=; b=eDw0XX8vEuIxsKGozNNZkOhGWPGtwsuAkFfLzUQ+yypbCh/xcMJygJI7OS56r3htJO qQLLMDEH6AMQzz3W8+BQ5uQrRXlBQiXB+Je8D2lOlWyWmcGYiG3wKApKfwg1/Bvuqs7t WswxkWDQhddfR2XZuRzKm249vKm0mRxrImRJJhK87V2IfrCYKhqZkNYH1JwhDawj4Ydl imBXDNCEglXTrDLtnosUSHCjnPB9xEe+O3gR/0We8a0bA5gzYn6/18W6Fx2a+RzskD6k ZSCjTTJ8mEN5okEbgx8Cno+N466acr7GAAsyBQu7iSmDs9tcZE94ijqsdriVqkx6gjmq Nc2A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=8MqG/9eNugQ5tJ/Rtq+PYRLEoeHJFnYsCD3SnMQn4kg=; b=N8GmeiwsRylS1dhQFS8jYlocVy+O6fe1zcrvVEChBbvOpt4S35epW4I4K45p0TWxDA sbsFQhoot1Mj0W2awcUcXkckfm3BwhadNfzC0xthdZN0VCYOOzg3+MO/7SUXErYdqp6H FIuCUHaxwrCh7IH5OoekW4pncA+Q0wQBc6YWmpRhejD/LA1wVHFZ4Ew2LqRBzHevvfnB VtOX00wBTlHgc05MISdA0tPPIewZtOkOtmRcelVtcUnEdt+KtMYAV+vB0pnXFD3YfKhZ /TMzAMN4ghfQmfkozz1Te6rlWpPe9ftOw/eZERw+aDFgLQz9y33W7bN42H/qB1lv8k6A eOpA== X-Gm-Message-State: AOAM531IDz3NULwzKL0t6EZixgdbA1jlikT++mRl9/xpjtvoEVapwtdn xkRSs6omGp3hO5KXqxnxYvan9w== X-Google-Smtp-Source: ABdhPJxJ6Bo6jodPi4S/LMUoloiu+LpPOAAl/jt9H56UlC5++ydCyKVu/ohLCA79/QKaaxG4oyUNBA== X-Received: by 2002:a17:90a:8a85:b0:1ca:9d13:9f61 with SMTP id x5-20020a17090a8a8500b001ca9d139f61mr27887356pjn.35.1649518578706; Sat, 09 Apr 2022 08:36:18 -0700 (PDT) Received: from localhost.localdomain ([2409:8a28:e6c:f010:e956:3be0:d6a3:f6ba]) by smtp.gmail.com with ESMTPSA id m1-20020a17090ade0100b001cb3feaddfcsm4810546pjv.2.2022.04.09.08.36.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 09 Apr 2022 08:36:18 -0700 (PDT) From: Chengming Zhou To: rostedt@goodmis.org, mingo@redhat.com, catalin.marinas@arm.com, will@kernel.org, tglx@linutronix.de, bp@alien8.de, dave.hansen@linux.intel.com, x86@kernel.org, hpa@zytor.com, broonie@kernel.org, mark.rutland@arm.com, ardb@kernel.org, zhouchengming@bytedance.com, linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org, duanxiongchun@bytedance.com, songmuchun@bytedance.com Subject: [PATCH v4 1/2] ftrace: cleanup ftrace_graph_caller enable and disable Date: Sat, 9 Apr 2022 23:35:53 +0800 Message-Id: <20220409153554.14470-1-zhouchengming@bytedance.com> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220409_083620_514657_10A45030 X-CRM114-Status: GOOD ( 12.65 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org The ftrace_[enable,disable]_ftrace_graph_caller() are used to do special hooks for graph tracer, which are not needed on some ARCHs that use graph_ops:func function to install return_hooker. So introduce the weak version in ftrace core code to cleanup in x86. Signed-off-by: Chengming Zhou --- v4: - put weak ftrace_enable,disable_ftrace_graph_caller() in fgraph.c instead of ftrace.c as suggested by Steve. v3: - consolidate two #if into a single #if, suggested by Steve. Thanks. --- arch/x86/kernel/ftrace.c | 17 ++--------------- kernel/trace/fgraph.c | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+), 15 deletions(-) diff --git a/arch/x86/kernel/ftrace.c b/arch/x86/kernel/ftrace.c index 1e31c7d21597..b09d73c2ba89 100644 --- a/arch/x86/kernel/ftrace.c +++ b/arch/x86/kernel/ftrace.c @@ -579,9 +579,7 @@ void arch_ftrace_trampoline_free(struct ftrace_ops *ops) #ifdef CONFIG_FUNCTION_GRAPH_TRACER -#ifdef CONFIG_DYNAMIC_FTRACE - -#ifndef CONFIG_HAVE_DYNAMIC_FTRACE_WITH_ARGS +#if defined(CONFIG_DYNAMIC_FTRACE) && !defined(CONFIG_HAVE_DYNAMIC_FTRACE_WITH_ARGS) extern void ftrace_graph_call(void); static const char *ftrace_jmp_replace(unsigned long ip, unsigned long addr) { @@ -610,18 +608,7 @@ int ftrace_disable_ftrace_graph_caller(void) return ftrace_mod_jmp(ip, &ftrace_stub); } -#else /* !CONFIG_HAVE_DYNAMIC_FTRACE_WITH_ARGS */ -int ftrace_enable_ftrace_graph_caller(void) -{ - return 0; -} - -int ftrace_disable_ftrace_graph_caller(void) -{ - return 0; -} -#endif /* CONFIG_HAVE_DYNAMIC_FTRACE_WITH_ARGS */ -#endif /* !CONFIG_DYNAMIC_FTRACE */ +#endif /* CONFIG_DYNAMIC_FTRACE && !CONFIG_HAVE_DYNAMIC_FTRACE_WITH_ARGS */ /* * Hook the return address and push it in the stack of return addrs diff --git a/kernel/trace/fgraph.c b/kernel/trace/fgraph.c index 8f4fb328133a..289311680c29 100644 --- a/kernel/trace/fgraph.c +++ b/kernel/trace/fgraph.c @@ -30,6 +30,24 @@ int ftrace_graph_active; /* Both enabled by default (can be cleared by function_graph tracer flags */ static bool fgraph_sleep_time = true; +/* + * archs can override this function if they must do something + * to enable hook for graph tracer. + */ +int __weak ftrace_enable_ftrace_graph_caller(void) +{ + return 0; +} + +/* + * archs can override this function if they must do something + * to disable hook for graph tracer. + */ +int __weak ftrace_disable_ftrace_graph_caller(void) +{ + return 0; +} + /** * ftrace_graph_stop - set to permanently disable function graph tracing * -- 2.35.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel