linux-kernel - Re: [PATCH] tracepoints: Use new static branch API

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <20241007142742.7d5850c5@gandalf.local.home>
Date: Mon, 7 Oct 2024 14:27:42 -0400
From: Steven Rostedt <rostedt@...dmis.org>
To: Josh Poimboeuf <jpoimboe@...nel.org>
Cc: Masami Hiramatsu <mhiramat@...nel.org>, Mathieu Desnoyers
 <mathieu.desnoyers@...icios.com>, linux-kernel@...r.kernel.org,
 linux-trace-kernel@...r.kernel.org, Alice Ryhl <aliceryhl@...gle.com>
Subject: Re: [PATCH] tracepoints: Use new static branch API

On Mon, 7 Oct 2024 11:25:21 -0700
Josh Poimboeuf <jpoimboe@...nel.org> wrote:

> On Tue, Oct 01, 2024 at 03:24:01PM -0700, Josh Poimboeuf wrote:
> > The old static key API based on 'struct static_key' is deprecated.
> > Convert tracepoints to use the new API.
> > 
> > Signed-off-by: Josh Poimboeuf <jpoimboe@...nel.org>  
> 
> Steven,
> 
> The kernel test robot found this patch breaks the build with
> CONFIG_HIST_TRIGGERS:
> 
>   https://lore.kernel.org/202410040333.vJSL1NXx-lkp@intel.com
> 
> Here's the fix, do you want to squash it in or should I post a v2?

Please post a v2. My workflow relies on patchwork, as it will automatically
update the status of the patch as it goes through git trees and my
"for-next/linus" postings.

If I modify the patch, then I need to do it manually.

-- Steve


> 
> diff --git a/kernel/trace/trace_events_hist.c b/kernel/trace/trace_events_hist.c
> index 5f9119eb7c67..cc2924ad32a3 100644
> --- a/kernel/trace/trace_events_hist.c
> +++ b/kernel/trace/trace_events_hist.c
> @@ -822,7 +822,7 @@ static inline void trace_synth(struct synth_event *event, u64 *var_ref_vals,
>  {
>  	struct tracepoint *tp = event->tp;
>  
> -	if (unlikely(atomic_read(&tp->key.enabled) > 0)) {
> +	if (unlikely(static_key_enabled(&tp->key))) {
>  		struct tracepoint_func *probe_func_ptr;
>  		synth_probe_func_t probe_func;
>  		void *__data;