Skip to content

Commit da8bdfb

Browse files
FlorentRevestrostedt
FlorentRevest
authored and
rostedt
committed
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/[email protected] Signed-off-by: Florent Revest <[email protected]> Acked-by: Mark Rutland <[email protected]> Tested-by: Mark Rutland <[email protected]> Acked-by: Jiri Olsa <[email protected]> Signed-off-by: Steven Rostedt (Google) <[email protected]>
1 parent 8788ca1 commit da8bdfb

File tree

10 files changed

+55
-54
lines changed

10 files changed

+55
-54
lines changed

‎include/linux/ftrace.h‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -398,11 +398,11 @@ struct ftrace_func_entry {
398398
#ifdef CONFIG_DYNAMIC_FTRACE_WITH_DIRECT_CALLS
399399
extern int ftrace_direct_func_count;
400400
unsigned long ftrace_find_rec_direct(unsigned long ip);
401-
int register_ftrace_direct_multi(struct ftrace_ops *ops, unsigned long addr);
402-
int unregister_ftrace_direct_multi(struct ftrace_ops *ops, unsigned long addr,
403-
bool free_filters);
404-
int modify_ftrace_direct_multi(struct ftrace_ops *ops, unsigned long addr);
405-
int modify_ftrace_direct_multi_nolock(struct ftrace_ops *ops, unsigned long addr);
401+
int register_ftrace_direct(struct ftrace_ops *ops, unsigned long addr);
402+
int unregister_ftrace_direct(struct ftrace_ops *ops, unsigned long addr,
403+
bool free_filters);
404+
int modify_ftrace_direct(struct ftrace_ops *ops, unsigned long addr);
405+
int modify_ftrace_direct_nolock(struct ftrace_ops *ops, unsigned long addr);
406406

407407
#else
408408
struct ftrace_ops;
@@ -411,20 +411,20 @@ static inline unsigned long ftrace_find_rec_direct(unsigned long ip)
411411
{
412412
return 0;
413413
}
414-
static inline int register_ftrace_direct_multi(struct ftrace_ops *ops, unsigned long addr)
414+
static inline int register_ftrace_direct(struct ftrace_ops *ops, unsigned long addr)
415415
{
416416
return -ENODEV;
417417
}
418-
static inline int unregister_ftrace_direct_multi(struct ftrace_ops *ops, unsigned long addr,
419-
bool free_filters)
418+
static inline int unregister_ftrace_direct(struct ftrace_ops *ops, unsigned long addr,
419+
bool free_filters)
420420
{
421421
return -ENODEV;
422422
}
423-
static inline int modify_ftrace_direct_multi(struct ftrace_ops *ops, unsigned long addr)
423+
static inline int modify_ftrace_direct(struct ftrace_ops *ops, unsigned long addr)
424424
{
425425
return -ENODEV;
426426
}
427-
static inline int modify_ftrace_direct_multi_nolock(struct ftrace_ops *ops, unsigned long addr)
427+
static inline int modify_ftrace_direct_nolock(struct ftrace_ops *ops, unsigned long addr)
428428
{
429429
return -ENODEV;
430430
}

‎kernel/bpf/trampoline.c‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ static int bpf_tramp_ftrace_ops_func(struct ftrace_ops *ops, enum ftrace_ops_cmd
4545
lockdep_assert_held_once(&tr->mutex);
4646

4747
/* Instead of updating the trampoline here, we propagate
48-
* -EAGAIN to register_ftrace_direct_multi(). Then we can
49-
* retry register_ftrace_direct_multi() after updating the
48+
* -EAGAIN to register_ftrace_direct(). Then we can
49+
* retry register_ftrace_direct() after updating the
5050
* trampoline.
5151
*/
5252
if ((tr->flags & BPF_TRAMP_F_CALL_ORIG) &&
@@ -198,7 +198,7 @@ static int unregister_fentry(struct bpf_trampoline *tr, void *old_addr)
198198
int ret;
199199

200200
if (tr->func.ftrace_managed)
201-
ret = unregister_ftrace_direct_multi(tr->fops, (long)old_addr, false);
201+
ret = unregister_ftrace_direct(tr->fops, (long)old_addr, false);
202202
else
203203
ret = bpf_arch_text_poke(ip, BPF_MOD_CALL, old_addr, NULL);
204204

@@ -215,9 +215,9 @@ static int modify_fentry(struct bpf_trampoline *tr, void *old_addr, void *new_ad
215215

216216
if (tr->func.ftrace_managed) {
217217
if (lock_direct_mutex)
218-
ret = modify_ftrace_direct_multi(tr->fops, (long)new_addr);
218+
ret = modify_ftrace_direct(tr->fops, (long)new_addr);
219219
else
220-
ret = modify_ftrace_direct_multi_nolock(tr->fops, (long)new_addr);
220+
ret = modify_ftrace_direct_nolock(tr->fops, (long)new_addr);
221221
} else {
222222
ret = bpf_arch_text_poke(ip, BPF_MOD_CALL, old_addr, new_addr);
223223
}
@@ -243,7 +243,7 @@ static int register_fentry(struct bpf_trampoline *tr, void *new_addr)
243243

244244
if (tr->func.ftrace_managed) {
245245
ftrace_set_filter_ip(tr->fops, (unsigned long)ip, 0, 1);
246-
ret = register_ftrace_direct_multi(tr->fops, (long)new_addr);
246+
ret = register_ftrace_direct(tr->fops, (long)new_addr);
247247
} else {
248248
ret = bpf_arch_text_poke(ip, BPF_MOD_CALL, NULL, new_addr);
249249
}

‎kernel/trace/ftrace.c‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -5318,7 +5318,7 @@ static void remove_direct_functions_hash(struct ftrace_hash *hash, unsigned long
53185318
}
53195319

53205320
/**
5321-
* register_ftrace_direct_multi - Call a custom trampoline directly
5321+
* register_ftrace_direct - Call a custom trampoline directly
53225322
* for multiple functions registered in @ops
53235323
* @ops: The address of the struct ftrace_ops object
53245324
* @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
53395339
* -ENODEV - @ip does not point to a ftrace nop location (or not supported)
53405340
* -ENOMEM - There was an allocation failure.
53415341
*/
5342-
int register_ftrace_direct_multi(struct ftrace_ops *ops, unsigned long addr)
5342+
int register_ftrace_direct(struct ftrace_ops *ops, unsigned long addr)
53435343
{
53445344
struct ftrace_hash *hash, *free_hash = NULL;
53455345
struct ftrace_func_entry *entry, *new;
@@ -5397,11 +5397,11 @@ int register_ftrace_direct_multi(struct ftrace_ops *ops, unsigned long addr)
53975397
}
53985398
return err;
53995399
}
5400-
EXPORT_SYMBOL_GPL(register_ftrace_direct_multi);
5400+
EXPORT_SYMBOL_GPL(register_ftrace_direct);
54015401

54025402
/**
5403-
* unregister_ftrace_direct_multi - Remove calls to custom trampoline
5404-
* previously registered by register_ftrace_direct_multi for @ops object.
5403+
* unregister_ftrace_direct - Remove calls to custom trampoline
5404+
* previously registered by register_ftrace_direct for @ops object.
54055405
* @ops: The address of the struct ftrace_ops object
54065406
*
54075407
* This is used to remove a direct calls to @addr from the nop locations
@@ -5412,8 +5412,8 @@ EXPORT_SYMBOL_GPL(register_ftrace_direct_multi);
54125412
* 0 on success
54135413
* -EINVAL - The @ops object was not properly registered.
54145414
*/
5415-
int unregister_ftrace_direct_multi(struct ftrace_ops *ops, unsigned long addr,
5416-
bool free_filters)
5415+
int unregister_ftrace_direct(struct ftrace_ops *ops, unsigned long addr,
5416+
bool free_filters)
54175417
{
54185418
struct ftrace_hash *hash = ops->func_hash->filter_hash;
54195419
int err;
@@ -5436,10 +5436,10 @@ int unregister_ftrace_direct_multi(struct ftrace_ops *ops, unsigned long addr,
54365436
ftrace_free_filter(ops);
54375437
return err;
54385438
}
5439-
EXPORT_SYMBOL_GPL(unregister_ftrace_direct_multi);
5439+
EXPORT_SYMBOL_GPL(unregister_ftrace_direct);
54405440

54415441
static int
5442-
__modify_ftrace_direct_multi(struct ftrace_ops *ops, unsigned long addr)
5442+
__modify_ftrace_direct(struct ftrace_ops *ops, unsigned long addr)
54435443
{
54445444
struct ftrace_hash *hash;
54455445
struct ftrace_func_entry *entry, *iter;
@@ -5486,7 +5486,7 @@ __modify_ftrace_direct_multi(struct ftrace_ops *ops, unsigned long addr)
54865486
}
54875487

54885488
/**
5489-
* modify_ftrace_direct_multi_nolock - Modify an existing direct 'multi' call
5489+
* modify_ftrace_direct_nolock - Modify an existing direct 'multi' call
54905490
* to call something else
54915491
* @ops: The address of the struct ftrace_ops object
54925492
* @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)
55035503
* Returns: zero on success. Non zero on error, which includes:
55045504
* -EINVAL - The @ops object was not properly registered.
55055505
*/
5506-
int modify_ftrace_direct_multi_nolock(struct ftrace_ops *ops, unsigned long addr)
5506+
int modify_ftrace_direct_nolock(struct ftrace_ops *ops, unsigned long addr)
55075507
{
55085508
if (check_direct_multi(ops))
55095509
return -EINVAL;
55105510
if (!(ops->flags & FTRACE_OPS_FL_ENABLED))
55115511
return -EINVAL;
55125512

5513-
return __modify_ftrace_direct_multi(ops, addr);
5513+
return __modify_ftrace_direct(ops, addr);
55145514
}
5515-
EXPORT_SYMBOL_GPL(modify_ftrace_direct_multi_nolock);
5515+
EXPORT_SYMBOL_GPL(modify_ftrace_direct_nolock);
55165516

55175517
/**
5518-
* modify_ftrace_direct_multi - Modify an existing direct 'multi' call
5518+
* modify_ftrace_direct - Modify an existing direct 'multi' call
55195519
* to call something else
55205520
* @ops: The address of the struct ftrace_ops object
55215521
* @addr: The address of the new trampoline to call at @ops functions
@@ -5529,7 +5529,7 @@ EXPORT_SYMBOL_GPL(modify_ftrace_direct_multi_nolock);
55295529
* Returns: zero on success. Non zero on error, which includes:
55305530
* -EINVAL - The @ops object was not properly registered.
55315531
*/
5532-
int modify_ftrace_direct_multi(struct ftrace_ops *ops, unsigned long addr)
5532+
int modify_ftrace_direct(struct ftrace_ops *ops, unsigned long addr)
55335533
{
55345534
int err;
55355535

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

55415541
mutex_lock(&direct_mutex);
5542-
err = __modify_ftrace_direct_multi(ops, addr);
5542+
err = __modify_ftrace_direct(ops, addr);
55435543
mutex_unlock(&direct_mutex);
55445544
return err;
55455545
}
5546-
EXPORT_SYMBOL_GPL(modify_ftrace_direct_multi);
5546+
EXPORT_SYMBOL_GPL(modify_ftrace_direct);
55475547
#endif /* CONFIG_DYNAMIC_FTRACE_WITH_DIRECT_CALLS */
55485548

55495549
/**

‎kernel/trace/trace_selftest.c‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -872,7 +872,8 @@ trace_selftest_startup_function_graph(struct tracer *trace,
872872
* and make sure we get graph trace.
873873
*/
874874
ftrace_set_filter_ip(&direct, (unsigned long)DYN_FTRACE_TEST_NAME, 0, 0);
875-
ret = register_ftrace_direct_multi(&direct, (unsigned long)trace_direct_tramp);
875+
ret = register_ftrace_direct(&direct,
876+
(unsigned long)trace_direct_tramp);
876877
if (ret)
877878
goto out;
878879

@@ -892,9 +893,9 @@ trace_selftest_startup_function_graph(struct tracer *trace,
892893

893894
unregister_ftrace_graph(&fgraph_ops);
894895

895-
ret = unregister_ftrace_direct_multi(&direct,
896-
(unsigned long) trace_direct_tramp,
897-
true);
896+
ret = unregister_ftrace_direct(&direct,
897+
(unsigned long) trace_direct_tramp,
898+
true);
898899
if (ret)
899900
goto out;
900901

‎samples/Kconfig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ config SAMPLE_FTRACE_DIRECT
3838
that hooks to wake_up_process and prints the parameters.
3939

4040
config SAMPLE_FTRACE_DIRECT_MULTI
41-
tristate "Build register_ftrace_direct_multi() example"
41+
tristate "Build register_ftrace_direct() on multiple ips example"
4242
depends on DYNAMIC_FTRACE_WITH_DIRECT_CALLS && m
4343
depends on HAVE_SAMPLE_FTRACE_DIRECT_MULTI
4444
help

‎samples/ftrace/ftrace-direct-modify.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ static int simple_thread(void *arg)
116116
if (ret)
117117
continue;
118118
t ^= 1;
119-
ret = modify_ftrace_direct_multi(&direct, tramps[t]);
119+
ret = modify_ftrace_direct(&direct, tramps[t]);
120120
if (!ret)
121121
my_tramp = tramps[t];
122122
WARN_ON_ONCE(ret);
@@ -132,7 +132,7 @@ static int __init ftrace_direct_init(void)
132132
int ret;
133133

134134
ftrace_set_filter_ip(&direct, (unsigned long) my_ip, 0, 0);
135-
ret = register_ftrace_direct_multi(&direct, my_tramp);
135+
ret = register_ftrace_direct(&direct, my_tramp);
136136

137137
if (!ret)
138138
simple_tsk = kthread_run(simple_thread, NULL, "event-sample-fn");
@@ -142,12 +142,12 @@ static int __init ftrace_direct_init(void)
142142
static void __exit ftrace_direct_exit(void)
143143
{
144144
kthread_stop(simple_tsk);
145-
unregister_ftrace_direct_multi(&direct, my_tramp, true);
145+
unregister_ftrace_direct(&direct, my_tramp, true);
146146
}
147147

148148
module_init(ftrace_direct_init);
149149
module_exit(ftrace_direct_exit);
150150

151151
MODULE_AUTHOR("Steven Rostedt");
152-
MODULE_DESCRIPTION("Example use case of using modify_ftrace_direct_multi()");
152+
MODULE_DESCRIPTION("Example use case of using modify_ftrace_direct()");
153153
MODULE_LICENSE("GPL");

‎samples/ftrace/ftrace-direct-multi-modify.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ static int simple_thread(void *arg)
123123
if (ret)
124124
continue;
125125
t ^= 1;
126-
ret = modify_ftrace_direct_multi(&direct, tramps[t]);
126+
ret = modify_ftrace_direct(&direct, tramps[t]);
127127
if (!ret)
128128
my_tramp = tramps[t];
129129
WARN_ON_ONCE(ret);
@@ -141,7 +141,7 @@ static int __init ftrace_direct_multi_init(void)
141141
ftrace_set_filter_ip(&direct, (unsigned long) wake_up_process, 0, 0);
142142
ftrace_set_filter_ip(&direct, (unsigned long) schedule, 0, 0);
143143

144-
ret = register_ftrace_direct_multi(&direct, my_tramp);
144+
ret = register_ftrace_direct(&direct, my_tramp);
145145

146146
if (!ret)
147147
simple_tsk = kthread_run(simple_thread, NULL, "event-sample-fn");
@@ -151,12 +151,12 @@ static int __init ftrace_direct_multi_init(void)
151151
static void __exit ftrace_direct_multi_exit(void)
152152
{
153153
kthread_stop(simple_tsk);
154-
unregister_ftrace_direct_multi(&direct, my_tramp, true);
154+
unregister_ftrace_direct(&direct, my_tramp, true);
155155
}
156156

157157
module_init(ftrace_direct_multi_init);
158158
module_exit(ftrace_direct_multi_exit);
159159

160160
MODULE_AUTHOR("Jiri Olsa");
161-
MODULE_DESCRIPTION("Example use case of using modify_ftrace_direct_multi()");
161+
MODULE_DESCRIPTION("Example use case of using modify_ftrace_direct()");
162162
MODULE_LICENSE("GPL");

‎samples/ftrace/ftrace-direct-multi.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,12 +73,12 @@ static int __init ftrace_direct_multi_init(void)
7373
ftrace_set_filter_ip(&direct, (unsigned long) wake_up_process, 0, 0);
7474
ftrace_set_filter_ip(&direct, (unsigned long) schedule, 0, 0);
7575

76-
return register_ftrace_direct_multi(&direct, (unsigned long) my_tramp);
76+
return register_ftrace_direct(&direct, (unsigned long) my_tramp);
7777
}
7878

7979
static void __exit ftrace_direct_multi_exit(void)
8080
{
81-
unregister_ftrace_direct_multi(&direct, (unsigned long) my_tramp, true);
81+
unregister_ftrace_direct(&direct, (unsigned long) my_tramp, true);
8282
}
8383

8484
module_init(ftrace_direct_multi_init);

‎samples/ftrace/ftrace-direct-too.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,17 +76,17 @@ static int __init ftrace_direct_init(void)
7676
{
7777
ftrace_set_filter_ip(&direct, (unsigned long) handle_mm_fault, 0, 0);
7878

79-
return register_ftrace_direct_multi(&direct, (unsigned long) my_tramp);
79+
return register_ftrace_direct(&direct, (unsigned long) my_tramp);
8080
}
8181

8282
static void __exit ftrace_direct_exit(void)
8383
{
84-
unregister_ftrace_direct_multi(&direct, (unsigned long)my_tramp, true);
84+
unregister_ftrace_direct(&direct, (unsigned long)my_tramp, true);
8585
}
8686

8787
module_init(ftrace_direct_init);
8888
module_exit(ftrace_direct_exit);
8989

9090
MODULE_AUTHOR("Steven Rostedt");
91-
MODULE_DESCRIPTION("Another example use case of using register_ftrace_direct_multi()");
91+
MODULE_DESCRIPTION("Another example use case of using register_ftrace_direct()");
9292
MODULE_LICENSE("GPL");

‎samples/ftrace/ftrace-direct.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,17 +69,17 @@ static int __init ftrace_direct_init(void)
6969
{
7070
ftrace_set_filter_ip(&direct, (unsigned long) wake_up_process, 0, 0);
7171

72-
return register_ftrace_direct_multi(&direct, (unsigned long) my_tramp);
72+
return register_ftrace_direct(&direct, (unsigned long) my_tramp);
7373
}
7474

7575
static void __exit ftrace_direct_exit(void)
7676
{
77-
unregister_ftrace_direct_multi(&direct, (unsigned long)my_tramp, true);
77+
unregister_ftrace_direct(&direct, (unsigned long)my_tramp, true);
7878
}
7979

8080
module_init(ftrace_direct_init);
8181
module_exit(ftrace_direct_exit);
8282

8383
MODULE_AUTHOR("Steven Rostedt");
84-
MODULE_DESCRIPTION("Example use case of using register_ftrace_direct_multi()");
84+
MODULE_DESCRIPTION("Example use case of using register_ftrace_direct()");
8585
MODULE_LICENSE("GPL");

0 commit comments

Comments
 (0)