From nobody Wed Dec 17 14:12:00 2025 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 94674C4167B for ; Mon, 27 Nov 2023 13:56:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233546AbjK0N4p (ORCPT ); Mon, 27 Nov 2023 08:56:45 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46060 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233369AbjK0N4Z (ORCPT ); Mon, 27 Nov 2023 08:56:25 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BA09D1BB for ; Mon, 27 Nov 2023 05:55:16 -0800 (PST) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7D2E7C433C7; Mon, 27 Nov 2023 13:55:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1701093316; bh=6ERBwQiaxIIDNTVWPQkxDhl1p/zo1tlsKma+ZLC6cPI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=InfdeYoK/y2VllHqqyuUR/zrdyimXufJGapAUBhCgPsMsg+n2oWKxEP69Q0bFwZfg es9Po9cmiJra9aMWLxdJuaV9GEdtUAQFzv+BUqNkRr/35hUX//I6etAnPdUB7DN98f 85XsG6sFG0Y3zxabNvXz4Sni/cECM3KJNgULHeeE3fHxGcrX8z57C7IPle5aSjMw9P 6+mAsEc138Qq7PP4+nfKNIoxgL201mwpru0JMw/KIx6I3d/V0N56O7Bug6mnGuK6/Z jD0ihsZ/71U9oFMqWGto01EiqeTidq/EwOGY9kZ3vlbNoc+Hv5BQl7/QghOGyGH0PI joYwrKeqYlybg== From: "Masami Hiramatsu (Google)" To: Alexei Starovoitov , Steven Rostedt , Florent Revest Cc: linux-trace-kernel@vger.kernel.org, LKML , Martin KaFai Lau , bpf , Sven Schnelle , Alexei Starovoitov , Jiri Olsa , Arnaldo Carvalho de Melo , Daniel Borkmann , Alan Maguire , Mark Rutland , Peter Zijlstra , Thomas Gleixner , Guo Ren Subject: [PATCH v3 11/33] ftrace: Allow ftrace startup flags exist without dynamic ftrace Date: Mon, 27 Nov 2023 22:55:09 +0900 Message-Id: <170109330957.343914.4603643031632118062.stgit@devnote2> X-Mailer: git-send-email 2.34.1 In-Reply-To: <170109317214.343914.4784420430328654397.stgit@devnote2> References: <170109317214.343914.4784420430328654397.stgit@devnote2> User-Agent: StGit/0.19 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Steven Rostedt (VMware) Some of the flags for ftrace_startup() may be exposed even when CONFIG_DYNAMIC_FTRACE is not configured in. This is fine as the difference between dynamic ftrace and static ftrace is done within the internals of ftrace itself. No need to have use cases fail to compile because dynamic ftrace is disabled. This change is needed to move some of the logic of what is passed to ftrace_startup() out of the parameters of ftrace_startup(). Signed-off-by: Steven Rostedt (VMware) Signed-off-by: Masami Hiramatsu (Google) --- include/linux/ftrace.h | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/include/linux/ftrace.h b/include/linux/ftrace.h index 0955baccbb87..7b08169aa51d 100644 --- a/include/linux/ftrace.h +++ b/include/linux/ftrace.h @@ -538,6 +538,15 @@ static inline void stack_tracer_disable(void) { } static inline void stack_tracer_enable(void) { } #endif =20 +enum { + FTRACE_UPDATE_CALLS =3D (1 << 0), + FTRACE_DISABLE_CALLS =3D (1 << 1), + FTRACE_UPDATE_TRACE_FUNC =3D (1 << 2), + FTRACE_START_FUNC_RET =3D (1 << 3), + FTRACE_STOP_FUNC_RET =3D (1 << 4), + FTRACE_MAY_SLEEP =3D (1 << 5), +}; + #ifdef CONFIG_DYNAMIC_FTRACE =20 void ftrace_arch_code_modify_prepare(void); @@ -632,15 +641,6 @@ void ftrace_set_global_notrace(unsigned char *buf, int= len, int reset); void ftrace_free_filter(struct ftrace_ops *ops); void ftrace_ops_set_global_filter(struct ftrace_ops *ops); =20 -enum { - FTRACE_UPDATE_CALLS =3D (1 << 0), - FTRACE_DISABLE_CALLS =3D (1 << 1), - FTRACE_UPDATE_TRACE_FUNC =3D (1 << 2), - FTRACE_START_FUNC_RET =3D (1 << 3), - FTRACE_STOP_FUNC_RET =3D (1 << 4), - FTRACE_MAY_SLEEP =3D (1 << 5), -}; - /* * The FTRACE_UPDATE_* enum is used to pass information back * from the ftrace_update_record() and ftrace_test_record()