From mboxrd@z Thu Jan 1 00:00:00 1970 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 4461D13DDB8; Tue, 1 Oct 2024 21:15:47 +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=1727817347; cv=none; b=A2hUM7Na2Y1oiq1M3kQV1sXxrAzo7Bbg1SDCZ6POyrV2WnHS610au3yyUlQAVyA+O5NMFnz3WVpkTv2hI7aTm4qrkm47wjR551rolEmS2AkuqPv5cXvS9fyt/OBPds7pIfbgyRPnqyKzuJnBQ9Z0/Z592CbYP6X/cPdqhaD6pY0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727817347; c=relaxed/simple; bh=zIunEwmYTd0NyuAVHZUL9O6r94/rT93DprfNy0CkwOw=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=SzibX6Sq6BLepamFYT5QeGDC6qaQo4fr1psY/cyvK1qKB5wGj9M1xwYOIfbI/m5parSkzYm60rsLUnq7ETCAkO4diFp9OQXRLoEjiTp0KJFRdSyjNHTnxudy4SDUu0zloXiTl4JjSJzcDg3YT40U7EIP+sEg4kEO4eECtVWgniQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=K9SjY7ZI; 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="K9SjY7ZI" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E9AC6C4CEC6; Tue, 1 Oct 2024 21:15:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1727817346; bh=zIunEwmYTd0NyuAVHZUL9O6r94/rT93DprfNy0CkwOw=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=K9SjY7ZIRHXkM3WIzigkh1FJdIU+ucFgFb6ob+6P4Al2CTTuHDPW7VIby6UnDNIYq ZNxhGjkGnOf7xenkDc7W5MMX9OUm1TxoY3AiMCO0GtpKpk2gUZupIKpMTJJI45WFue OU7/Kkk2BaeOYE5si7gIUF9nDcTt8TH9UPcSVzepxzw1rcyk0AAMLHA16vQXRJySzC /1WpDOaTyJgxz3gsqWeokB315Q6EZ/XcRD7HU0WyaMp5r4SZ8rtS8T/aTUu50MJ0cF bqGO8B5unrHiw3+LBLxt0EkE47XZsFTK54mf/UtqZ0IZHkBQxrl3Y9hrY057U3Otlp XmHAzFWzbNFBQ== Date: Tue, 1 Oct 2024 14:15:43 -0700 From: Josh Poimboeuf To: Alice Ryhl Cc: Steven Rostedt , Masami Hiramatsu , Mathieu Desnoyers , Peter Zijlstra , Jason Baron , Ard Biesheuvel , Miguel Ojeda , Alex Gaynor , Wedson Almeida Filho , Boqun Feng , Gary Guo , =?utf-8?B?QmrDtnJu?= Roy Baron , Benno Lossin , Andreas Hindborg , linux-trace-kernel@vger.kernel.org, rust-for-linux@vger.kernel.org, linux-kernel@vger.kernel.org, Arnd Bergmann , linux-arch@vger.kernel.org, Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, "H. Peter Anvin" , Sean Christopherson , Uros Bizjak , Catalin Marinas , Will Deacon , Marc Zyngier , Oliver Upton , Mark Rutland , Ryan Roberts , Fuad Tabba , linux-arm-kernel@lists.infradead.org, Paul Walmsley , Palmer Dabbelt , Albert Ou , Anup Patel , Andrew Jones , Alexandre Ghiti , Conor Dooley , Samuel Holland , linux-riscv@lists.infradead.org, Huacai Chen , WANG Xuerui , Bibo Mao , Tiezhu Yang , Andrew Morton , Tianrui Zhao , loongarch@lists.linux.dev Subject: Re: [PATCH v9 1/5] rust: add generic static_key_false Message-ID: <20241001211543.qdjl4pyfhehxqfk7@treble> References: <20241001-tracepoint-v9-0-1ad3b7d78acb@google.com> <20241001-tracepoint-v9-1-1ad3b7d78acb@google.com> Precedence: bulk X-Mailing-List: linux-trace-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20241001-tracepoint-v9-1-1ad3b7d78acb@google.com> On Tue, Oct 01, 2024 at 01:29:58PM +0000, Alice Ryhl wrote: > Add just enough support for static key so that we can use it from > tracepoints. Tracepoints rely on `static_key_false` even though it is > deprecated, so we add the same functionality to Rust. Instead of extending the old deprecated static key interface into Rust, can we just change tracepoints to use the new one? /me makes a note to go convert the other users... From: Josh Poimboeuf Subject: [PATCH] tracepoints: Use new static branch API The old static key API based on 'struct static_key' is deprecated. Convert tracepoints to use the new API. Signed-off-by: Josh Poimboeuf --- include/linux/tracepoint-defs.h | 4 ++-- include/linux/tracepoint.h | 8 ++++---- kernel/tracepoint.c | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/include/linux/tracepoint-defs.h b/include/linux/tracepoint-defs.h index 4dc4955f0fbf..60a6e8314d4c 100644 --- a/include/linux/tracepoint-defs.h +++ b/include/linux/tracepoint-defs.h @@ -31,7 +31,7 @@ struct tracepoint_func { struct tracepoint { const char *name; /* Tracepoint name */ - struct static_key key; + struct static_key_false key; struct static_call_key *static_call_key; void *static_call_tramp; void *iterator; @@ -83,7 +83,7 @@ struct bpf_raw_event_map { #ifdef CONFIG_TRACEPOINTS # define tracepoint_enabled(tp) \ - static_key_false(&(__tracepoint_##tp).key) + static_branch_unlikely(&(__tracepoint_##tp).key) #else # define tracepoint_enabled(tracepoint) false #endif diff --git a/include/linux/tracepoint.h b/include/linux/tracepoint.h index 6be396bb4297..ab5162fc3e4a 100644 --- a/include/linux/tracepoint.h +++ b/include/linux/tracepoint.h @@ -228,7 +228,7 @@ static inline struct tracepoint *tracepoint_ptr_deref(tracepoint_ptr_t *p) #define __DECLARE_TRACE_RCU(name, proto, args, cond) \ static inline void trace_##name##_rcuidle(proto) \ { \ - if (static_key_false(&__tracepoint_##name.key)) \ + if (static_branch_unlikely(&__tracepoint_##name.key)) \ __DO_TRACE(name, \ TP_ARGS(args), \ TP_CONDITION(cond), 1); \ @@ -254,7 +254,7 @@ static inline struct tracepoint *tracepoint_ptr_deref(tracepoint_ptr_t *p) extern struct tracepoint __tracepoint_##name; \ static inline void trace_##name(proto) \ { \ - if (static_key_false(&__tracepoint_##name.key)) \ + if (static_branch_unlikely(&__tracepoint_##name.key)) \ __DO_TRACE(name, \ TP_ARGS(args), \ TP_CONDITION(cond), 0); \ @@ -291,7 +291,7 @@ static inline struct tracepoint *tracepoint_ptr_deref(tracepoint_ptr_t *p) static inline bool \ trace_##name##_enabled(void) \ { \ - return static_key_false(&__tracepoint_##name.key); \ + return static_branch_unlikely(&__tracepoint_##name.key);\ } /* @@ -308,7 +308,7 @@ static inline struct tracepoint *tracepoint_ptr_deref(tracepoint_ptr_t *p) struct tracepoint __tracepoint_##_name __used \ __section("__tracepoints") = { \ .name = __tpstrtab_##_name, \ - .key = STATIC_KEY_INIT_FALSE, \ + .key = STATIC_KEY_FALSE_INIT, \ .static_call_key = &STATIC_CALL_KEY(tp_func_##_name), \ .static_call_tramp = STATIC_CALL_TRAMP_ADDR(tp_func_##_name), \ .iterator = &__traceiter_##_name, \ diff --git a/kernel/tracepoint.c b/kernel/tracepoint.c index 8d1507dd0724..dc160cc0b616 100644 --- a/kernel/tracepoint.c +++ b/kernel/tracepoint.c @@ -358,7 +358,7 @@ static int tracepoint_add_func(struct tracepoint *tp, tracepoint_update_call(tp, tp_funcs); /* Both iterator and static call handle NULL tp->funcs */ rcu_assign_pointer(tp->funcs, tp_funcs); - static_key_enable(&tp->key); + static_branch_enable(&tp->key); break; case TP_FUNC_2: /* 1->2 */ /* Set iterator static call */ @@ -414,7 +414,7 @@ static int tracepoint_remove_func(struct tracepoint *tp, if (tp->unregfunc && static_key_enabled(&tp->key)) tp->unregfunc(); - static_key_disable(&tp->key); + static_branch_disable(&tp->key); /* Set iterator static call */ tracepoint_update_call(tp, tp_funcs); /* Both iterator and static call handle NULL tp->funcs */ -- 2.46.0