From patchwork Sun Nov 5 16:08:19 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: 161666 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:8f47:0:b0:403:3b70:6f57 with SMTP id j7csp2196840vqu; Sun, 5 Nov 2023 08:08:58 -0800 (PST) X-Google-Smtp-Source: AGHT+IHjhjQc9+inY6bWyCItb5b0wspyRD8eJQMXIQekDozuVzNMLDBOe2P/ctXGZ8wNTzTwPTNb X-Received: by 2002:a05:6808:2209:b0:3ab:74a2:ab2b with SMTP id bd9-20020a056808220900b003ab74a2ab2bmr38078894oib.48.1699200537865; Sun, 05 Nov 2023 08:08:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699200537; cv=none; d=google.com; s=arc-20160816; b=DOxjiAr0j/XmW3VauQj6FPJ3kcbcQdE2ZYfswL+xKj7cEFex5ong3McYD3Np8iWyGw OYbz8QT6pWIeDhpPJWdj1Ye9WpsoXxWG95MiGmtOd/KS6Cz0RwGfEro0LdPTKSpWA4uH fEoiCcC5f4NUc+7PCa/dxvpxuOQXTFksITbj7hDCOanu9kMI4D9jxyq/i2Ioq+syocjV /h5sugbQ3K0VEvN4LXbY1U6FizixDvBdQjzLT6WrN6RePD3I92sTh8SE3OaEw5uxpo/m 0Hah8ATV/oSVvbCNoYKSK/qn1z6DY4oS9xKJZO+A9pOme7vULL3euM8YbQG6MpmDkKW3 i3eA== 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=CZc980L7JOlO7hBu2hN9poZ4xtzkwYDGHgaeD/20/YM=; fh=SIgps5XdV0XNwjZfT2uAI7g3mrspDldK9Qs8qQAfoa4=; b=ez3oJF+eEUWdNLGBksBNTaapyNq5t0OhsMFK8fQ3Q+XB5qzaOCkT1f8zkg97DOR7dM L07GoK2Q5+VvdXV+2UagFVxw9OSeS8eEk1gcjmV9nQlFY58bW6pPahIpXFEjSZWk/pQM 5fTjHOjYoWJEDl83NndvClXnyNsJVX60JpujW47/St805t4CPaT7Vy+HU5SCE24WSEKb asDUpX64MJKRzl+eV2SIl/Ro2SAXC0kcScJE+ueDuhYzQPkys+i6B9mw8AoUXmO5Ndhd kofGB9TSTnQXrdN+pup0UJqjB7YKxR/FD6TCNEjtDSQ4i6xL4ktvPD0iDgt4pY7EjanK 4+MA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=HoomEPBw; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 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 agentk.vger.email (agentk.vger.email. [2620:137:e000::3:2]) by mx.google.com with ESMTPS id y26-20020aa7855a000000b00690258a9766si5778793pfn.373.2023.11.05.08.08.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Nov 2023 08:08:57 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) client-ip=2620:137:e000::3:2; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=HoomEPBw; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 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 agentk.vger.email (Postfix) with ESMTP id 741EF8057D8D; Sun, 5 Nov 2023 08:08:55 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229690AbjKEQId (ORCPT + 34 others); Sun, 5 Nov 2023 11:08:33 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46108 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229845AbjKEQIa (ORCPT ); Sun, 5 Nov 2023 11:08:30 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 024C1D6D for ; Sun, 5 Nov 2023 08:08:26 -0800 (PST) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 80DF3C433C7; Sun, 5 Nov 2023 16:08:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1699200506; bh=aOBVpVmxMVywZjrn0W2fI6F8TmfS5e1bc3XWd3NWy64=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HoomEPBwPk2zxl/3w8o/aqAv3SiBAK51fqRLol7AWsu31v28TcgFujagwswHGOtpZ 740Sm101TNG7Z0f+3hYU6FzUXb2lHTCMhTFxRZgPzl7Zt5cJ227n96DnAI3gJ1wTXg JLsLm1pTVpOVeswIEIVXa36y2fn1R0amZt+he7N1iNQ3unlDlBpmqzEzGVXL+1W8EN r9rg2fQz7j2yQF+zQVccfPNNKIDI3sUgHanLcW28jnu3ZSnX9DYUO5pda2IJPv9Iul NlIZddwbSMlp2z7z+Wojc0hcUAd5KPLkuCQqxTPFTkrizl69s4ytNsejtVXOk4aPlx WyryZYEsZIzgA== 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 09/32] ftrace: Allow ftrace startup flags exist without dynamic ftrace Date: Mon, 6 Nov 2023 01:08:19 +0900 Message-Id: <169920049937.482486.15191811301005089130.stgit@devnote2> X-Mailer: git-send-email 2.34.1 In-Reply-To: <169920038849.482486.15796387219966662967.stgit@devnote2> References: <169920038849.482486.15796387219966662967.stgit@devnote2> User-Agent: StGit/0.19 MIME-Version: 1.0 X-Spam-Status: No, score=-1.8 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 agentk.vger.email 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 (agentk.vger.email [0.0.0.0]); Sun, 05 Nov 2023 08:08:55 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1781740903135603696 X-GMAIL-MSGID: 1781740903135603696 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 4ad587b3525e..7fd044ae3da5 100644 --- a/include/linux/ftrace.h +++ b/include/linux/ftrace.h @@ -512,6 +512,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); @@ -606,15 +615,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()