Commit 0e860d07 authored by Jiri Olsa's avatar Jiri Olsa Committed by Andrii Nakryiko
Browse files

ftrace: Export some of hash related functions 



We are going to use these functions in following changes.

Signed-off-by: default avatarJiri Olsa <jolsa@kernel.org>
Signed-off-by: default avatarAndrii Nakryiko <andrii@kernel.org>
Reviewed-by: default avatarSteven Rostedt (Google) <rostedt@goodmis.org>
Link: https://lore.kernel.org/bpf/20251230145010.103439-4-jolsa@kernel.org
parent 676bfeae

include/linux/ftrace.h

+9 −0
Original line number Diff line number Diff line
@@ -82,6 +82,7 @@ static inline void early_trace_init(void) { } 


struct module;

struct ftrace_hash;

struct ftrace_func_entry;



#if defined(CONFIG_FUNCTION_TRACER) && defined(CONFIG_MODULES) && \

	defined(CONFIG_DYNAMIC_FTRACE)
@@ -405,6 +406,14 @@ 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 *alloc_ftrace_hash(int size_bits);

void free_ftrace_hash(struct ftrace_hash *hash);

struct ftrace_func_entry *add_ftrace_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;

kernel/trace/ftrace.c

+6 −7
Original line number Diff line number Diff line
@@ -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
@@ -1211,8 +1210,8 @@ static void __add_hash_entry(struct ftrace_hash *hash, 
	hash->count++;

}



static struct ftrace_func_entry *

add_hash_entry_direct(struct ftrace_hash *hash, unsigned long ip, unsigned long direct)

struct ftrace_func_entry *

add_ftrace_hash_entry_direct(struct ftrace_hash *hash, unsigned long ip, unsigned long direct)

{

	struct ftrace_func_entry *entry;
@@ -1230,7 +1229,7 @@ add_hash_entry_direct(struct ftrace_hash *hash, unsigned long ip, unsigned long 
static struct ftrace_func_entry *

add_hash_entry(struct ftrace_hash *hash, unsigned long ip)

{

	return add_hash_entry_direct(hash, ip, 0);

	return add_ftrace_hash_entry_direct(hash, ip, 0);

}



static void
@@ -1291,7 +1290,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;
@@ -1331,7 +1330,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;
@@ -1405,7 +1404,7 @@ alloc_and_copy_ftrace_hash(int size_bits, struct ftrace_hash *hash) 
	size = 1 << hash->size_bits;

	for (i = 0; i < size; i++) {

		hlist_for_each_entry(entry, &hash->buckets[i], hlist) {

			if (add_hash_entry_direct(new_hash, entry->ip, entry->direct) == NULL)

			if (add_ftrace_hash_entry_direct(new_hash, entry->ip, entry->direct) == NULL)

				goto free_hash;

		}

	}