From patchwork Tue May 7 14:10:09 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Masami Hiramatsu (Google)" X-Patchwork-Id: 13657142 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A2C0815E7E4; Tue, 7 May 2024 14:10:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715091015; cv=none; b=BM2ik9sz4WQinIwbZB+dgLW8UWerJ4/ntldJe/aJTXUBCzIr++DtZb3mBMxsR7vAGoY+PrSUjjW/ec1Wy8TkeJhdNNj6hpXK91e6UEK+3F8CVmp6xWwuFKJl40DZpKc3Ak3DJI/rQBVPFM8wGFDgZWlk+e6we9rJICvDssJvxYo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715091015; c=relaxed/simple; bh=kn+FavdmZ0cQRYA93YtUn/IHxRXsn+QJq7iaDsZtevI=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=uuaNK0pTn5bmpTrjaP/ol8uqpepLqrNOMBdHDpf/87ySTbJXslIpJeihg26N4wPhLRrtiTAajgOWFJHcAU0Dam3uqL1W/N0OoxSpE68Z4RkoF1YMOAWkmKsc+viccKN1NQuo7FQRNtoHrHs/MATpjQAc8Zb1l+ea867KTZcA9JQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=izkDLFTV; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="izkDLFTV" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7661EC2BBFC; Tue, 7 May 2024 14:10:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1715091015; bh=kn+FavdmZ0cQRYA93YtUn/IHxRXsn+QJq7iaDsZtevI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=izkDLFTVrTogceKOu6nxOU512EY4I9RhZrFeUb8BI/UEC+eCIOBRDvm7uYbucpPQS zh+pP1ins2onTDMVbRLWMA/HhLWWkaA8OnRzwohv1M3zuwuNCdw156vnVhxrTl5uCK 2763c7LYchCoeV1Bww+EaB+6GooXyeeJNK/xRokztUGd1rQzkyLl9W3Ic1kpy8GYwX JB28r7fgOaUPg8mMp3UAQ7TSyR+LovO2gv5kkIZ6MIAYCl9hqtSx84NmpLje6GvcG6 MEdTKM8l0WIV/X6acfSh91Q3ZUPWzmfJQmO9F5Bf7g5oEHMDCju1jPkFxtriJ7Huyn S1RCmlTC8JdAg== 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 v10 11/36] ftrace: Allow ftrace startup flags exist without dynamic ftrace Date: Tue, 7 May 2024 23:10:09 +0900 Message-Id: <171509100890.162236.4362350342549122222.stgit@devnote2> X-Mailer: git-send-email 2.34.1 In-Reply-To: <171509088006.162236.7227326999861366050.stgit@devnote2> References: <171509088006.162236.7227326999861366050.stgit@devnote2> User-Agent: StGit/0.19 Precedence: bulk X-Mailing-List: linux-trace-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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 ff70ee437209..c4d81e0ec862 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 +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); @@ -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); -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()