From patchwork Wed Apr 20 16:00:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chengming Zhou X-Patchwork-Id: 12820540 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 (bombadil.infradead.org [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 93B6AC433F5 for ; Wed, 20 Apr 2022 16:01:58 +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=+NXkQIBt+GwdcXSA85PU07qJlyk1YZWDlE4bYVhdZg8=; b=aH41CQXe2b3OQT JX8wS5p2BF5HVf3+yEcNRuftUvKsLvGJwVTn1CXuf7y0t5dM7WSLDEJUKdOxAJCONu8Zc8TIOFcAs /orT8xmlNEgWnyPmwp8je2266gE7fFl4v7MINPx/h7Wd5DCUIhhfxf6i846FHANt1+URgy3DK5x/x Nz+uylpVg99Ey05QoTHKe7j6a1GqQoYG35BJyNjZY0C1mur1cigMCxJAuN3AyptOivMN6VgxQbY3H 0iMdKacQUceC+/DyZJERFLeilD49IY64iaAUrw+rpNz9XNH4aeqt5C8ps7W1piWeMIWt6uLcyhVrJ R1THl8tbb6v1VKAVfcvQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nhCkv-009cjL-SB; Wed, 20 Apr 2022 16:00:37 +0000 Received: from mail-pl1-x631.google.com ([2607:f8b0:4864:20::631]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nhCks-009ciC-H0 for linux-arm-kernel@lists.infradead.org; Wed, 20 Apr 2022 16:00:36 +0000 Received: by mail-pl1-x631.google.com with SMTP id c23so2211880plo.0 for ; Wed, 20 Apr 2022 09:00:31 -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=T2e4gNzW9WvbaYYhRQN8RA/sJzl40ME+FaDXHpo4ThY=; b=TRx6k6nQBr/yZAp6R3CZ9o6VwyHajsNXSIktFiSElT+CKFQKR8a4aqIWqZKKeq4E/L PLh6brBiSPL4DXEUy4POTH9XEhqGqEtHSrVeKMH9m7rwg0b1KQ1wlhfi4k3OfTBJXCdm Ky9s3OR+3DHDNM3GnnciwZw4XF3kqZFWShliy/tmiSZ2aYisFxlTqGbV+HQnv5xu9Qun AxEOHCqSQWKBH21vAqWA2Z9kbzeyQZQje9iLUaCjfVTUHQiE05eBGm3apJ7FEwxj5UaX wO4Ec6HFu+QdTlrHA9nYTfXlfNyC7JPK2JrSmTDfMasSLrLfpbaSKzbITrMMrGlP9TRA p2gg== 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=T2e4gNzW9WvbaYYhRQN8RA/sJzl40ME+FaDXHpo4ThY=; b=MFjo2Lfejx7cvMVjMJvqVKPbVl+Wwc0UzkeIBnJDdH6zcZKXZbQAPSC95YBqvbzwG+ Ahij+OKmZjfHUmc063gL83Ox5H6efK7U+6K7ScmJUiYslqh7+V9WTfos9I8tyHG5g6YX rs34Yl0IzAgQCwV3X/ES7C8AtpthMPeuSyH++ur/VgzscrG2D3ICh7KoEVYtKlC7Tu/D NzSZY6NdyBGQ+U1lBSsnh6UPZ2W9oDO0xWuI0xQa3i7cStEJuC1GpmVhDcIZ1dQH45nX vHOM/vsd7P+L8mQVAYBonPnI5eRRXhozHbTiok5S4k1ocNtQAsPHSEbGBnwlFhq/3A/T PKNw== X-Gm-Message-State: AOAM53392c23/YAib8cZwai+7EO5MLiYBvIC1/3Kj2bOO2dga0ddgioF y56bBeShWa0Ha/07JQQcCXbqhg== X-Google-Smtp-Source: ABdhPJwtFoPpijOIMdaju6Yi0fGgtpz+tkg/dgMTSfHbX0Bgl4+8n48gKLhDpJGbHjbufO+Jd/r+Iw== X-Received: by 2002:a17:902:f143:b0:158:f8f3:73ca with SMTP id d3-20020a170902f14300b00158f8f373camr16108854plb.123.1650470431338; Wed, 20 Apr 2022 09:00:31 -0700 (PDT) Received: from localhost.localdomain ([2409:8a28:e66:6380:7568:1633:647:d3a2]) by smtp.gmail.com with ESMTPSA id h18-20020a63c012000000b0039cc3c323f7sm20198676pgg.33.2022.04.20.09.00.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Apr 2022 09:00:30 -0700 (PDT) From: Chengming Zhou To: rostedt@goodmis.org, mark.rutland@arm.com, mingo@redhat.com, catalin.marinas@arm.com, will@kernel.org, tglx@linutronix.de, dave.hansen@linux.intel.com, broonie@kernel.org, ardb@kernel.org Cc: x86@kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, duanxiongchun@bytedance.com, songmuchun@bytedance.com, zhengqi.arch@bytedance.com, Chengming Zhou Subject: [PATCH v5 1/2] ftrace: cleanup ftrace_graph_caller enable and disable Date: Thu, 21 Apr 2022 00:00:05 +0800 Message-Id: <20220420160006.17880-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-20220420_090034_604047_506963DD X-CRM114-Status: GOOD ( 13.10 ) 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: , 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 Acked-by: Mark Rutland Acked-by: Steven Rostedt (Google) --- 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 *