Skip to content

Commit c6604fd

Browse files
ftrace: Remove the legacy _ftrace_direct API
JIRA: https://issues.redhat.com/browse/RHEL-101598 commit 8788ca1 Author: Florent Revest <[email protected]> Date: Tue Mar 21 15:04:20 2023 +0100 ftrace: Remove the legacy _ftrace_direct API This API relies on a single global ops, used for all direct calls registered with it. However, to implement arm64 direct calls, we need each ops to point to a single direct call trampoline. 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]> Conflicts: - kernel/trace/ftrace.c: 2 hunks modified missing commit 8732565 ("ftrace: Set direct_ops storage-class-specifier to static") and already backorted 2a2d8c5 ("ftrace: Fix issue that 'direct->addr' not restored in modify_ftrace_direct()") Assisted-by: Patchpal AI Signed-off-by: Jerome Marchand <[email protected]>
1 parent c513d09 commit c6604fd

File tree

2 files changed

+0
-428
lines changed

2 files changed

+0
-428
lines changed

include/linux/ftrace.h

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -390,14 +390,6 @@ struct ftrace_func_entry {
390390

391391
#ifdef CONFIG_DYNAMIC_FTRACE_WITH_DIRECT_CALLS
392392
extern int ftrace_direct_func_count;
393-
int register_ftrace_direct(unsigned long ip, unsigned long addr);
394-
int unregister_ftrace_direct(unsigned long ip, unsigned long addr);
395-
int modify_ftrace_direct(unsigned long ip, unsigned long old_addr, unsigned long new_addr);
396-
struct ftrace_direct_func *ftrace_find_direct_func(unsigned long addr);
397-
int ftrace_modify_direct_caller(struct ftrace_func_entry *entry,
398-
struct dyn_ftrace *rec,
399-
unsigned long old_addr,
400-
unsigned long new_addr);
401393
unsigned long ftrace_find_rec_direct(unsigned long ip);
402394
int register_ftrace_direct_multi(struct ftrace_ops *ops, unsigned long addr);
403395
int unregister_ftrace_direct_multi(struct ftrace_ops *ops, unsigned long addr,
@@ -410,30 +402,6 @@ void ftrace_stub_direct_tramp(void);
410402
#else
411403
struct ftrace_ops;
412404
# define ftrace_direct_func_count 0
413-
static inline int register_ftrace_direct(unsigned long ip, unsigned long addr)
414-
{
415-
return -ENOTSUPP;
416-
}
417-
static inline int unregister_ftrace_direct(unsigned long ip, unsigned long addr)
418-
{
419-
return -ENOTSUPP;
420-
}
421-
static inline int modify_ftrace_direct(unsigned long ip,
422-
unsigned long old_addr, unsigned long new_addr)
423-
{
424-
return -ENOTSUPP;
425-
}
426-
static inline struct ftrace_direct_func *ftrace_find_direct_func(unsigned long addr)
427-
{
428-
return NULL;
429-
}
430-
static inline int ftrace_modify_direct_caller(struct ftrace_func_entry *entry,
431-
struct dyn_ftrace *rec,
432-
unsigned long old_addr,
433-
unsigned long new_addr)
434-
{
435-
return -ENODEV;
436-
}
437405
static inline unsigned long ftrace_find_rec_direct(unsigned long ip)
438406
{
439407
return 0;

0 commit comments

Comments
 (0)