Commit da8bdfbd authored by Florent Revest's avatar Florent Revest Committed by Steven Rostedt (Google)
Browse files

ftrace: Rename _ftrace_direct_multi APIs to _ftrace_direct APIs 

Now that the original _ftrace_direct APIs are gone, the "_multi"
suffixes only add confusion.

Link: https://lkml.kernel.org/r/20230321140424.345218-5-revest@chromium.org



Signed-off-by: default avatarFlorent Revest <revest@chromium.org>
Acked-by: default avatarMark Rutland <mark.rutland@arm.com>
Tested-by: default avatarMark Rutland <mark.rutland@arm.com>
Acked-by: default avatarJiri Olsa <jolsa@kernel.org>
Signed-off-by: default avatarSteven Rostedt (Google) <rostedt@goodmis.org>
parent 8788ca16

include/linux/ftrace.h

+10 −10
Original line number Diff line number Diff line
@@ -398,11 +398,11 @@ struct ftrace_func_entry { 
#ifdef CONFIG_DYNAMIC_FTRACE_WITH_DIRECT_CALLS

extern int ftrace_direct_func_count;

unsigned long ftrace_find_rec_direct(unsigned long ip);

int register_ftrace_direct_multi(struct ftrace_ops *ops, unsigned long addr);

int unregister_ftrace_direct_multi(struct ftrace_ops *ops, unsigned long addr,

int register_ftrace_direct(struct ftrace_ops *ops, unsigned long addr);

int unregister_ftrace_direct(struct ftrace_ops *ops, unsigned long addr,

			     bool free_filters);

int modify_ftrace_direct_multi(struct ftrace_ops *ops, unsigned long addr);

int modify_ftrace_direct_multi_nolock(struct ftrace_ops *ops, unsigned long addr);

int modify_ftrace_direct(struct ftrace_ops *ops, unsigned long addr);

int modify_ftrace_direct_nolock(struct ftrace_ops *ops, unsigned long addr);



#else

struct ftrace_ops;
@@ -411,20 +411,20 @@ static inline unsigned long ftrace_find_rec_direct(unsigned long ip) 
{

	return 0;

}

static inline int register_ftrace_direct_multi(struct ftrace_ops *ops, unsigned long addr)

static inline int register_ftrace_direct(struct ftrace_ops *ops, unsigned long addr)

{

	return -ENODEV;

}

static inline int unregister_ftrace_direct_multi(struct ftrace_ops *ops, unsigned long addr,

static inline int unregister_ftrace_direct(struct ftrace_ops *ops, unsigned long addr,

					   bool free_filters)

{

	return -ENODEV;

}

static inline int modify_ftrace_direct_multi(struct ftrace_ops *ops, unsigned long addr)

static inline int modify_ftrace_direct(struct ftrace_ops *ops, unsigned long addr)

{

	return -ENODEV;

}

static inline int modify_ftrace_direct_multi_nolock(struct ftrace_ops *ops, unsigned long addr)

static inline int modify_ftrace_direct_nolock(struct ftrace_ops *ops, unsigned long addr)

{

	return -ENODEV;

}

kernel/bpf/trampoline.c

+6 −6
Original line number Diff line number Diff line
@@ -45,8 +45,8 @@ static int bpf_tramp_ftrace_ops_func(struct ftrace_ops *ops, enum ftrace_ops_cmd 
		lockdep_assert_held_once(&tr->mutex);



		/* Instead of updating the trampoline here, we propagate

		 * -EAGAIN to register_ftrace_direct_multi(). Then we can

		 * retry register_ftrace_direct_multi() after updating the

		 * -EAGAIN to register_ftrace_direct(). Then we can

		 * retry register_ftrace_direct() after updating the

		 * trampoline.

		 */

		if ((tr->flags & BPF_TRAMP_F_CALL_ORIG) &&
@@ -198,7 +198,7 @@ static int unregister_fentry(struct bpf_trampoline *tr, void *old_addr) 
	int ret;



	if (tr->func.ftrace_managed)

		ret = unregister_ftrace_direct_multi(tr->fops, (long)old_addr, false);

		ret = unregister_ftrace_direct(tr->fops, (long)old_addr, false);

	else

		ret = bpf_arch_text_poke(ip, BPF_MOD_CALL, old_addr, NULL);
@@ -215,9 +215,9 @@ static int modify_fentry(struct bpf_trampoline *tr, void *old_addr, void *new_ad 


	if (tr->func.ftrace_managed) {

		if (lock_direct_mutex)

			ret = modify_ftrace_direct_multi(tr->fops, (long)new_addr);

			ret = modify_ftrace_direct(tr->fops, (long)new_addr);

		else

			ret = modify_ftrace_direct_multi_nolock(tr->fops, (long)new_addr);

			ret = modify_ftrace_direct_nolock(tr->fops, (long)new_addr);

	} else {

		ret = bpf_arch_text_poke(ip, BPF_MOD_CALL, old_addr, new_addr);

	}
@@ -243,7 +243,7 @@ static int register_fentry(struct bpf_trampoline *tr, void *new_addr) 


	if (tr->func.ftrace_managed) {

		ftrace_set_filter_ip(tr->fops, (unsigned long)ip, 0, 1);

		ret = register_ftrace_direct_multi(tr->fops, (long)new_addr);

		ret = register_ftrace_direct(tr->fops, (long)new_addr);

	} else {

		ret = bpf_arch_text_poke(ip, BPF_MOD_CALL, NULL, new_addr);

	}

kernel/trace/ftrace.c

+17 −17
Original line number Diff line number Diff line
@@ -5318,7 +5318,7 @@ static void remove_direct_functions_hash(struct ftrace_hash *hash, unsigned long 
}



/**

 * register_ftrace_direct_multi - Call a custom trampoline directly

 * register_ftrace_direct - Call a custom trampoline directly

 * for multiple functions registered in @ops

 * @ops: The address of the struct ftrace_ops object

 * @addr: The address of the trampoline to call at @ops functions
@@ -5339,7 +5339,7 @@ static void remove_direct_functions_hash(struct ftrace_hash *hash, unsigned long 
 *  -ENODEV  - @ip does not point to a ftrace nop location (or not supported)

 *  -ENOMEM  - There was an allocation failure.

 */

int register_ftrace_direct_multi(struct ftrace_ops *ops, unsigned long addr)

int register_ftrace_direct(struct ftrace_ops *ops, unsigned long addr)

{

	struct ftrace_hash *hash, *free_hash = NULL;

	struct ftrace_func_entry *entry, *new;
@@ -5397,11 +5397,11 @@ int register_ftrace_direct_multi(struct ftrace_ops *ops, unsigned long addr) 
	}

	return err;

}

EXPORT_SYMBOL_GPL(register_ftrace_direct_multi);

EXPORT_SYMBOL_GPL(register_ftrace_direct);



/**

 * unregister_ftrace_direct_multi - Remove calls to custom trampoline

 * previously registered by register_ftrace_direct_multi for @ops object.

 * unregister_ftrace_direct - Remove calls to custom trampoline

 * previously registered by register_ftrace_direct for @ops object.

 * @ops: The address of the struct ftrace_ops object

 *

 * This is used to remove a direct calls to @addr from the nop locations
@@ -5412,7 +5412,7 @@ EXPORT_SYMBOL_GPL(register_ftrace_direct_multi); 
 *  0 on success

 *  -EINVAL - The @ops object was not properly registered.

 */

int unregister_ftrace_direct_multi(struct ftrace_ops *ops, unsigned long addr,

int unregister_ftrace_direct(struct ftrace_ops *ops, unsigned long addr,

			     bool free_filters)

{

	struct ftrace_hash *hash = ops->func_hash->filter_hash;
@@ -5436,10 +5436,10 @@ int unregister_ftrace_direct_multi(struct ftrace_ops *ops, unsigned long addr, 
		ftrace_free_filter(ops);

	return err;

}

EXPORT_SYMBOL_GPL(unregister_ftrace_direct_multi);

EXPORT_SYMBOL_GPL(unregister_ftrace_direct);



static int

__modify_ftrace_direct_multi(struct ftrace_ops *ops, unsigned long addr)

__modify_ftrace_direct(struct ftrace_ops *ops, unsigned long addr)

{

	struct ftrace_hash *hash;

	struct ftrace_func_entry *entry, *iter;
@@ -5486,7 +5486,7 @@ __modify_ftrace_direct_multi(struct ftrace_ops *ops, unsigned long addr) 
}



/**

 * modify_ftrace_direct_multi_nolock - Modify an existing direct 'multi' call

 * modify_ftrace_direct_nolock - Modify an existing direct 'multi' call

 * to call something else

 * @ops: The address of the struct ftrace_ops object

 * @addr: The address of the new trampoline to call at @ops functions
@@ -5503,19 +5503,19 @@ __modify_ftrace_direct_multi(struct ftrace_ops *ops, unsigned long addr) 
 * Returns: zero on success. Non zero on error, which includes:

 *  -EINVAL - The @ops object was not properly registered.

 */

int modify_ftrace_direct_multi_nolock(struct ftrace_ops *ops, unsigned long addr)

int modify_ftrace_direct_nolock(struct ftrace_ops *ops, unsigned long addr)

{

	if (check_direct_multi(ops))

		return -EINVAL;

	if (!(ops->flags & FTRACE_OPS_FL_ENABLED))

		return -EINVAL;



	return __modify_ftrace_direct_multi(ops, addr);

	return __modify_ftrace_direct(ops, addr);

}

EXPORT_SYMBOL_GPL(modify_ftrace_direct_multi_nolock);

EXPORT_SYMBOL_GPL(modify_ftrace_direct_nolock);



/**

 * modify_ftrace_direct_multi - Modify an existing direct 'multi' call

 * modify_ftrace_direct - Modify an existing direct 'multi' call

 * to call something else

 * @ops: The address of the struct ftrace_ops object

 * @addr: The address of the new trampoline to call at @ops functions
@@ -5529,7 +5529,7 @@ EXPORT_SYMBOL_GPL(modify_ftrace_direct_multi_nolock); 
 * Returns: zero on success. Non zero on error, which includes:

 *  -EINVAL - The @ops object was not properly registered.

 */

int modify_ftrace_direct_multi(struct ftrace_ops *ops, unsigned long addr)

int modify_ftrace_direct(struct ftrace_ops *ops, unsigned long addr)

{

	int err;
@@ -5539,11 +5539,11 @@ int modify_ftrace_direct_multi(struct ftrace_ops *ops, unsigned long addr) 
		return -EINVAL;



	mutex_lock(&direct_mutex);

	err = __modify_ftrace_direct_multi(ops, addr);

	err = __modify_ftrace_direct(ops, addr);

	mutex_unlock(&direct_mutex);

	return err;

}

EXPORT_SYMBOL_GPL(modify_ftrace_direct_multi);

EXPORT_SYMBOL_GPL(modify_ftrace_direct);

#endif /* CONFIG_DYNAMIC_FTRACE_WITH_DIRECT_CALLS */



/**

kernel/trace/trace_selftest.c

+5 −4
Original line number Diff line number Diff line
@@ -872,7 +872,8 @@ trace_selftest_startup_function_graph(struct tracer *trace, 
	 * and make sure we get graph trace.

	 */

	ftrace_set_filter_ip(&direct, (unsigned long)DYN_FTRACE_TEST_NAME, 0, 0);

	ret = register_ftrace_direct_multi(&direct, (unsigned long)trace_direct_tramp);

	ret = register_ftrace_direct(&direct,

				     (unsigned long)trace_direct_tramp);

	if (ret)

		goto out;
@@ -892,7 +893,7 @@ trace_selftest_startup_function_graph(struct tracer *trace, 


	unregister_ftrace_graph(&fgraph_ops);



	ret = unregister_ftrace_direct_multi(&direct,

	ret = unregister_ftrace_direct(&direct,

				       (unsigned long) trace_direct_tramp,

				       true);

	if (ret)

samples/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ config SAMPLE_FTRACE_DIRECT 
	  that hooks to wake_up_process and prints the parameters.



config SAMPLE_FTRACE_DIRECT_MULTI

	tristate "Build register_ftrace_direct_multi() example"

	tristate "Build register_ftrace_direct() on multiple ips example"

	depends on DYNAMIC_FTRACE_WITH_DIRECT_CALLS && m

	depends on HAVE_SAMPLE_FTRACE_DIRECT_MULTI

	help