Ksawlii/kernel_samsung_a53x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "tracing/kprobes: Return EADDRNOTAVAIL when func matches several symbols"

Browse source 
This reverts commit 058ee93b4b.
This commit is contained in:
Ksawlii 2024-11-24 00:22:59 +01:00
parent 93ad10a774
commit 5fca109408
2 changed files with 0 additions and 75 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

74
kernel/trace/trace_kprobe.c
View file

@ -715,36 +715,6 @@ static inline void sanitize_event_name(char *name)
*name = '_'; *name = '_';
} }
struct count_symbols_struct {
const char *func_name;
unsigned int count;
};
static int count_symbols(void *data, const char *name, struct module *unused0,
unsigned long unused1)
{
struct count_symbols_struct *args = data;
if (strcmp(args->func_name, name))
return 0;
args->count++;
return 0;
}
static unsigned int number_of_same_symbols(char *func_name)
{
struct count_symbols_struct args = {
.func_name = func_name,
.count = 0,
};
kallsyms_on_each_symbol(count_symbols, &args);
return args.count;
}
static int trace_kprobe_create(int argc, const char *argv[]) static int trace_kprobe_create(int argc, const char *argv[])
{ {
/* /*
@ -872,31 +842,6 @@ static int trace_kprobe_create(int argc, const char *argv[])
} }
} }
if (symbol && !strchr(symbol, ':')) {
unsigned int count;
count = number_of_same_symbols(symbol);
if (count > 1) {
/*
* Users should use ADDR to remove the ambiguity of
* using KSYM only.
*/
trace_probe_log_err(0, NON_UNIQ_SYMBOL);
ret = -EADDRNOTAVAIL;
goto error;
} else if (count == 0) {
/*
* We can return ENOENT earlier than when register the
* kprobe.
*/
trace_probe_log_err(0, BAD_PROBE_ADDR);
ret = -ENOENT;
goto error;
}
}
trace_probe_log_set_index(0); trace_probe_log_set_index(0);
if (event) { if (event) {
ret = traceprobe_parse_event_name(&event, &group, buf, ret = traceprobe_parse_event_name(&event, &group, buf,
@ -1860,7 +1805,6 @@ static int unregister_kprobe_event(struct trace_kprobe *tk)
} }
#ifdef CONFIG_PERF_EVENTS #ifdef CONFIG_PERF_EVENTS
/* create a trace_kprobe, but don't add it to global lists */ /* create a trace_kprobe, but don't add it to global lists */
struct trace_event_call * struct trace_event_call *
create_local_trace_kprobe(char *func, void *addr, unsigned long offs, create_local_trace_kprobe(char *func, void *addr, unsigned long offs,
@ -1870,24 +1814,6 @@ create_local_trace_kprobe(char *func, void *addr, unsigned long offs,
int ret; int ret;
char *event; char *event;
if (func) {
unsigned int count;
count = number_of_same_symbols(func);
if (count > 1)
/*
* Users should use addr to remove the ambiguity of
* using func only.
*/
return ERR_PTR(-EADDRNOTAVAIL);
else if (count == 0)
/*
* We can return ENOENT earlier than when register the
* kprobe.
*/
return ERR_PTR(-ENOENT);
}
/* /*
* local trace_kprobes are not added to dyn_event, so they are never * local trace_kprobes are not added to dyn_event, so they are never
* searched in find_trace_kprobe(). Therefore, there is no concern of * searched in find_trace_kprobe(). Therefore, there is no concern of

1
kernel/trace/trace_probe.h
View file

@ -390,7 +390,6 @@ extern int traceprobe_define_arg_fields(struct trace_event_call *event_call,
C(BAD_MAXACT, "Invalid maxactive number"), \ C(BAD_MAXACT, "Invalid maxactive number"), \
C(MAXACT_TOO_BIG, "Maxactive is too big"), \ C(MAXACT_TOO_BIG, "Maxactive is too big"), \
C(BAD_PROBE_ADDR, "Invalid probed address or symbol"), \ C(BAD_PROBE_ADDR, "Invalid probed address or symbol"), \
C(NON_UNIQ_SYMBOL, "The symbol is not unique"), \
C(BAD_RETPROBE, "Retprobe address must be an function entry"), \ C(BAD_RETPROBE, "Retprobe address must be an function entry"), \
C(BAD_ADDR_SUFFIX, "Invalid probed address suffix"), \ C(BAD_ADDR_SUFFIX, "Invalid probed address suffix"), \
C(NO_GROUP_NAME, "Group name is not specified"), \ C(NO_GROUP_NAME, "Group name is not specified"), \