Skip to content

Commit 319f0ce

Browse files
mhiramatingomolnar
authored andcommitted
kprobes: Make local functions static
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
1 parent b338817 commit 319f0ce

2 files changed

Lines changed: 4 additions & 20 deletions

File tree

include/linux/kprobes.h

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,6 @@ static inline int kprobes_built_in(void)
190190
return 1;
191191
}
192192

193-
extern struct kprobe kprobe_busy;
194193
extern void kprobe_busy_begin(void);
195194
extern void kprobe_busy_end(void);
196195

@@ -235,16 +234,6 @@ static inline int arch_trampoline_kprobe(struct kprobe *p)
235234

236235
extern struct kretprobe_blackpoint kretprobe_blacklist[];
237236

238-
static inline void kretprobe_assert(struct kretprobe_instance *ri,
239-
unsigned long orig_ret_address, unsigned long trampoline_address)
240-
{
241-
if (!orig_ret_address || (orig_ret_address == trampoline_address)) {
242-
printk("kretprobe BUG!: Processing kretprobe %p @ %p\n",
243-
ri->rp, ri->rp->kp.addr);
244-
BUG();
245-
}
246-
}
247-
248237
#ifdef CONFIG_KPROBES_SANITY_TEST
249238
extern int init_test_probes(void);
250239
#else
@@ -364,10 +353,6 @@ int arch_check_ftrace_location(struct kprobe *p);
364353

365354
/* Get the kprobe at this addr (if any) - called with preemption disabled */
366355
struct kprobe *get_kprobe(void *addr);
367-
void kretprobe_hash_lock(struct task_struct *tsk,
368-
struct hlist_head **head, unsigned long *flags);
369-
void kretprobe_hash_unlock(struct task_struct *tsk, unsigned long *flags);
370-
struct hlist_head * kretprobe_inst_table_head(struct task_struct *tsk);
371356

372357
/* kprobe_running() will just return the current_kprobe on this CPU */
373358
static inline struct kprobe *kprobe_running(void)

kernel/kprobes.c

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1239,7 +1239,7 @@ static void recycle_rp_inst(struct kretprobe_instance *ri)
12391239
}
12401240
NOKPROBE_SYMBOL(recycle_rp_inst);
12411241

1242-
void kretprobe_hash_lock(struct task_struct *tsk,
1242+
static void kretprobe_hash_lock(struct task_struct *tsk,
12431243
struct hlist_head **head, unsigned long *flags)
12441244
__acquires(hlist_lock)
12451245
{
@@ -1261,7 +1261,7 @@ __acquires(hlist_lock)
12611261
}
12621262
NOKPROBE_SYMBOL(kretprobe_table_lock);
12631263

1264-
void kretprobe_hash_unlock(struct task_struct *tsk,
1264+
static void kretprobe_hash_unlock(struct task_struct *tsk,
12651265
unsigned long *flags)
12661266
__releases(hlist_lock)
12671267
{
@@ -1282,7 +1282,7 @@ __releases(hlist_lock)
12821282
}
12831283
NOKPROBE_SYMBOL(kretprobe_table_unlock);
12841284

1285-
struct kprobe kprobe_busy = {
1285+
static struct kprobe kprobe_busy = {
12861286
.addr = (void *) get_kprobe,
12871287
};
12881288

@@ -1983,8 +1983,7 @@ unsigned long __kretprobe_trampoline_handler(struct pt_regs *regs,
19831983
break;
19841984
}
19851985

1986-
kretprobe_assert(ri, (unsigned long)correct_ret_addr,
1987-
(unsigned long)trampoline_address);
1986+
BUG_ON(!correct_ret_addr || (correct_ret_addr == trampoline_address));
19881987
last = ri;
19891988

19901989
hlist_for_each_entry_safe(ri, tmp, head, hlist) {

0 commit comments

Comments
 (0)