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 E58E22C21EB; Wed, 3 Dec 2025 08:24:44 +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=1764750285; cv=none; b=G5azKbkqP+EKgFgO6vu6D+igMwM8xD7ZJ3bYM5xRuAHmYyGlI2flN6S5csVX5uNVsuT5ze4QpFYQxgDWSD2IiRegoUNvouwDqgQhsWUsKWcJEc0Z1VVQRiimnWpOIUpQBnO/32pIAj5ayUUf73WQ0SIv3nzouU9wkLmDQzhPPqM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764750285; c=relaxed/simple; bh=qzSU7P/h2A+9c5oHsCS4glXg/cUYxo9v5c2ips0x2Yc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=fCVyJa14xlyMPwwhGo15zAnIPKfCziaK2N2SA6uUJH2Eeezx9aJP1tl++sHPQ7p1fEFwmnyV8ZCSfj7TJ0mY729r4XRsV/pFqteF6xv+768Gmm8/i2SBtciOVnM/Toab2uHZyf0R4ddav8vCuypmVrDAN6l6oUmPwkf9pwUh18k= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=fNfZuhJN; 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="fNfZuhJN" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6C68AC4CEFB; Wed, 3 Dec 2025 08:24:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1764750284; bh=qzSU7P/h2A+9c5oHsCS4glXg/cUYxo9v5c2ips0x2Yc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fNfZuhJNaBFBy/E3xge+z6kXPUGnKw3UNQehHnhpG7M2QMShfTlHyhCglDx+cpcrW RtkPiJokeMDrYSE2l4hodZYu7mh/XWpsBw61HoiujSO+hnYBgEeArklgDE6jcT9yBY a0GyoijzavtfZVwIMRyOdsxzkC6zRY3e25bZKgSgjkBMOp/8Y+TmrASnPCGBatfYg4 M17Q7wAEg/0UF/iqbqG8dKaSDWRCNMXZj6gsva6Dj7ILyEsuuUOZdS27O82jpU4Zt1 caJ6S3fWK3JeqUvfs+SFHOdr8UYC9+h+1S1YGJMWO4E9UuAcdEnOtTJO6vSQJdYGW6 TFFnPfA0KDa3w== From: Jiri Olsa To: Steven Rostedt , Florent Revest , Mark Rutland Cc: bpf@vger.kernel.org, linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko , Menglong Dong , Song Liu Subject: [PATCHv4 bpf-next 3/9] ftrace: Export some of hash related functions Date: Wed, 3 Dec 2025 09:23:56 +0100 Message-ID: <20251203082402.78816-4-jolsa@kernel.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20251203082402.78816-1-jolsa@kernel.org> References: <20251203082402.78816-1-jolsa@kernel.org> Precedence: bulk X-Mailing-List: linux-trace-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit We are going to use these functions in following changes. Signed-off-by: Jiri Olsa --- include/linux/ftrace.h | 16 ++++++++++++++++ kernel/trace/ftrace.c | 7 +++---- kernel/trace/trace.h | 8 -------- 3 files changed, 19 insertions(+), 12 deletions(-) diff --git a/include/linux/ftrace.h b/include/linux/ftrace.h index 505b7d3f5641..8c034b028af4 100644 --- a/include/linux/ftrace.h +++ b/include/linux/ftrace.h @@ -405,6 +405,22 @@ enum ftrace_ops_cmd { typedef int (*ftrace_ops_func_t)(struct ftrace_ops *op, enum ftrace_ops_cmd cmd); #ifdef CONFIG_DYNAMIC_FTRACE + +#define FTRACE_HASH_DEFAULT_BITS 10 + +struct ftrace_hash { + unsigned long size_bits; + struct hlist_head *buckets; + unsigned long count; + unsigned long flags; + struct rcu_head rcu; +}; + +struct ftrace_hash *alloc_ftrace_hash(int size_bits); +void free_ftrace_hash(struct ftrace_hash *hash); +struct ftrace_func_entry *add_hash_entry_direct(struct ftrace_hash *hash, + unsigned long ip, unsigned long direct); + /* The hash used to know what functions callbacks trace */ struct ftrace_ops_hash { struct ftrace_hash __rcu *notrace_hash; diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c index 7e3a81bd6f1e..84aee9096a9e 100644 --- a/kernel/trace/ftrace.c +++ b/kernel/trace/ftrace.c @@ -68,7 +68,6 @@ }) /* hash bits for specific function selection */ -#define FTRACE_HASH_DEFAULT_BITS 10 #define FTRACE_HASH_MAX_BITS 12 #ifdef CONFIG_DYNAMIC_FTRACE @@ -1185,7 +1184,7 @@ static void __add_hash_entry(struct ftrace_hash *hash, hash->count++; } -static struct ftrace_func_entry * +struct ftrace_func_entry * add_hash_entry_direct(struct ftrace_hash *hash, unsigned long ip, unsigned long direct) { struct ftrace_func_entry *entry; @@ -1265,7 +1264,7 @@ static void clear_ftrace_mod_list(struct list_head *head) mutex_unlock(&ftrace_lock); } -static void free_ftrace_hash(struct ftrace_hash *hash) +void free_ftrace_hash(struct ftrace_hash *hash) { if (!hash || hash == EMPTY_HASH) return; @@ -1305,7 +1304,7 @@ void ftrace_free_filter(struct ftrace_ops *ops) } EXPORT_SYMBOL_GPL(ftrace_free_filter); -static struct ftrace_hash *alloc_ftrace_hash(int size_bits) +struct ftrace_hash *alloc_ftrace_hash(int size_bits) { struct ftrace_hash *hash; int size; diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h index 85eabb454bee..62e0ac625f65 100644 --- a/kernel/trace/trace.h +++ b/kernel/trace/trace.h @@ -899,14 +899,6 @@ enum { FTRACE_HASH_FL_MOD = (1 << 0), }; -struct ftrace_hash { - unsigned long size_bits; - struct hlist_head *buckets; - unsigned long count; - unsigned long flags; - struct rcu_head rcu; -}; - struct ftrace_func_entry * ftrace_lookup_ip(struct ftrace_hash *hash, unsigned long ip); -- 2.52.0