Skip to contentSkip to conversation

Fix broken samples due to symbol mismatch

PATCH Applied Daniel T. Lee 2 participants 4 messages Dec 5, 2019 – Dec 12, 2019

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

v2 cover Fix broken samples due to symbol mismatch

Currently, there are broken samples due to symbol mismatch (missing or unused symbols). For example, the function open() calls the syscall 'sys_openat' instead of 'sys_open'. And there are no exact symbols such as 'sys_read' or 'sys_write' under kallsyms, instead the symbols have prefixes. And these error leads to broke of samples.

This Patchset fixes the problem by changing the symbol match.

Changes in v2:
- remove redundant casting

Daniel T. Lee (2):
samples: bpf: replace symbol compare of trace_event
samples: bpf: fix syscall_tp due to unused syscall

 samples/bpf/syscall_tp_kern.c  | 18 ++++++++++++++++--
 samples/bpf/trace_event_user.c |  4 ++--
 2 files changed, 18 insertions(+), 4 deletions(-)
Signature · 1 line
2.24.0
#1 lore raw

PATCH v2 1/2 samples: bpf: replace symbol compare of trace_event

Previously, when this sample is added, commit 1c47910ef8013 ("samples/bpf: add perf_event+bpf example"), a symbol 'sys_read' and 'sys_write' has been used without no prefixes. But currently there are no exact symbols with these under kallsyms and this leads to failure.

This commit changes exact compare to substring compare to keep compatible with exact symbol or prefixed symbol.

Fixes 1c47910ef8013 ("samples/bpf: add perf_event+bpf example")
---
 samples/bpf/trace_event_user.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
samples/bpf/trace_event_user.c +2 -2
index 16a16eadd509..749a50f2f9f3 100644
@@ -37,9 +37,9 @@ static void print_ksym(__u64 addr)
 	}
 
 	printf("%s;", sym->name);
-	if (!strcmp(sym->name, "sys_read"))
+	if (!strstr(sym->name, "sys_read"))
 		sys_read_seen = true;
-	else if (!strcmp(sym->name, "sys_write"))
+	else if (!strstr(sym->name, "sys_write"))
 		sys_write_seen = true;
 }
 
Signature · 1 line
2.24.0
#2 lore raw

PATCH v2 2/2 samples: bpf: fix syscall_tp due to unused syscall

In reply to Daniel T. Lee

Currently, open() is called from the user program and it calls the syscall 'sys_openat', not the 'sys_open'. This leads to an error of the program of user side, due to the fact that the counter maps are zero since no function such 'sys_open' is called.

This commit adds the kernel bpf program which are attached to the tracepoint 'sys_enter_openat' and 'sys_enter_openat'.

Fixes 1da236b6be963 ("bpf: add a test case for syscalls/sys_{enter|exit}_* tracepoints")

---
Changes in v2:
- Remove redundant casting

 samples/bpf/syscall_tp_kern.c | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)
samples/bpf/syscall_tp_kern.c +16 -2
index 1d78819ffef1..630ce8c4d5a2 100644
@@ -47,13 +47,27 @@ static __always_inline void count(void *map)
 SEC("tracepoint/syscalls/sys_enter_open")
 int trace_enter_open(struct syscalls_enter_open_args *ctx)
 {
-	count((void *)&enter_open_map);
+	count(&enter_open_map);
+	return 0;
+}
+
+SEC("tracepoint/syscalls/sys_enter_openat")
+int trace_enter_open_at(struct syscalls_enter_open_args *ctx)
+{
+	count(&enter_open_map);
 	return 0;
 }
 
 SEC("tracepoint/syscalls/sys_exit_open")
 int trace_enter_exit(struct syscalls_exit_open_args *ctx)
 {
-	count((void *)&exit_open_map);
+	count(&exit_open_map);
+	return 0;
+}
+
+SEC("tracepoint/syscalls/sys_exit_openat")
+int trace_enter_exit_at(struct syscalls_exit_open_args *ctx)
+{
+	count(&exit_open_map);
 	return 0;
 }
Signature · 1 line
2.24.0
#3 lore raw
In reply to Daniel T. Lee
Quoted 11 lines · Daniel T. Lee

Currently, there are broken samples due to symbol mismatch (missing or unused symbols). For example, the function open() calls the syscall 'sys_openat' instead of 'sys_open'. And there are no exact symbols such as 'sys_read' or 'sys_write' under kallsyms, instead the symbols have prefixes. And these error leads to broke of samples.

This Patchset fixes the problem by changing the symbol match.

Changes in v2:
- remove redundant casting

Applied to bpf tree. Thanks