libbpf: fallback to tracefs mount point if debugfs is not mounted
Andrii Nakryiko
maintainerPATCH v2 1/1 libbpf: fallback to tracefs mount point if debugfs is not mounted
Teach libbpf to fallback to tracefs mount point (/sys/kernel/tracing) if debugfs (/sys/kernel/debug/tracing) isn't mounted.
Acked-by Yonghong Song <[email protected]>
Suggested-by Connor O'Brien <[email protected]>
Signed-off-by Andrii Nakryiko <[email protected]>
--- tools/lib/bpf/libbpf.c | 61 +++++++++++++++++++++++++++--------------- 1 file changed, 40 insertions(+), 21 deletions(-)
tools/lib/bpf/libbpf.c +40 -21
@@ -9828,6 +9828,34 @@ static int append_to_file(const char *file, const char *fmt, ...)return err; } +#define DEBUGFS "/sys/kernel/debug/tracing" +#define TRACEFS "/sys/kernel/tracing" + +static bool use_debugfs (void ) +{ +static int has_debugfs =-1 ; + +if (has_debugfs <0 ) + has_debugfs =access (DEBUGFS ,F_OK ) ==0 ; + +return has_debugfs ==1 ; +} + +static const char *tracefs_path (void ) +{ +return use_debugfs () ?DEBUGFS :TRACEFS ; +} + +static const char *tracefs_kprobe_events (void ) +{ +return use_debugfs () ?DEBUGFS "/kprobe_events" :TRACEFS "/kprobe_events" ; +} + +static const char *tracefs_uprobe_events (void ) +{ +return use_debugfs () ?DEBUGFS "/uprobe_events" :TRACEFS "/uprobe_events" ; +} +static void gen_kprobe_legacy_event_name (char *buf,size_t buf_sz,const char *kfunc_name,size_t offset) {
@@ -9840,9 +9868,7 @@ static void gen_kprobe_legacy_event_name(char *buf, size_t buf_sz,static int add_kprobe_event_legacy (const char *probe_name,bool retprobe,const char *kfunc_name,size_t offset) { -const char *file ="/sys/kernel/debug/tracing/kprobe_events" ; - -return append_to_file (file,"%c:%s/%s %s+0x%zx" , +return append_to_file (tracefs_kprobe_events (),"%c:%s/%s %s+0x%zx" , retprobe ?'r' :'p' , retprobe ?"kretprobes" :"kprobes" , probe_name, kfunc_name, offset);
@@ -9850,18 +9876,16 @@ static int add_kprobe_event_legacy(const char *probe_name, bool retprobe,static int remove_kprobe_event_legacy (const char *probe_name,bool retprobe) { -const char *file ="/sys/kernel/debug/tracing/kprobe_events" ; - -return append_to_file (file,"-:%s/%s" , retprobe ?"kretprobes" :"kprobes" , probe_name); +return append_to_file (tracefs_kprobe_events (),"-:%s/%s" , + retprobe ?"kretprobes" :"kprobes" , probe_name); }static int determine_kprobe_perf_type_legacy (const char *probe_name,bool retprobe) {char file[256 ]; -snprintf (file,sizeof (file), -"/sys/kernel/debug/tracing/events/%s/%s/id" , - retprobe ?"kretprobes" :"kprobes" , probe_name); +snprintf (file,sizeof (file),"%s/events/%s/%s/id" , +tracefs_path (), retprobe ?"kretprobes" :"kprobes" , probe_name);return parse_uint_from_file (file,"%d\n" ); }
@@ -10213,9 +10237,7 @@ static void gen_uprobe_legacy_event_name(char *buf, size_t buf_sz,static inline int add_uprobe_event_legacy (const char *probe_name,bool retprobe,const char *binary_path,size_t offset) { -const char *file ="/sys/kernel/debug/tracing/uprobe_events" ; - -return append_to_file (file,"%c:%s/%s %s:0x%zx" , +return append_to_file (tracefs_uprobe_events (),"%c:%s/%s %s:0x%zx" , retprobe ?'r' :'p' , retprobe ?"uretprobes" :"uprobes" , probe_name, binary_path, offset);
@@ -10223,18 +10245,16 @@ static inline int add_uprobe_event_legacy(const char *probe_name, bool retprobe,static inline int remove_uprobe_event_legacy (const char *probe_name,bool retprobe) { -const char *file ="/sys/kernel/debug/tracing/uprobe_events" ; - -return append_to_file (file,"-:%s/%s" , retprobe ?"uretprobes" :"uprobes" , probe_name); +return append_to_file (tracefs_uprobe_events (),"-:%s/%s" , + retprobe ?"uretprobes" :"uprobes" , probe_name); }static int determine_uprobe_perf_type_legacy (const char *probe_name,bool retprobe) {char file[512 ]; -snprintf (file,sizeof (file), -"/sys/kernel/debug/tracing/events/%s/%s/id" , - retprobe ?"uretprobes" :"uprobes" , probe_name); +snprintf (file,sizeof (file),"%s/events/%s/%s/id" , +tracefs_path (), retprobe ?"uretprobes" :"uprobes" , probe_name);return parse_uint_from_file (file,"%d\n" ); }
@@ -10782,9 +10802,8 @@ static int determine_tracepoint_id(const char *tp_category,char file[PATH_MAX ];int ret; - ret =snprintf (file,sizeof (file), -"/sys/kernel/debug/tracing/events/%s/%s/id" , - tp_category, tp_name); + ret =snprintf (file,sizeof (file),"%s/events/%s/%s/id" , +tracefs_path (), tp_category, tp_name);if (ret <0 )return -errno;if (ret >=sizeof (file)) {
Signature · 1 line
2.30.2
This patch was applied to bpf/bpf-next.git (master) by Alexei Starovoitov <[email protected]>:
Hello:
This patch was applied to bpf/bpf-next.git (master) by Alexei Starovoitov <[email protected]>:
Quoted 8 lines · On Fri, 15 Jul 2022 11:57:36 -0700 you wrote:
Teach libbpf to fallback to tracefs mount point (
/sys/kernel/tracing) if debugfs (/sys/kernel/debug/tracing) isn't mounted.Acked-by Yonghong Song <[email protected]>Suggested-by Connor O'Brien <[email protected]>Signed-off-by Andrii Nakryiko <[email protected]>[...]
Here is the summary with links:
- [v2,bpf-next] libbpf: fallback to tracefs mount point if debugfs is not mounted
https://git.kernel.org/bpf/bpf-next/c/a1ac9fd6c650
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html