From patchwork Wed Nov 8 14:26:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Masami Hiramatsu (Google)" X-Patchwork-Id: 163041 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:aa0b:0:b0:403:3b70:6f57 with SMTP id k11csp949072vqo; Wed, 8 Nov 2023 06:27:06 -0800 (PST) X-Google-Smtp-Source: AGHT+IEzlgBL29e7nAdQURcouONghalHPEt/AEh/zgBtuyfMTM2OWogbIsTjomtk6oIQcpP0hYUO X-Received: by 2002:a05:6a21:30c1:b0:137:23f1:4281 with SMTP id yf1-20020a056a2130c100b0013723f14281mr1422474pzb.12.1699453625959; Wed, 08 Nov 2023 06:27:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699453625; cv=none; d=google.com; s=arc-20160816; b=MDI5K/N9k8U4lMSyS5Fx32uM2pPVvvOxFZKjgFQscYuNAiICcn64HcMIDH0VZxQuPc 8qM/q4KnAGm0TEnRsK9jGVSnxsi705u+Wc0QU/cnREl2/FPAkBXL/3HyeUdnmO088+63 R5BdL8oYBN7/1dGNtiRxmDQ4XJtJQxOzYC98EVNjNqp/OENo9WK7OobdoHXkaRJixVlc EbGQiQ0BnzfTVa3WlpaLcCigj5H9+4itM/FhSnhK1ih7hyI8rQTDj5E9EIa02fjz/L2C LnHgTqzTDj8PrDLfdEmisMhmYbIT43YzI+iAiB2V+jz85VhK1KBKbz9pfRVTM5+3zNf9 2a/A== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=iB1N5sy0fz4d/ePtM/+Lr4HGwm6yJW88jJ4K7A9cS5E=; fh=SIgps5XdV0XNwjZfT2uAI7g3mrspDldK9Qs8qQAfoa4=; b=KOyV+2QcCETWdnAi4K8L8yi6b6SXNMt1Q1d+/s66PwimhyFfklsOn/ZJ9c1Ztxp5+0 By7ON+3VPWBDLbZ90GtfpjRp+hjwTGwGEJ4qUkhOOjsra47oqAuCSp3UJZOyIpOScWt3 V1RX3p4yIUV88+h6y9C80uh0aMIWWm0wFhGQFIKqPWf/AzKgIcOTQlg+B1IGmfV4rqy5 JAsIwFsnRrVA/B29rzrd1qpFGkUp1eQVfcWl9SRiTUIM/x30My5vB1RxnBfujPeOaDam 9Pd5MNTuc9rELrsXx6UK56vWByu1xSWYUZo5IroJEaa5mixsNiYvo3zxCg+bCPueOhGt rUJQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=EjOww+q2; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from fry.vger.email (fry.vger.email. [23.128.96.38]) by mx.google.com with ESMTPS id y16-20020a056a00181000b0068a54522bb0si13641777pfa.144.2023.11.08.06.27.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Nov 2023 06:27:05 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) client-ip=23.128.96.38; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=EjOww+q2; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by fry.vger.email (Postfix) with ESMTP id 47F8382909BA; Wed, 8 Nov 2023 06:27:00 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at fry.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229478AbjKHO0s (ORCPT + 32 others); Wed, 8 Nov 2023 09:26:48 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45918 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234536AbjKHO0i (ORCPT ); Wed, 8 Nov 2023 09:26:38 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 780E91FE3 for ; Wed, 8 Nov 2023 06:26:36 -0800 (PST) Received: by smtp.kernel.org (Postfix) with ESMTPSA id DC408C433C7; Wed, 8 Nov 2023 14:26:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1699453596; bh=kYKqzLjHb+tdl32thOrnxRAjLrF2/pPf6UROFm/9erg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=EjOww+q2e4icdTh7kOnha5aJCQ+xmC3qpqj6NZLwtBh/N2dKJnXoj3m27YUzqjsat 0h63cLvuQzaokadgMJJEDZyj7W/QT2WH9vUA4Lf1kmCkROHCR72QC8bEnxQu66UOzq dX90q6lZxHAppOqGgjB8zaTT6Jcfc7SrOXAMMxW7e5O0FiRxEsqGV60fGwh9MmGaxm eRk+wCI00dxm7HjI1iWoQBBzkMD7K02x1dUzm52tWL8uU4gyciQDoSNlS5DS2LwgcK SE3IwjIMkWAJpyA4HFXe6BloMWhk0htdlu9K9vbZlkH0j2whS1OWR1aUK7x/7xWUne QPcwEarMWIpeA== 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: [RFC PATCH v2 11/31] ftrace: Allow ftrace startup flags exist without dynamic ftrace Date: Wed, 8 Nov 2023 23:26:30 +0900 Message-Id: <169945359010.55307.16221453484650800734.stgit@devnote2> X-Mailer: git-send-email 2.34.1 In-Reply-To: <169945345785.55307.5003201137843449313.stgit@devnote2> References: <169945345785.55307.5003201137843449313.stgit@devnote2> User-Agent: StGit/0.19 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (fry.vger.email [0.0.0.0]); Wed, 08 Nov 2023 06:27:00 -0800 (PST) X-Spam-Status: No, score=-1.2 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on fry.vger.email X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1782006285550336841 X-GMAIL-MSGID: 1782006285550336841 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 80ec01e765bd..84e06ad1b121 100644 --- a/include/linux/ftrace.h +++ b/include/linux/ftrace.h @@ -537,6 +537,15 @@ static inline void stack_tracer_disable(void) { } static inline void stack_tracer_enable(void) { } #endif +enum { + FTRACE_UPDATE_CALLS = (1 << 0), + FTRACE_DISABLE_CALLS = (1 << 1), + FTRACE_UPDATE_TRACE_FUNC = (1 << 2), + FTRACE_START_FUNC_RET = (1 << 3), + FTRACE_STOP_FUNC_RET = (1 << 4), + FTRACE_MAY_SLEEP = (1 << 5), +}; + #ifdef CONFIG_DYNAMIC_FTRACE void ftrace_arch_code_modify_prepare(void); @@ -631,15 +640,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); -enum { - FTRACE_UPDATE_CALLS = (1 << 0), - FTRACE_DISABLE_CALLS = (1 << 1), - FTRACE_UPDATE_TRACE_FUNC = (1 << 2), - FTRACE_START_FUNC_RET = (1 << 3), - FTRACE_STOP_FUNC_RET = (1 << 4), - FTRACE_MAY_SLEEP = (1 << 5), -}; - /* * The FTRACE_UPDATE_* enum is used to pass information back * from the ftrace_update_record() and ftrace_test_record()