korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-26 21:54:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

kprobes: Make local functions static

Browse Source 
Since we unified the kretprobe trampoline handler from arch/* code,
some functions and objects do not need to be exported anymore.

Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Link: https://lore.kernel.org/r/159870618256.1229682.8692046612635810882.stgit@devnote2
This commit is contained in:
Masami Hiramatsu 2020-08-29 22:03:02 +09:00 committed by Ingo Molnar
parent b338817807
commit 319f0ce284
2 changed files with 4 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
include/linux/kprobes.h
View File

@ -190,7 +190,6 @@ static inline int kprobes_built_in(void)
return 1; return 1;
} }
extern struct kprobe kprobe_busy;
extern void kprobe_busy_begin(void); extern void kprobe_busy_begin(void);
extern void kprobe_busy_end(void); extern void kprobe_busy_end(void);
@ -235,16 +234,6 @@ static inline int arch_trampoline_kprobe(struct kprobe *p)
extern struct kretprobe_blackpoint kretprobe_blacklist[]; extern struct kretprobe_blackpoint kretprobe_blacklist[];
static inline void kretprobe_assert(struct kretprobe_instance *ri,
unsigned long orig_ret_address, unsigned long trampoline_address)
{
if (!orig_ret_address || (orig_ret_address == trampoline_address)) {
printk("kretprobe BUG!: Processing kretprobe %p @ %p\n",
ri->rp, ri->rp->kp.addr);
BUG();
}
}
#ifdef CONFIG_KPROBES_SANITY_TEST #ifdef CONFIG_KPROBES_SANITY_TEST
extern int init_test_probes(void); extern int init_test_probes(void);
#else #else
@ -364,10 +353,6 @@ int arch_check_ftrace_location(struct kprobe *p);
/* Get the kprobe at this addr (if any) - called with preemption disabled */ /* Get the kprobe at this addr (if any) - called with preemption disabled */
struct kprobe *get_kprobe(void *addr); struct kprobe *get_kprobe(void *addr);
void kretprobe_hash_lock(struct task_struct *tsk,
struct hlist_head **head, unsigned long *flags);
void kretprobe_hash_unlock(struct task_struct *tsk, unsigned long *flags);
struct hlist_head * kretprobe_inst_table_head(struct task_struct *tsk);
/* kprobe_running() will just return the current_kprobe on this CPU */ /* kprobe_running() will just return the current_kprobe on this CPU */
static inline struct kprobe *kprobe_running(void) static inline struct kprobe *kprobe_running(void)

9
kernel/kprobes.c
View File

@ -1239,7 +1239,7 @@ static void recycle_rp_inst(struct kretprobe_instance *ri)
} }
NOKPROBE_SYMBOL(recycle_rp_inst); NOKPROBE_SYMBOL(recycle_rp_inst);
void kretprobe_hash_lock(struct task_struct *tsk, static void kretprobe_hash_lock(struct task_struct *tsk,
struct hlist_head **head, unsigned long *flags) struct hlist_head **head, unsigned long *flags)
__acquires(hlist_lock) __acquires(hlist_lock)
{ {
@ -1261,7 +1261,7 @@ __acquires(hlist_lock)
} }
NOKPROBE_SYMBOL(kretprobe_table_lock); NOKPROBE_SYMBOL(kretprobe_table_lock);
void kretprobe_hash_unlock(struct task_struct *tsk, static void kretprobe_hash_unlock(struct task_struct *tsk,
unsigned long *flags) unsigned long *flags)
__releases(hlist_lock) __releases(hlist_lock)
{ {
@ -1282,7 +1282,7 @@ __releases(hlist_lock)
} }
NOKPROBE_SYMBOL(kretprobe_table_unlock); NOKPROBE_SYMBOL(kretprobe_table_unlock);
struct kprobe kprobe_busy = { static struct kprobe kprobe_busy = {
.addr = (void *) get_kprobe, .addr = (void *) get_kprobe,
}; };
@ -1983,8 +1983,7 @@ unsigned long __kretprobe_trampoline_handler(struct pt_regs *regs,
break; break;
} }
kretprobe_assert(ri, (unsigned long)correct_ret_addr, BUG_ON(!correct_ret_addr || (correct_ret_addr == trampoline_address));
(unsigned long)trampoline_address);
last = ri; last = ri;
hlist_for_each_entry_safe(ri, tmp, head, hlist) { hlist_for_each_entry_safe(ri, tmp, head, hlist) {