bpf: Add trampoline and dispatcher to /proc/kallsyms
Subsystems (8)
Jiri Olsa
reviewerv5 cover bpf: Add trampoline and dispatcher to /proc/kallsyms
hi,
this patchset adds trampoline and dispatcher objects to be visible in /proc/kallsyms. The last patch also adds sorting for all bpf objects in /proc/kallsyms.
$ sudo cat /proc/kallsyms | tail -20 ... ffffffffa050f000 t bpf_prog_5a2b06eab81b8f51 [bpf] ffffffffa0511000 t bpf_prog_6deef7357e7b4530 [bpf] ffffffffa0542000 t bpf_trampoline_13832 [bpf] ffffffffa0548000 t bpf_prog_96f1b5bf4e4cc6dc_mutex_lock [bpf] ffffffffa0572000 t bpf_prog_d1c63e29ad82c4ab_bpf_prog1 [bpf] ffffffffa0585000 t bpf_prog_e314084d332a5338__dissect [bpf] ffffffffa0587000 t bpf_prog_59785a79eac7e5d2_mutex_unlock [bpf] ffffffffa0589000 t bpf_prog_d0db6e0cac050163_mutex_lock [bpf] ffffffffa058d000 t bpf_prog_d8f047721e4d8321_bpf_prog2 [bpf] ffffffffa05df000 t bpf_trampoline_25637 [bpf] ffffffffa05e3000 t bpf_prog_d8f047721e4d8321_bpf_prog2 [bpf] ffffffffa05e5000 t bpf_prog_3b185187f1855c4c [bpf] ffffffffa05e7000 t bpf_prog_d8f047721e4d8321_bpf_prog2 [bpf] ffffffffa05eb000 t bpf_prog_93cebb259dd5c4b2_do_sys_open [bpf] ffffffffa0677000 t bpf_dispatcher_xdp [bpf]
v5 changes:
- keeping just 1 bpf_tree for all the objects and adding flag to recognize bpf_objects when searching for exception tables [Alexei]
- no need for is_bpf_image_address call in kernel_text_address [Alexei]
- removed the bpf_image tree, because it's no longer needed
v4 changes:
- add trampoline and dispatcher to kallsyms once the it's allocated [Alexei]
- omit the symbols sorting for kallsyms [Alexei]
- small title change in one patch [Song]
- some function renames:
bpf_get_prog_name to bpf_prog_ksym_set_name bpf_get_prog_addr_region to bpf_prog_ksym_set_addr
- added acks to changelogs
- I checked and there'll be conflict on perftool side with upcoming changes from Adrian Hunter (text poke events),
so I think it's better if Arnaldo takes the perf changes
via perf tree and we will solve all conflicts there
v3 changes:
- use container_of directly in bpf_get_ksym_start [Daniel]
- add more changelog explanations for ksym addresses [Daniel]
v2 changes:
- omit extra condition in __bpf_ksym_add for sorting code (Andrii)
- rename bpf_kallsyms_tree_ops to bpf_ksym_tree (Andrii)
- expose only executable code in kallsyms (Andrii)
- use full trampoline key as its kallsyms id (Andrii)
- explained the BPF_TRAMP_REPLACE case (Andrii)
- small format changes in bpf_trampoline_link_prog/bpf_trampoline_unlink_prog (Andrii)
- propagate error value in bpf_dispatcher_update and update kallsym if it's successful (Andrii)
- get rid of __always_inline for bpf_ksym_tree callbacks (Andrii)
- added KSYMBOL notification for bpf_image add/removal
- added perf tools changes to properly display trampoline/dispatcher
For perf tool to properly display trampoline/dispatcher you need also Arnaldo's perf/urgent branch changes. I merged everything into following branch:
git://git.kernel.org/pub/scm/linux/kernel/git/jolsa/perf.git bpf/kallsyms
thanks,
jirka
---
Björn Töpel (1):
bpf: Add bpf_trampoline_ name prefix for DECLARE_BPF_DISPATCHER
Jiri Olsa (14):
x86/mm: Rename is_kernel_text to __is_kernel_text
bpf: Add struct bpf_ksym
bpf: Add name to struct bpf_ksym
bpf: Move lnode list node to struct bpf_ksym
bpf: Move ksym_tnode to bpf_ksym
bpf: Add bpf_ksym_find function
bpf: Add prog flag to struct bpf_ksym object
bpf: Add bpf_ksym_add/del functions
bpf: Add trampolines to kallsyms
bpf: Add dispatchers to kallsyms
bpf: Remove bpf_image tree
perf tools: Synthesize bpf_trampoline/dispatcher ksymbol event perf tools: Set ksymbol dso as loaded on arrival perf annotate: Add base support for bpf_image
arch/x86/mm/init_32.c | 14 +++++++++----- include/linux/bpf.h | 65 ++++++++++++++++++++++++++++++++++++++++------------------------- include/linux/filter.h | 15 ++++----------- kernel/bpf/core.c | 120 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------------- kernel/bpf/dispatcher.c | 5 +++-- kernel/bpf/trampoline.c | 85 +++++++++++++++++++++++++------------------------------------------------------------ kernel/events/core.c | 9 ++++----- kernel/extable.c | 2 -- net/core/filter.c | 5 ++--- tools/perf/util/annotate.c | 20 ++++++++++++++++++++ tools/perf/util/bpf-event.c | 92 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ tools/perf/util/dso.c | 1 + tools/perf/util/dso.h | 1 + tools/perf/util/machine.c | 12 ++++++++++++ tools/perf/util/symbol.c | 1 + 15 files changed, 278 insertions(+), 169 deletions(-)
Jiri Olsa
reviewerPATCH v5 1/15 x86/mm: Rename is_kernel_text to __is_kernel_text
The kbuild test robot reported compile issue on x86 in one of the following patches that adds <linux/kallsyms.h> include into <linux/bpf.h>, which is picked up by init_32.c object.
The problem is that <linux/kallsyms.h> defines global function is_kernel_text which colides with the static function of the same name defined in init_32.c:
$ make ARCH=i386 ...
Quoted 1 line
Quoted 1 line
arch/x86/mm/init_32.c:241:19: error: redefinition of 'is_kernel_text'
static inline int is_kernel_text(unsigned long addr)
^~~~~~~~~~~~~~
In file included from include/linux/bpf.h:21:0,
from include/linux/bpf-cgroup.h:5,
from include/linux/cgroup-defs.h:22,
from include/linux/cgroup.h:28,
from include/linux/hugetlb.h:9,
from arch/x86/mm/init_32.c:18: include/linux/kallsyms.h:31:19: note: previous definition of 'is_kernel_text' was here
static inline int is_kernel_text(unsigned long addr)
Renaming the init_32.c is_kernel_text function to __is_kernel_text.
--- arch/x86/mm/init_32.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-)
arch/x86/mm/init_32.c +9 -5
@@ -238,7 +238,11 @@ page_table_range_init(unsigned long start, unsigned long end, pgd_t *pgd_base) } } -static inline int is_kernel_text (unsigned long addr) +/* +* The <linux/kallsyms.h> already defines is_kernel_text, +* using '__' prefix not to get in conflict. +*/ +static inline int __is_kernel_text (unsigned long addr) {if (addr >= (unsigned long )_text && addr <= (unsigned long )__init_end)return 1 ;
@@ -328,8 +332,8 @@ kernel_physical_mapping_init(unsigned long start, addr2 = (pfn +PTRS_PER_PTE -1 ) *PAGE_SIZE +PAGE_OFFSET +PAGE_SIZE -1 ; -if (is_kernel_text (addr) || -is_kernel_text (addr2)) +if (__is_kernel_text (addr) || +__is_kernel_text (addr2)) prot =PAGE_KERNEL_LARGE_EXEC ; pages_2m++;
@@ -354,7 +358,7 @@ kernel_physical_mapping_init(unsigned long start,*/ pgprot_t init_prot =__pgprot (PTE_IDENT_ATTR ); -if (is_kernel_text (addr)) +if (__is_kernel_text (addr)) prot =PAGE_KERNEL_EXEC ; pages_4k++;
@@ -881,7 +885,7 @@ static void mark_nxdata_nx(void)*/ unsigned long start =PFN_ALIGN (_etext);/* -* This comes from is_kernel_text upper limit. Also HPAGE where used: +* This comes from __is_kernel_text upper limit. Also HPAGE where used: */ unsigned long size = (((unsigned long )__init_end +HPAGE_SIZE ) &HPAGE_MASK ) - start;
Signature · 1 line
2.24.1
Jiri Olsa
reviewerPATCH v5 2/15 bpf: Add bpf_trampoline_ name prefix for DECLARE_BPF_DISPATCHER
In reply to Jiri OlsaFrom: Björn Töpel <[email protected]>
Adding bpf_trampoline_ name prefix for DECLARE_BPF_DISPATCHER, so all the dispatchers have the common name prefix.
And also a small '_' cleanup for bpf_dispatcher_nopfunc function name.
--- include/linux/bpf.h | 21 +++++++++++---------- include/linux/filter.h | 9 ++++----- net/core/filter.c | 5 ++--- 3 files changed, 17 insertions(+), 18 deletions(-)
include/linux/bpf.h +11 -10
@@ -522,7 +522,7 @@ struct bpf_dispatcher {u32 image_off; }; -static __always_inline unsigned int bpf_dispatcher_nopfunc( +static __always_inline unsigned int bpf_dispatcher_nop_func( const void *ctx, const struct bpf_insn *insnsi, unsigned int (*bpf_func)(const void *,
@@ -537,7 +537,7 @@ int bpf_trampoline_unlink_prog(struct bpf_prog *prog);void bpf_trampoline_put (struct bpf_trampoline *tr);#define BPF_DISPATCHER_INIT (name) { \ .mutex = __MUTEX_INITIALIZER(name.mutex), \ - .func = &name##func, \ + .func = &name##_func, \ .progs = {}, \ .num_progs = 0, \ .image = NULL, \
@@ -545,7 +545,7 @@ void bpf_trampoline_put(struct bpf_trampoline *tr); }#define DEFINE_BPF_DISPATCHER (name) \ - noinline unsigned int name##func( \ + noinline unsigned int bpf_dispatcher_##name##_func( \ const void *ctx, \ const struct bpf_insn *insnsi, \ unsigned int (*bpf_func)(const void *, \
@@ -553,17 +553,18 @@ void bpf_trampoline_put(struct bpf_trampoline *tr); { \return bpf_func (ctx, insnsi); \ } \ - EXPORT_SYMBOL(name##func); \ -struct bpf_dispatcher name =BPF_DISPATCHER_INIT (name); + EXPORT_SYMBOL(bpf_dispatcher_##name##_func); \ + struct bpf_dispatcher bpf_dispatcher_##name = \ + BPF_DISPATCHER_INIT(bpf_dispatcher_##name);#define DECLARE_BPF_DISPATCHER (name) \ - unsigned int name##func( \ + unsigned int bpf_dispatcher_##name##_func( \ const void *ctx, \ const struct bpf_insn *insnsi, \ unsigned int (*bpf_func)(const void *, \ const struct bpf_insn *)); \ - extern struct bpf_dispatcher name; -#define BPF_DISPATCHER_FUNC (name) name##func -#define BPF_DISPATCHER_PTR (name) (&name) + extern struct bpf_dispatcher bpf_dispatcher_##name; +#define BPF_DISPATCHER_FUNC (name) bpf_dispatcher_##name##_func +#define BPF_DISPATCHER_PTR (name) (&bpf_dispatcher_##name)void bpf_dispatcher_change_prog (struct bpf_dispatcher *d,struct bpf_prog *from,struct bpf_prog *to);struct bpf_image {
@@ -589,7 +590,7 @@ static inline int bpf_trampoline_unlink_prog(struct bpf_prog *prog)static inline void bpf_trampoline_put (struct bpf_trampoline *tr) {}#define DEFINE_BPF_DISPATCHER (name)#define DECLARE_BPF_DISPATCHER (name) -#define BPF_DISPATCHER_FUNC (name) bpf_dispatcher_nopfunc +#define BPF_DISPATCHER_FUNC (name) bpf_dispatcher_nop_func#define BPF_DISPATCHER_PTR (name) NULL static inline void bpf_dispatcher_change_prog(struct bpf_dispatcher *d, struct bpf_prog *from,
include/linux/filter.h +4 -5
@@ -577,7 +577,7 @@ DECLARE_STATIC_KEY_FALSE(bpf_stats_enabled_key); ret; })#define BPF_PROG_RUN (prog, ctx) \ - __BPF_PROG_RUN(prog, ctx, bpf_dispatcher_nopfunc) + __BPF_PROG_RUN(prog, ctx, bpf_dispatcher_nop_func)/* * Use in preemptible and therefore migratable context to make sure that
@@ -596,7 +596,7 @@ static inline u32 bpf_prog_run_pin_on_cpu(const struct bpf_prog *prog,u32 ret;migrate_disable (); - ret =__BPF_PROG_RUN (prog, ctx, bpf_dispatcher_nopfunc); + ret =__BPF_PROG_RUN (prog, ctx, bpf_dispatcher_nop_func);migrate_enable ();return ret; }
@@ -722,7 +722,7 @@ static inline u32 bpf_prog_run_clear_cb(const struct bpf_prog *prog,return res; } -DECLARE_BPF_DISPATCHER (bpf_dispatcher_xdp) +DECLARE_BPF_DISPATCHER (xdp) static __always_inline u32 bpf_prog_run_xdp(const struct bpf_prog *prog,struct xdp_buff *xdp)
@@ -733,8 +733,7 @@ static __always_inline u32 bpf_prog_run_xdp(const struct bpf_prog *prog,* already takes rcu_read_lock() when fetching the program, so * it's not necessary here anymore. */ -return __BPF_PROG_RUN (prog, xdp, -BPF_DISPATCHER_FUNC (bpf_dispatcher_xdp)); +return __BPF_PROG_RUN (prog, xdp,BPF_DISPATCHER_FUNC (xdp)); }void bpf_prog_change_xdp (struct bpf_prog *prev_prog,struct bpf_prog *prog);
net/core/filter.c +2 -3
@@ -8845,10 +8845,9 @@ const struct bpf_prog_ops sk_reuseport_prog_ops = { };#endif /* CONFIG_INET */ -DEFINE_BPF_DISPATCHER (bpf_dispatcher_xdp) +DEFINE_BPF_DISPATCHER (xdp) void bpf_prog_change_xdp(struct bpf_prog *prev_prog, struct bpf_prog *prog) { -bpf_dispatcher_change_prog (BPF_DISPATCHER_PTR (bpf_dispatcher_xdp), - prev_prog, prog); +bpf_dispatcher_change_prog (BPF_DISPATCHER_PTR (xdp), prev_prog, prog); }
Signature · 1 line
2.24.1
Jiri Olsa
reviewerPATCH v5 3/15 bpf: Add struct bpf_ksym
In reply to Jiri OlsaAdding 'struct bpf_ksym' object that will carry the kallsym information for bpf symbol. Adding the start and end address to begin with. It will be used by bpf_prog, bpf_trampoline, bpf_dispatcher objects.
The symbol_start/symbol_end values were originally used to sort bpf_prog objects. For the address displayed in /proc/kallsyms we are using prog->bpf_func value.
I'm using the bpf_func value for program symbol start instead of the symbol_start, because it makes no difference for sorting bpf_prog objects and we can use it directly as an address to display it in /proc/kallsyms.
--- include/linux/bpf.h | 6 ++++++ kernel/bpf/core.c | 28 ++++++++++++---------------- 2 files changed, 18 insertions(+), 16 deletions(-)
include/linux/bpf.h +6 -0
@@ -471,6 +471,11 @@ int arch_prepare_bpf_trampoline(void *image, void *image_end, u64 notrace __bpf_prog_enter(void); void notrace __bpf_prog_exit(struct bpf_prog *prog, u64 start); +struct bpf_ksym { +unsigned long start; +unsigned long end; +}; +enum bpf_tramp_prog_type {BPF_TRAMP_FENTRY ,BPF_TRAMP_FEXIT ,
@@ -653,6 +658,7 @@ struct bpf_prog_aux {u32 size_poke_tab;struct latch_tree_node ksym_tnode;struct list_head ksym_lnode; +struct bpf_ksym ksym;const struct bpf_prog_ops *ops;struct bpf_map **used_maps;struct bpf_prog *prog;
kernel/bpf/core.c +12 -16
@@ -523,18 +523,16 @@ int bpf_jit_kallsyms __read_mostly = IS_BUILTIN(CONFIG_BPF_JIT_DEFAULT_ON);int bpf_jit_harden__read_mostly ;long bpf_jit_limit__read_mostly ; -static __always_inline void -bpf_get_prog_addr_region (const struct bpf_prog *prog, -unsigned long *symbol_start, -unsigned long *symbol_end) +static void +bpf_prog_ksym_set_addr (struct bpf_prog *prog) {const struct bpf_binary_header *hdr =bpf_jit_binary_hdr (prog);unsigned long addr = (unsigned long )hdr;WARN_ON_ONCE (!bpf_prog_ebpf_jited (prog)); - *symbol_start = addr; - *symbol_end = addr + hdr->pages *PAGE_SIZE ; + prog->aux->ksym.start = (unsigned long ) prog->bpf_func; + prog->aux->ksym.end = addr + hdr->pages *PAGE_SIZE ; }void bpf_get_prog_name (const struct bpf_prog *prog,char *sym)
@@ -575,13 +573,10 @@ void bpf_get_prog_name(const struct bpf_prog *prog, char *sym)static __always_inline unsigned long bpf_get_prog_addr_start (struct latch_tree_node *n) { -unsigned long symbol_start, symbol_end;const struct bpf_prog_aux *aux; aux = container_of(n, struct bpf_prog_aux, ksym_tnode); -bpf_get_prog_addr_region (aux->prog, &symbol_start, &symbol_end); - -return symbol_start; +return aux->ksym.start; } static __always_inline bool bpf_tree_less(struct latch_tree_node *a,
@@ -593,15 +588,13 @@ static __always_inline bool bpf_tree_less(struct latch_tree_node *a, static __always_inline int bpf_tree_comp(void *key, struct latch_tree_node *n) {unsigned long val = (unsigned long )key; -unsigned long symbol_start, symbol_end;const struct bpf_prog_aux *aux; aux = container_of(n, struct bpf_prog_aux, ksym_tnode); -bpf_get_prog_addr_region (aux->prog, &symbol_start, &symbol_end); -if (val < symbol_start) +if (val < aux->ksym.start)return -1 ; -if (val >= symbol_end) +if (val >= aux->ksym.end)return 1 ;return 0 ;
@@ -649,6 +642,8 @@ void bpf_prog_kallsyms_add(struct bpf_prog *fp) !capable(CAP_SYS_ADMIN))return ; +bpf_prog_ksym_set_addr (fp); +spin_lock_bh (&bpf_lock);bpf_prog_ksym_node_add (fp->aux);spin_unlock_bh (&bpf_lock);
@@ -677,14 +672,15 @@ static struct bpf_prog *bpf_prog_kallsyms_find(unsigned long addr)const char *__bpf_address_lookup (unsigned long addr,unsigned long *size,unsigned long *off,char *sym) { -unsigned long symbol_start, symbol_end;struct bpf_prog *prog;char *ret =NULL ;rcu_read_lock (); prog =bpf_prog_kallsyms_find (addr);if (prog) { -bpf_get_prog_addr_region (prog, &symbol_start, &symbol_end); +unsigned long symbol_start = prog->aux->ksym.start; +unsigned long symbol_end = prog->aux->ksym.end; +bpf_get_prog_name (prog, sym); ret = sym;
Signature · 1 line
2.24.1
Jiri Olsa
reviewerPATCH v5 4/15 bpf: Add name to struct bpf_ksym
In reply to Jiri OlsaAdding name to 'struct bpf_ksym' object to carry the name of the symbol for bpf_prog, bpf_trampoline, bpf_dispatcher objects.
The current benefit is that name is now generated only when the symbol is added to the list, so we don't need to generate it every time it's accessed.
The future benefit is that we will have all the bpf objects symbols represented by struct bpf_ksym.
--- include/linux/bpf.h | 2 ++ include/linux/filter.h | 6 ------ kernel/bpf/core.c | 9 ++++++--- kernel/events/core.c | 9 ++++----- 4 files changed, 12 insertions(+), 14 deletions(-)
include/linux/bpf.h +2 -0
@@ -18,6 +18,7 @@#include <linux/refcount.h> #include <linux/mutex.h> #include <linux/module.h> +#include <linux/kallsyms.h> struct bpf_verifier_env ;struct bpf_verifier_log ;
@@ -474,6 +475,7 @@ void notrace __bpf_prog_exit(struct bpf_prog *prog, u64 start);struct bpf_ksym {unsigned long start;unsigned long end; +char name[KSYM_NAME_LEN ]; };enum bpf_tramp_prog_type {
include/linux/filter.h +0 -6
@@ -1083,7 +1083,6 @@ bpf_address_lookup(unsigned long addr, unsigned long *size,void bpf_prog_kallsyms_add (struct bpf_prog *fp);void bpf_prog_kallsyms_del (struct bpf_prog *fp); -void bpf_get_prog_name (const struct bpf_prog *prog,char *sym);#else /* CONFIG_BPF_JIT */
@@ -1152,11 +1151,6 @@ static inline void bpf_prog_kallsyms_del(struct bpf_prog *fp) { } -static inline void bpf_get_prog_name (const struct bpf_prog *prog,char *sym) -{ - sym[0 ] ='\0' ; -} -#endif /* CONFIG_BPF_JIT */ void bpf_prog_kallsyms_del_all (struct bpf_prog *fp);
kernel/bpf/core.c +6 -3
@@ -535,8 +535,10 @@ bpf_prog_ksym_set_addr(struct bpf_prog *prog) prog->aux->ksym.end = addr + hdr->pages *PAGE_SIZE ; } -void bpf_get_prog_name (const struct bpf_prog *prog,char *sym) +static void +bpf_prog_ksym_set_name (struct bpf_prog *prog) { +char *sym = prog->aux->ksym.name;const char *end = sym +KSYM_NAME_LEN ;const struct btf_type *type;const char *func_name;
@@ -643,6 +645,7 @@ void bpf_prog_kallsyms_add(struct bpf_prog *fp)return ;bpf_prog_ksym_set_addr (fp); +bpf_prog_ksym_set_name (fp);spin_lock_bh (&bpf_lock);bpf_prog_ksym_node_add (fp->aux);
@@ -681,7 +684,7 @@ const char *__bpf_address_lookup(unsigned long addr, unsigned long *size,unsigned long symbol_start = prog->aux->ksym.start;unsigned long symbol_end = prog->aux->ksym.end; -bpf_get_prog_name (prog, sym); +strncpy (sym, prog->aux->ksym.name,KSYM_NAME_LEN ); ret = sym;if (size)
@@ -738,7 +741,7 @@ int bpf_get_kallsym(unsigned int symnum, unsigned long *value, char *type,if (it++ != symnum)continue ; -bpf_get_prog_name (aux->prog, sym); +strncpy (sym, aux->ksym.name,KSYM_NAME_LEN ); *value = (unsigned long )aux->prog->bpf_func; *type =BPF_SYM_ELF_TYPE ;
kernel/events/core.c +4 -5
@@ -8255,23 +8255,22 @@ static void perf_event_bpf_emit_ksymbols(struct bpf_prog *prog, enum perf_bpf_event_type type) {bool unregister = type ==PERF_BPF_EVENT_PROG_UNLOAD ; -char sym[KSYM_NAME_LEN ];int i;if (prog->aux->func_cnt ==0 ) { -bpf_get_prog_name (prog, sym);perf_event_ksymbol (PERF_RECORD_KSYMBOL_TYPE_BPF , (u64 )(unsigned long )prog->bpf_func, - prog->jited_len, unregister, sym); + prog->jited_len, unregister, + prog->aux->ksym.name); }else {for (i =0 ; i < prog->aux->func_cnt; i++) {struct bpf_prog *subprog = prog->aux->func[i]; -bpf_get_prog_name (subprog, sym);perf_event_ksymbol (PERF_RECORD_KSYMBOL_TYPE_BPF , (u64 )(unsigned long )subprog->bpf_func, - subprog->jited_len, unregister, sym); + subprog->jited_len, unregister, + prog->aux->ksym.name); } } }
Signature · 1 line
2.24.1
Jiri Olsa
reviewerPATCH v5 5/15 bpf: Move lnode list node to struct bpf_ksym
In reply to Jiri OlsaAdding lnode list node to 'struct bpf_ksym' object, so the struct bpf_ksym itself can be chained and used in other objects like bpf_trampoline and bpf_dispatcher.
Changing iterator to bpf_ksym in bpf_get_kallsym function.
The ksym->start is holding the prog->bpf_func value, so it's ok to use it as value in bpf_get_kallsym.
--- include/linux/bpf.h | 2 +- kernel/bpf/core.c | 22 +++++++++++----------- 2 files changed, 12 insertions(+), 12 deletions(-)
include/linux/bpf.h +1 -1
@@ -476,6 +476,7 @@ struct bpf_ksym {unsigned long start;unsigned long end;char name[KSYM_NAME_LEN ]; +struct list_head lnode; };enum bpf_tramp_prog_type {
@@ -659,7 +660,6 @@ struct bpf_prog_aux {struct bpf_jit_poke_descriptor *poke_tab;u32 size_poke_tab;struct latch_tree_node ksym_tnode; -struct list_head ksym_lnode;struct bpf_ksym ksym;const struct bpf_prog_ops *ops;struct bpf_map **used_maps;
kernel/bpf/core.c +11 -11
@@ -97,7 +97,7 @@ struct bpf_prog *bpf_prog_alloc_no_stats(unsigned int size, gfp_t gfp_extra_flag fp->aux->prog = fp; fp->jit_requested =ebpf_jit_enabled (); -INIT_LIST_HEAD_RCU (&fp->aux->ksym_lnode); +INIT_LIST_HEAD_RCU (&fp->aux->ksym.lnode);return fp; }
@@ -613,18 +613,18 @@ static struct latch_tree_root bpf_tree __cacheline_aligned;static void bpf_prog_ksym_node_add (struct bpf_prog_aux *aux) { -WARN_ON_ONCE (!list_empty (&aux->ksym_lnode)); -list_add_tail_rcu (&aux->ksym_lnode, &bpf_kallsyms); +WARN_ON_ONCE (!list_empty (&aux->ksym.lnode)); +list_add_tail_rcu (&aux->ksym.lnode, &bpf_kallsyms);latch_tree_insert (&aux->ksym_tnode, &bpf_tree, &bpf_tree_ops); }static void bpf_prog_ksym_node_del (struct bpf_prog_aux *aux) { -if (list_empty (&aux->ksym_lnode)) +if (list_empty (&aux->ksym.lnode))return ;latch_tree_erase (&aux->ksym_tnode, &bpf_tree, &bpf_tree_ops); -list_del_rcu (&aux->ksym_lnode); +list_del_rcu (&aux->ksym.lnode); }static bool bpf_prog_kallsyms_candidate (const struct bpf_prog *fp)
@@ -634,8 +634,8 @@ static bool bpf_prog_kallsyms_candidate(const struct bpf_prog *fp)static bool bpf_prog_kallsyms_verify_off (const struct bpf_prog *fp) { -return list_empty (&fp->aux->ksym_lnode) || - fp->aux->ksym_lnode.prev ==LIST_POISON2 ; +return list_empty (&fp->aux->ksym.lnode) || + fp->aux->ksym.lnode.prev ==LIST_POISON2 ; }void bpf_prog_kallsyms_add (struct bpf_prog *fp)
@@ -729,7 +729,7 @@ const struct exception_table_entry *search_bpf_extables(unsigned long addr)int bpf_get_kallsym (unsigned int symnum,unsigned long *value,char *type,char *sym) { -struct bpf_prog_aux *aux; +struct bpf_ksym *ksym;unsigned int it =0 ;int ret = -ERANGE ;
@@ -737,13 +737,13 @@ int bpf_get_kallsym(unsigned int symnum, unsigned long *value, char *type,return ret;rcu_read_lock (); -list_for_each_entry_rcu (aux, &bpf_kallsyms, ksym_lnode) { +list_for_each_entry_rcu (ksym, &bpf_kallsyms, lnode) {if (it++ != symnum)continue ; -strncpy (sym, aux->ksym.name,KSYM_NAME_LEN ); +strncpy (sym, ksym->name,KSYM_NAME_LEN ); - *value = (unsigned long )aux->prog->bpf_func; + *value = ksym->start; *type =BPF_SYM_ELF_TYPE ; ret =0 ;
Signature · 1 line
2.24.1
Jiri Olsa
reviewerPATCH v5 6/15 bpf: Move ksym_tnode to bpf_ksym
In reply to Jiri OlsaMoving ksym_tnode list node to 'struct bpf_ksym' object, so the symbol itself can be chained and used in other objects like bpf_trampoline and bpf_dispatcher.
We need bpf_ksym object to be linked both in bpf_kallsyms via lnode for /proc/kallsyms and in bpf_tree via tnode for bpf address lookup functions like __bpf_address_lookup or bpf_prog_kallsyms_find.
--- include/linux/bpf.h | 2 +- kernel/bpf/core.c | 24 ++++++++++-------------- 2 files changed, 11 insertions(+), 15 deletions(-)
include/linux/bpf.h +1 -1
@@ -477,6 +477,7 @@ struct bpf_ksym {unsigned long end;char name[KSYM_NAME_LEN ];struct list_head lnode; +struct latch_tree_node tnode; };enum bpf_tramp_prog_type {
@@ -659,7 +660,6 @@ struct bpf_prog_aux {void *jit_data;/* JIT specific data. arch dependent */ struct bpf_jit_poke_descriptor *poke_tab;u32 size_poke_tab; -struct latch_tree_node ksym_tnode;struct bpf_ksym ksym;const struct bpf_prog_ops *ops;struct bpf_map **used_maps;
kernel/bpf/core.c +10 -14
@@ -572,31 +572,27 @@ bpf_prog_ksym_set_name(struct bpf_prog *prog) *sym =0 ; } -static __always_inline unsigned long -bpf_get_prog_addr_start (struct latch_tree_node *n) +static unsigned long bpf_get_ksym_start (struct latch_tree_node *n) { -const struct bpf_prog_aux *aux; - - aux = container_of(n, struct bpf_prog_aux, ksym_tnode); -return aux->ksym.start; + return container_of(n, struct bpf_ksym, tnode)->start; } static __always_inline bool bpf_tree_less(struct latch_tree_node *a,struct latch_tree_node *b) { -return bpf_get_prog_addr_start (a) <bpf_get_prog_addr_start (b); +return bpf_get_ksym_start (a) <bpf_get_ksym_start (b); } static __always_inline int bpf_tree_comp(void *key, struct latch_tree_node *n) {unsigned long val = (unsigned long )key; -const struct bpf_prog_aux *aux; +const struct bpf_ksym *ksym; - aux = container_of(n, struct bpf_prog_aux, ksym_tnode); + ksym = container_of(n, struct bpf_ksym, tnode); -if (val < aux->ksym.start) +if (val < ksym->start)return -1 ; -if (val >= aux->ksym.end) +if (val >= ksym->end)return 1 ;return 0 ;
@@ -615,7 +611,7 @@ static void bpf_prog_ksym_node_add(struct bpf_prog_aux *aux) {WARN_ON_ONCE (!list_empty (&aux->ksym.lnode));list_add_tail_rcu (&aux->ksym.lnode, &bpf_kallsyms); -latch_tree_insert (&aux->ksym_tnode, &bpf_tree, &bpf_tree_ops); +latch_tree_insert (&aux->ksym.tnode, &bpf_tree, &bpf_tree_ops); }static void bpf_prog_ksym_node_del (struct bpf_prog_aux *aux)
@@ -623,7 +619,7 @@ static void bpf_prog_ksym_node_del(struct bpf_prog_aux *aux)if (list_empty (&aux->ksym.lnode))return ; -latch_tree_erase (&aux->ksym_tnode, &bpf_tree, &bpf_tree_ops); +latch_tree_erase (&aux->ksym.tnode, &bpf_tree, &bpf_tree_ops);list_del_rcu (&aux->ksym.lnode); }
@@ -668,7 +664,7 @@ static struct bpf_prog *bpf_prog_kallsyms_find(unsigned long addr) n =latch_tree_find ((void *)addr, &bpf_tree, &bpf_tree_ops);return n ? - container_of(n, struct bpf_prog_aux, ksym_tnode)->prog : + container_of(n, struct bpf_prog_aux, ksym.tnode)->prog :NULL ; }
Signature · 1 line
2.24.1
Jiri Olsa
reviewerPATCH v5 7/15 bpf: Add bpf_ksym_find function
In reply to Jiri OlsaAdding bpf_ksym_find function that is used bpf bpf address lookup functions:
__bpf_address_lookup
is_bpf_text_address
while keeping bpf_prog_kallsyms_find to be used only for lookup of bpf_prog objects (will happen in following changes).
--- kernel/bpf/core.c | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-)
kernel/bpf/core.c +15 -7
@@ -668,19 +668,27 @@ static struct bpf_prog *bpf_prog_kallsyms_find(unsigned long addr)NULL ; } +static struct bpf_ksym *bpf_ksym_find (unsigned long addr) +{ +struct latch_tree_node *n; + + n =latch_tree_find ((void *)addr, &bpf_tree, &bpf_tree_ops); + return n ? container_of(n, struct bpf_ksym, tnode) : NULL; +} +const char *__bpf_address_lookup (unsigned long addr,unsigned long *size,unsigned long *off,char *sym) { -struct bpf_prog *prog; +struct bpf_ksym *ksym;char *ret =NULL ;rcu_read_lock (); - prog =bpf_prog_kallsyms_find (addr); -if (prog) { -unsigned long symbol_start = prog->aux->ksym.start; -unsigned long symbol_end = prog->aux->ksym.end; + ksym =bpf_ksym_find (addr); +if (ksym) { +unsigned long symbol_start = ksym->start; +unsigned long symbol_end = ksym->end; -strncpy (sym, prog->aux->ksym.name,KSYM_NAME_LEN ); +strncpy (sym, ksym->name,KSYM_NAME_LEN ); ret = sym;if (size)
@@ -698,7 +706,7 @@ bool is_bpf_text_address(unsigned long addr)bool ret;rcu_read_lock (); - ret =bpf_prog_kallsyms_find (addr) !=NULL ; + ret =bpf_ksym_find (addr) !=NULL ;rcu_read_unlock ();return ret;
Signature · 1 line
2.24.1
Jiri Olsa
reviewerPATCH v5 8/15 bpf: Add prog flag to struct bpf_ksym object
In reply to Jiri OlsaAdding 'prog' bool flag to 'struct bpf_ksym' to mark that this object belongs to bpf_prog object.
This change allows having bpf_prog objects together with other types (trampolines and dispatchers) in the single bpf_tree. It's used when searching for bpf_prog exception tables by the bpf_prog_ksym_find function, where we need to get the bpf_prog pointer.
From now we can safely add bpf_ksym support for trampoline or dispatcher objects, because we can differentiate them from bpf_prog objects.
--- include/linux/bpf.h | 1 + kernel/bpf/core.c | 22 +++++++++++----------- 2 files changed, 12 insertions(+), 11 deletions(-)
include/linux/bpf.h +1 -0
@@ -478,6 +478,7 @@ struct bpf_ksym {char name[KSYM_NAME_LEN ];struct list_head lnode;struct latch_tree_node tnode; +bool prog; };enum bpf_tramp_prog_type {
kernel/bpf/core.c +11 -11
@@ -642,6 +642,7 @@ void bpf_prog_kallsyms_add(struct bpf_prog *fp)bpf_prog_ksym_set_addr (fp);bpf_prog_ksym_set_name (fp); + fp->aux->ksym.prog = true;spin_lock_bh (&bpf_lock);bpf_prog_ksym_node_add (fp->aux);
@@ -658,16 +659,6 @@ void bpf_prog_kallsyms_del(struct bpf_prog *fp)spin_unlock_bh (&bpf_lock); } -static struct bpf_prog *bpf_prog_kallsyms_find (unsigned long addr) -{ -struct latch_tree_node *n; - - n =latch_tree_find ((void *)addr, &bpf_tree, &bpf_tree_ops); -return n ? - container_of(n, struct bpf_prog_aux, ksym.tnode)->prog : -NULL ; -} -static struct bpf_ksym *bpf_ksym_find (unsigned long addr) {struct latch_tree_node *n;
@@ -712,13 +703,22 @@ bool is_bpf_text_address(unsigned long addr)return ret; } +static struct bpf_prog *bpf_prog_ksym_find (unsigned long addr) +{ +struct bpf_ksym *ksym =bpf_ksym_find (addr); + +return ksym && ksym->prog ? + container_of(ksym, struct bpf_prog_aux, ksym)->prog : +NULL ; +} +const struct exception_table_entry *search_bpf_extables (unsigned long addr) {const struct exception_table_entry *e =NULL ;struct bpf_prog *prog;rcu_read_lock (); - prog =bpf_prog_kallsyms_find (addr); + prog =bpf_prog_ksym_find (addr);if (!prog) goto out;if (!prog->aux->num_exentries)
Signature · 1 line
2.24.1
Jiri Olsa
reviewerPATCH v5 9/15 bpf: Add bpf_ksym_add/del functions
In reply to Jiri OlsaSeparating /proc/kallsyms add/del code and adding bpf_ksym_add/del functions for that.
Moving bpf_prog_ksym_node_add/del functions to __bpf_ksym_add/del and changing their argument to 'struct bpf_ksym' object. This way we can call them for other bpf objects types like trampoline and dispatcher.
--- include/linux/bpf.h | 3 +++ kernel/bpf/core.c | 33 +++++++++++++++++++-------------- 2 files changed, 22 insertions(+), 14 deletions(-)
include/linux/bpf.h +3 -0
@@ -584,6 +584,9 @@ struct bpf_image {#define BPF_IMAGE_SIZE (PAGE_SIZE - sizeof(struct bpf_image))bool is_bpf_image_address (unsigned long address);void *bpf_image_alloc (void ); +/* Called only from JIT-enabled code, so there's no need for stubs. */ +void bpf_ksym_add (struct bpf_ksym *ksym); +void bpf_ksym_del (struct bpf_ksym *ksym);#else static inline struct bpf_trampoline *bpf_trampoline_lookup (u64 key) {
kernel/bpf/core.c +19 -14
@@ -607,20 +607,29 @@ static DEFINE_SPINLOCK(bpf_lock);static LIST_HEAD (bpf_kallsyms); static struct latch_tree_root bpf_tree __cacheline_aligned; -static void bpf_prog_ksym_node_add (struct bpf_prog_aux *aux) +void bpf_ksym_add (struct bpf_ksym *ksym) { -WARN_ON_ONCE (!list_empty (&aux->ksym.lnode)); -list_add_tail_rcu (&aux->ksym.lnode, &bpf_kallsyms); -latch_tree_insert (&aux->ksym.tnode, &bpf_tree, &bpf_tree_ops); +spin_lock_bh (&bpf_lock); +WARN_ON_ONCE (!list_empty (&ksym->lnode)); +list_add_tail_rcu (&ksym->lnode, &bpf_kallsyms); +latch_tree_insert (&ksym->tnode, &bpf_tree, &bpf_tree_ops); +spin_unlock_bh (&bpf_lock); } -static void bpf_prog_ksym_node_del (struct bpf_prog_aux *aux) +static void __bpf_ksym_del (struct bpf_ksym *ksym) { -if (list_empty (&aux->ksym.lnode)) +if (list_empty (&ksym->lnode))return ; -latch_tree_erase (&aux->ksym.tnode, &bpf_tree, &bpf_tree_ops); -list_del_rcu (&aux->ksym.lnode); +latch_tree_erase (&ksym->tnode, &bpf_tree, &bpf_tree_ops); +list_del_rcu (&ksym->lnode); +} + +void bpf_ksym_del (struct bpf_ksym *ksym) +{ +spin_lock_bh (&bpf_lock); +__bpf_ksym_del (ksym); +spin_unlock_bh (&bpf_lock); }static bool bpf_prog_kallsyms_candidate (const struct bpf_prog *fp)
@@ -644,9 +653,7 @@ void bpf_prog_kallsyms_add(struct bpf_prog *fp)bpf_prog_ksym_set_name (fp); fp->aux->ksym.prog = true; -spin_lock_bh (&bpf_lock); -bpf_prog_ksym_node_add (fp->aux); -spin_unlock_bh (&bpf_lock); +bpf_ksym_add (&fp->aux->ksym); }void bpf_prog_kallsyms_del (struct bpf_prog *fp)
@@ -654,9 +661,7 @@ void bpf_prog_kallsyms_del(struct bpf_prog *fp)if (!bpf_prog_kallsyms_candidate (fp))return ; -spin_lock_bh (&bpf_lock); -bpf_prog_ksym_node_del (fp->aux); -spin_unlock_bh (&bpf_lock); +bpf_ksym_del (&fp->aux->ksym); }static struct bpf_ksym *bpf_ksym_find (unsigned long addr)
Signature · 1 line
2.24.1
Jiri Olsa
reviewerPATCH v5 10/15 bpf: Add trampolines to kallsyms
In reply to Jiri OlsaAdding trampolines to kallsyms. It's displayed as
bpf_trampoline_<ID> [bpf]
where ID is the BTF id of the trampoline function.
Adding bpf_image_ksym_add/del functions that setup the start/end values and call KSYMBOL perf events handlers.
--- include/linux/bpf.h | 3 +++ kernel/bpf/trampoline.c | 28 ++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+)
include/linux/bpf.h +3 -0
@@ -513,6 +513,7 @@ struct bpf_trampoline {/* Executable image of trampoline */ void *image;u64 selector; +struct bpf_ksym ksym; };#define BPF_DISPATCHER_MAX 48/* Fits in 2048B */
@@ -585,6 +586,8 @@ struct bpf_image {bool is_bpf_image_address (unsigned long address);void *bpf_image_alloc (void );/* Called only from JIT-enabled code, so there's no need for stubs. */ +void bpf_image_ksym_add (void *data,struct bpf_ksym *ksym); +void bpf_image_ksym_del (struct bpf_ksym *ksym);void bpf_ksym_add (struct bpf_ksym *ksym);void bpf_ksym_del (struct bpf_ksym *ksym);#else
kernel/bpf/trampoline.c +28 -0
@@ -5,6 +5,7 @@#include <linux/filter.h> #include <linux/ftrace.h> #include <linux/rbtree_latch.h> +#include <linux/perf_event.h> /* dummy _ops. The verifier will operate on target program's ops. */ const struct bpf_verifier_ops bpf_extension_verifier_ops = {
@@ -96,6 +97,30 @@ bool is_bpf_image_address(unsigned long addr)return ret; } +void bpf_image_ksym_add (void *data,struct bpf_ksym *ksym) +{ + ksym->start = (unsigned long ) data; + ksym->end = ksym->start +BPF_IMAGE_SIZE ; +bpf_ksym_add (ksym); +perf_event_ksymbol (PERF_RECORD_KSYMBOL_TYPE_BPF , ksym->start, +BPF_IMAGE_SIZE , false, ksym->name); +} + +void bpf_image_ksym_del (struct bpf_ksym *ksym) +{ +bpf_ksym_del (ksym); +perf_event_ksymbol (PERF_RECORD_KSYMBOL_TYPE_BPF , ksym->start, +BPF_IMAGE_SIZE , true, ksym->name); +} + +static void bpf_trampoline_ksym_add (struct bpf_trampoline *tr) +{ +struct bpf_ksym *ksym = &tr->ksym; + +snprintf (ksym->name,KSYM_NAME_LEN ,"bpf_trampoline_%llu" , tr->key); +bpf_image_ksym_add (tr->image, ksym); +} +struct bpf_trampoline *bpf_trampoline_lookup (u64 key) {struct bpf_trampoline *tr;
@@ -131,6 +156,8 @@ struct bpf_trampoline *bpf_trampoline_lookup(u64 key)for (i =0 ; i <BPF_TRAMP_MAX ; i++)INIT_HLIST_HEAD (&tr->progs_hlist[i]); tr->image = image; +INIT_LIST_HEAD_RCU (&tr->ksym.lnode); +bpf_trampoline_ksym_add (tr); out:mutex_unlock (&trampoline_mutex);return tr;
@@ -368,6 +395,7 @@ void bpf_trampoline_put(struct bpf_trampoline *tr) goto out;if (WARN_ON_ONCE (!hlist_empty (&tr->progs_hlist[BPF_TRAMP_FEXIT ]))) goto out; +bpf_image_ksym_del (&tr->ksym); image = container_of(tr->image, struct bpf_image, data);latch_tree_erase (&image->tnode, &image_tree, &image_tree_ops);/* wait for tasks to get out of trampoline before freeing it */
Signature · 1 line
2.24.1
Jiri Olsa
reviewerPATCH v5 11/15 bpf: Add dispatchers to kallsyms
In reply to Jiri OlsaAdding dispatchers to kallsyms. It's displayed as
bpf_dispatcher_<NAME>
where NAME is the name of dispatcher.
--- include/linux/bpf.h | 19 ++++++++++++------- kernel/bpf/dispatcher.c | 1 + 2 files changed, 13 insertions(+), 7 deletions(-)
include/linux/bpf.h +12 -7
@@ -531,6 +531,7 @@ struct bpf_dispatcher {int num_progs;void *image;u32 image_off; +struct bpf_ksym ksym; }; static __always_inline unsigned int bpf_dispatcher_nop_func(
@@ -546,13 +547,17 @@ struct bpf_trampoline *bpf_trampoline_lookup(u64 key);int bpf_trampoline_link_prog (struct bpf_prog *prog);int bpf_trampoline_unlink_prog (struct bpf_prog *prog);void bpf_trampoline_put (struct bpf_trampoline *tr); -#define BPF_DISPATCHER_INIT (name) { \ - .mutex = __MUTEX_INITIALIZER(name.mutex), \ - .func = &name##_func, \ - .progs = {}, \ - .num_progs = 0, \ - .image = NULL, \ - .image_off = 0 \ +#define BPF_DISPATCHER_INIT (_name) { \ + .mutex = __MUTEX_INITIALIZER(_name.mutex), \ + .func = &_name##_func, \ + .progs = {}, \ + .num_progs = 0, \ + .image = NULL, \ + .image_off = 0, \ + .ksym = { \ + .name = #_name, \ + .lnode = LIST_HEAD_INIT(_name.ksym.lnode), \ + }, \ }#define DEFINE_BPF_DISPATCHER (name) \
kernel/bpf/dispatcher.c +1 -0
@@ -143,6 +143,7 @@ void bpf_dispatcher_change_prog(struct bpf_dispatcher *d, struct bpf_prog *from, d->image =bpf_image_alloc ();if (!d->image) goto out; +bpf_image_ksym_add (d->image, &d->ksym); } prev_num_progs = d->num_progs;
Signature · 1 line
2.24.1
Jiri Olsa
reviewerPATCH v5 12/15 bpf: Remove bpf_image tree
In reply to Jiri OlsaNow that we have all the objects (bpf_prog, bpf_trampoline, bpf_dispatcher) linked in bpf_tree, there's no need to have separate bpf_image tree for images.
Reverting the bpf_image tree together with struct bpf_image, because it's no longer needed.
Also removing bpf_image_alloc function and adding the original bpf_jit_alloc_exec_page interface instead.
The kernel_text_address function can now rely only on is_bpf_text_address, because it checks the bpf_tree that contains all the objects.
Keeping bpf_image_ksym_add and bpf_image_ksym_del because they are useful wrappers with perf's ksymbol interface calls.
--- include/linux/bpf.h | 8 +--- kernel/bpf/dispatcher.c | 4 +- kernel/bpf/trampoline.c | 83 +++++------------------------------------ kernel/extable.c | 2 - 4 files changed, 13 insertions(+), 84 deletions(-)
include/linux/bpf.h +1 -7
@@ -583,14 +583,8 @@ void bpf_trampoline_put(struct bpf_trampoline *tr);#define BPF_DISPATCHER_PTR (name) (&bpf_dispatcher_##name)void bpf_dispatcher_change_prog (struct bpf_dispatcher *d,struct bpf_prog *from,struct bpf_prog *to); -struct bpf_image { -struct latch_tree_node tnode; -unsigned char data[]; -}; -#define BPF_IMAGE_SIZE (PAGE_SIZE - sizeof(struct bpf_image)) -bool is_bpf_image_address (unsigned long address); -void *bpf_image_alloc (void );/* Called only from JIT-enabled code, so there's no need for stubs. */ +void *bpf_jit_alloc_exec_page (void );void bpf_image_ksym_add (void *data,struct bpf_ksym *ksym);void bpf_image_ksym_del (struct bpf_ksym *ksym);void bpf_ksym_add (struct bpf_ksym *ksym);
kernel/bpf/dispatcher.c +2 -2
@@ -113,7 +113,7 @@ static void bpf_dispatcher_update(struct bpf_dispatcher *d, int prev_num_progs) noff =0 ; }else { old = d->image + d->image_off; - noff = d->image_off ^ (BPF_IMAGE_SIZE /2 ); + noff = d->image_off ^ (PAGE_SIZE /2 ); } new = d->num_progs ? d->image + noff :NULL ;
@@ -140,7 +140,7 @@ void bpf_dispatcher_change_prog(struct bpf_dispatcher *d, struct bpf_prog *from,mutex_lock (&d->mutex);if (!d->image) { - d->image =bpf_image_alloc (); + d->image =bpf_jit_alloc_exec_page ();if (!d->image) goto out;bpf_image_ksym_add (d->image, &d->ksym);
kernel/bpf/trampoline.c +10 -73
141 lines not on this page · raw message
kernel/extable.c +0 -2
@@ -149,8 +149,6 @@ int kernel_text_address(unsigned long addr) goto out;if (is_bpf_text_address (addr)) goto out; -if (is_bpf_image_address (addr)) - goto out; ret =0 ; out:if (no_rcu)
Signature · 1 line
2.24.1
Jiri Olsa
reviewerPATCH v5 13/15 perf tools: Synthesize bpf_trampoline/dispatcher ksymbol event
In reply to Jiri OlsaSynthesize bpf images (trampolines/dispatchers) on start, as ksymbol events from /proc/kallsyms. Having this perf can recognize samples from those images and perf report and top shows them correctly.
The rest of the ksymbol handling is already in place from for the bpf programs monitoring, so only the initial state was needed.
perf report output:
# Overhead Command Shared Object Symbol
12.37% test_progs [kernel.vmlinux] [k] entry_SYSCALL_64
11.80% test_progs [kernel.vmlinux] [k] syscall_return_via_sysret
9.63% test_progs bpf_prog_bcf7977d3b93787c_prog2 [k] bpf_prog_bcf7977d3b93787c_prog2
6.90% test_progs bpf_trampoline_24456 [k] bpf_trampoline_24456
6.36% test_progs [kernel.vmlinux] [k] memcpy_erms--- tools/perf/util/bpf-event.c | 92 +++++++++++++++++++++++++++++++++++++ 1 file changed, 92 insertions(+)
tools/perf/util/bpf-event.c +92 -0
@@ -6,6 +6,9 @@#include <bpf/libbpf.h> #include <linux/btf.h> #include <linux/err.h> +#include <linux/string.h> +#include <internal/lib.h> +#include <symbol/kallsyms.h> #include "bpf-event.h" #include "debug.h" #include "dso.h"
@@ -290,11 +293,81 @@ static int perf_event__synthesize_one_bpf_prog(struct perf_session *session,return err ?-1 :0 ; } +struct kallsyms_parse { +union perf_event *event; +perf_event__handler_t process; +struct machine *machine; +struct perf_tool *tool; +}; + +static int +process_bpf_image (char *name,u64 addr,struct kallsyms_parse *data) +{ +struct machine *machine = data->machine; +union perf_event *event = data->event; +struct perf_record_ksymbol *ksymbol; + + ksymbol = &event->ksymbol; + + *ksymbol = (struct perf_record_ksymbol ) { + .header = { + .type =PERF_RECORD_KSYMBOL , + .size = offsetof(struct perf_record_ksymbol , name), + }, + .addr = addr, + .len = page_size, + .ksym_type =PERF_RECORD_KSYMBOL_TYPE_BPF , + .flags =0 , + }; + +strncpy (ksymbol->name, name,KSYM_NAME_LEN ); + ksymbol->header.size +=PERF_ALIGN (strlen (name) +1 ,sizeof (u64)); +memset ((void *) event + event->header.size,0 , machine->id_hdr_size); + event->header.size += machine->id_hdr_size; + +return perf_tool__process_synth_event (data->tool, event, machine, + data->process); +} + +static int +kallsyms_process_symbol (void *data,const char *_name, +char type__maybe_unused ,u64 start) +{ +char disp[KSYM_NAME_LEN ]; +char *module, *name; +unsigned long id; +int err =0 ; + + module =strchr (_name,'\t' ); +if (!module) +return 0 ; + +/* We are going after [bpf] module ... */ +if (strcmp (module +1 ,"[bpf]" )) +return 0 ; + + name =memdup (_name, (module - _name) +1 ); +if (!name) +return -ENOMEM ; + + name[module - _name] =0 ; + +/* .. and only for trampolines and dispatchers */ +if ((sscanf (name,"bpf_trampoline_%lu" , &id) ==1 ) || + (sscanf (name,"bpf_dispatcher_%s" , disp) ==1 )) + err =process_bpf_image (name, start, data); + +free (name); +return err; +} +int perf_event__synthesize_bpf_events (struct perf_session *session,perf_event__handler_t process,struct machine *machine,struct record_opts *opts) { +const char *kallsyms_filename ="/proc/kallsyms" ; +struct kallsyms_parse arg;union perf_event *event;__u32 id =0 ;int err;
@@ -303,6 +376,8 @@ int perf_event__synthesize_bpf_events(struct perf_session *session, event =malloc (sizeof (event->bpf) +KSYM_NAME_LEN + machine->id_hdr_size);if (!event)return -1 ; + +/* Synthesize all the bpf programs in system. */ while (true) { err =bpf_prog_get_next_id (id, &id);if (err) {
@@ -335,6 +410,23 @@ int perf_event__synthesize_bpf_events(struct perf_session *session,break ; } } + +/* Synthesize all the bpf images - trampolines/dispatchers. */ +if (symbol_conf.kallsyms_name !=NULL ) + kallsyms_filename = symbol_conf.kallsyms_name; + + arg = (struct kallsyms_parse ) { + .event = event, + .process = process, + .machine = machine, + .tool = session->tool, + }; + +if (kallsyms__parse (kallsyms_filename, &arg, kallsyms_process_symbol)) { +pr_err ("%s: failed to synthesize bpf images: %s\n" , + __func__,strerror (errno)); + } +free (event);return err; }
Signature · 1 line
2.24.1
Re: [PATCH 13/15] perf tools: Synthesize bpf_trampoline/dispatcher ksymbol event
Em Thu, Mar 12, 2020 at 08:56:08PM +0100, Jiri Olsa escreveu:
Quoted 17 lines
(quoted diff) +17
-0+static int +process_bpf_image(char *name, u64 addr, struct kallsyms_parse *data) +{ + struct machine *machine = data->machine; + union perf_event *event = data->event; + struct perf_record_ksymbol *ksymbol; + + ksymbol = &event->ksymbol; + + *ksymbol = (struct perf_record_ksymbol) { + .header = { + .type = PERF_RECORD_KSYMBOL, + .size = offsetof(struct perf_record_ksymbol, name), + }, + .addr = addr, + .len = page_size, + .ksym_type = PERF_RECORD_KSYMBOL_TYPE_BPF,
Review
Quoted 10 lines
(quoted diff) +10
-0+ .flags = 0, + }; + + strncpy(ksymbol->name, name, KSYM_NAME_LEN); + ksymbol->header.size += PERF_ALIGN(strlen(name) + 1, sizeof(u64)); + memset((void *) event + event->header.size, 0, machine->id_hdr_size); + event->header.size += machine->id_hdr_size; + + return perf_tool__process_synth_event(data->tool, event, machine, + data->process);
This explodes in fedora 32 and rawhide and in openmandriva:cooker:
GEN /tmp/build/perf/python/perf.so
CC /tmp/build/perf/util/bpf-event.o
In file included from /usr/include/string.h:495,
from /git/perf/tools/lib/bpf/libbpf_common.h:12,
from /git/perf/tools/lib/bpf/bpf.h:31,
from util/bpf-event.c:4:In function ‘strncpy’,
inlined from ‘process_bpf_image’ at util/bpf-event.c:323:2,
inlined from ‘kallsyms_process_symbol’ at util/bpf-event.c:358:9:/usr/include/bits/string_fortified.h:106:10: error: ‘__builtin_strncpy’ specified bound 256 equals destination size [-Werror=stringop-truncation]
106 | return __builtin___strncpy_chk (__dest, __src, __len, __bos (__dest));
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~cc1: all warnings being treated as errors
mv: cannot stat '/tmp/build/perf/util/.bpf-event.o.tmp': No such file or directory make[4]: *** [/git/perf/tools/build/Makefile.build:97: /tmp/build/perf/util/bpf-event.o] Error 1 make[3]: *** [/git/perf/tools/build/Makefile.build:139: util] Error 2
make[2]: *** [Makefile.perf:617: /tmp/build/perf/perf-in.o] Error 2
make[1]: *** [Makefile.perf:225: sub-make] Error 2
make: *** [Makefile:70: all] Error 2
make: Leaving directory '/git/perf/tools/perf'
[perfbuilder@fc58e82bfba4 ~]$
So I patched it a bit, please ack:
tools/perf/util/bpf-event.c +3 -2
@@ -306,6 +306,7 @@ process_bpf_image(char *name, u64 addr, struct kallsyms_parse *data)struct machine *machine = data->machine;union perf_event *event = data->event;struct perf_record_ksymbol *ksymbol; +int len; ksymbol = &event->ksymbol;
@@ -320,8 +321,8 @@ process_bpf_image(char *name, u64 addr, struct kallsyms_parse *data) .flags = 0, }; -strncpy (ksymbol->name, name,KSYM_NAME_LEN ); - ksymbol->header.size +=PERF_ALIGN (strlen (name) +1 ,sizeof (u64)); + len =scnprintf (ksymbol->name,KSYM_NAME_LEN ,"%s" , name); + ksymbol->header.size +=PERF_ALIGN (len +1 ,sizeof (u64));memset ((void *) event + event->header.size,0 , machine->id_hdr_size); event->header.size += machine->id_hdr_size;
Jiri Olsa
Acked-byRe: [PATCH 13/15] perf tools: Synthesize bpf_trampoline/dispatcher ksymbol event
Quoted 53 lines · Arnaldo Carvalho de Melo
Em Thu, Mar 12, 2020 at 08:56:08PM +0100, Jiri Olsa escreveu:
Quoted 17 lines
(quoted diff) +17
-0+static int +process_bpf_image(char *name, u64 addr, struct kallsyms_parse *data) +{ + struct machine *machine = data->machine; + union perf_event *event = data->event; + struct perf_record_ksymbol *ksymbol; + + ksymbol = &event->ksymbol; + + *ksymbol = (struct perf_record_ksymbol) { + .header = { + .type = PERF_RECORD_KSYMBOL, + .size = offsetof(struct perf_record_ksymbol, name), + }, + .addr = addr, + .len = page_size, + .ksym_type = PERF_RECORD_KSYMBOL_TYPE_BPF,Review
Quoted 10 lines
(quoted diff) +10
-0+ .flags = 0, + }; + + strncpy(ksymbol->name, name, KSYM_NAME_LEN); + ksymbol->header.size += PERF_ALIGN(strlen(name) + 1, sizeof(u64)); + memset((void *) event + event->header.size, 0, machine->id_hdr_size); + event->header.size += machine->id_hdr_size; + + return perf_tool__process_synth_event(data->tool, event, machine, + data->process);This explodes in fedora 32 and rawhide and in openmandriva:cooker:
GEN
/tmp/build/perf/python/perf.so
CC/tmp/build/perf/util/bpf-event.o
In file included from/usr/include/string.h:495,from /git/perf/tools/lib/bpf/libbpf_common.h:12, from /git/perf/tools/lib/bpf/bpf.h:31, from util/bpf-event.c:4:In function ‘strncpy’,
inlined from ‘process_bpf_image’ atutil/bpf-event.c:323:2,
inlined from ‘kallsyms_process_symbol’ atutil/bpf-event.c:358:9:/usr/include/bits/string_fortified.h:106:10: error: ‘__builtin_strncpy’ specified bound 256 equals destination size [-Werror=stringop-truncation]106 | return __builtin___strncpy_chk (__dest, __src, __len, __bos (__dest)); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~cc1: all warnings being treated as errors
mv: cannot stat '/tmp/build/perf/util/.bpf-event.o.tmp': No such file or directory make[4]: *** [/git/perf/tools/build/Makefile.build:97:/tmp/build/perf/util/bpf-event.o] Error 1 make[3]: *** [/git/perf/tools/build/Makefile.build:139: util] Error 2
make[2]: *** [Makefile.perf:617:/tmp/build/perf/perf-in.o] Error 2
make[1]: *** [Makefile.perf:225: sub-make] Error 2
make: *** [Makefile:70: all] Error 2
make: Leaving directory '/git/perf/tools/perf'
[perfbuilder@fc58e82bfba4 ~]$
Quoted 1 line
So I patched it a bit, please ack:
perfect, thanks
jirka
Quoted 26 lines
tools/perf/util/bpf-event.c +3
-2@@ -306,6 +306,7 @@ process_bpf_image(char *name, u64 addr, struct kallsyms_parse *data)struct machine *machine = data->machine;union perf_event *event = data->event;struct perf_record_ksymbol *ksymbol; +int len; ksymbol = &event->ksymbol;@@ -320,8 +321,8 @@ process_bpf_image(char *name, u64 addr, struct kallsyms_parse *data) .flags = 0, }; -strncpy (ksymbol->name, name,KSYM_NAME_LEN ); - ksymbol->header.size +=PERF_ALIGN (strlen (name) +1 ,sizeof (u64)); + len =scnprintf (ksymbol->name,KSYM_NAME_LEN ,"%s" , name); + ksymbol->header.size +=PERF_ALIGN (len +1 ,sizeof (u64));memset ((void *) event + event->header.size,0 , machine->id_hdr_size); event->header.size += machine->id_hdr_size;
Jiri Olsa
reviewerPATCH v5 14/15 perf tools: Set ksymbol dso as loaded on arrival
In reply to Jiri OlsaThere's no special load action for ksymbol data on map__load/dso__load action, where the kernel is getting loaded. It only gets confused with kernel kallsyms/vmlinux load for bpf object, which fails and could mess up with the map.
Disabling any further load of the map for ksymbol related dso/map.
--- tools/perf/util/machine.c | 1 + 1 file changed, 1 insertion(+)
tools/perf/util/machine.c +1 -0
@@ -742,6 +742,7 @@ static int machine__process_ksymbol_register(struct machine *machine, map->start = event->ksymbol.addr; map->end = map->start + event->ksymbol.len;maps__insert (&machine->kmaps, map); +dso__set_loaded (dso); } sym = symbol__new(map->map_ip(map, map->start),
Signature · 1 line
2.24.1
[tip: perf/core] perf machine: Set ksymbol dso as loaded on arrival
The following commit has been merged into the perf/core branch of tip:
The following commit has been merged into the perf/core branch of tip:
Commit-ID: 7eddf7e74e54aea3b24410b3fb8911927836632f Gitweb: https://git.kernel.org/tip/7eddf7e74e54aea3b24410b3fb8911927836632f Author: Jiri Olsa <[email protected]> AuthorDate: Thu, 12 Mar 2020 20:56:09 +01:00 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitterDate: Thu, 16 Apr 2020 12:19:06 -03:00
perf machine: Set ksymbol dso as loaded on arrival
There's no special load action for ksymbol data on map__load/dso__load action, where the kernel is getting loaded. It only gets confused with kernel kallsyms/vmlinux load for bpf object, which fails and could mess up with the map.
Disabling any further load of the map for ksymbol related dso/map.
--- tools/perf/util/machine.c | 1 + 1 file changed, 1 insertion(+)
tools/perf/util/machine.c +1 -0
@@ -759,6 +759,7 @@ static int machine__process_ksymbol_register(struct machine *machine, map->start = event->ksymbol.addr; map->end = map->start + event->ksymbol.len;maps__insert (&machine->kmaps, map); +dso__set_loaded (dso); } sym = symbol__new(map->map_ip(map, map->start),
Jiri Olsa
reviewerPATCH v5 15/15 perf annotate: Add base support for bpf_image
In reply to Jiri OlsaAdding the DSO_BINARY_TYPE__BPF_IMAGE dso binary type to recognize bpf images that carry trampoline or dispatcher.
Upcoming patches will add support to read the image data, store it within the BPF feature in perf.data and display it for annotation purposes.
Currently we only display following message:
# ./perf annotate bpf_trampoline_24456 --stdio
Percent | Source code & Disassembly of . for cycles (504 ...
--------------------------------------------------------------- ...
: to be implemented--- tools/perf/util/annotate.c | 20 ++++++++++++++++++++ tools/perf/util/dso.c | 1 + tools/perf/util/dso.h | 1 + tools/perf/util/machine.c | 11 +++++++++++ tools/perf/util/symbol.c | 1 + 5 files changed, 34 insertions(+)
tools/perf/util/annotate.c +20 -0
@@ -1843,6 +1843,24 @@ static int symbol__disassemble_bpf(struct symbol *sym __maybe_unused, }#endif // defined(HAVE_LIBBFD_SUPPORT) && defined(HAVE_LIBBPF_SUPPORT) +static int +symbol__disassemble_bpf_image (struct symbol *sym, +struct annotate_args *args) +{ +struct annotation *notes =symbol__annotation (sym); +struct disasm_line *dl; + + args->offset =-1 ; + args->line =strdup ("to be implemented" ); + args->line_nr =0 ; + dl =disasm_line__new (args); +if (dl) +annotation_line__add (&dl->al, ¬es->src->source); + +free (args->line); +return 0 ; +} +/* * Possibly create a new version of line with tabs expanded. Returns the * existing or new line, storage is updated if a new line is allocated. If
@@ -1942,6 +1960,8 @@ static int symbol__disassemble(struct symbol *sym, struct annotate_args *args)if (dso->binary_type ==DSO_BINARY_TYPE__BPF_PROG_INFO ) {return symbol__disassemble_bpf (sym, args); + }else if (dso->binary_type ==DSO_BINARY_TYPE__BPF_IMAGE ) { +return symbol__disassemble_bpf_image (sym, args); }else if (dso__is_kcore (dso)) { kce.kcore_filename = symfs_filename; kce.addr =map__rip_2objdump (map, sym->start);
tools/perf/util/dso.c +1 -0
@@ -191,6 +191,7 @@ int dso__read_binary_type_filename(const struct dso *dso,case DSO_BINARY_TYPE__GUEST_KALLSYMS :case DSO_BINARY_TYPE__JAVA_JIT :case DSO_BINARY_TYPE__BPF_PROG_INFO : +case DSO_BINARY_TYPE__BPF_IMAGE :case DSO_BINARY_TYPE__NOT_FOUND : ret =-1 ;break ;
tools/perf/util/dso.h +1 -0
@@ -40,6 +40,7 @@ enum dso_binary_type {DSO_BINARY_TYPE__GUEST_KCORE ,DSO_BINARY_TYPE__OPENEMBEDDED_DEBUGINFO ,DSO_BINARY_TYPE__BPF_PROG_INFO , +DSO_BINARY_TYPE__BPF_IMAGE , DSO_BINARY_TYPE__NOT_FOUND, };
tools/perf/util/machine.c +11 -0
@@ -719,6 +719,12 @@ int machine__process_switch_event(struct machine *machine __maybe_unused,return 0 ; } +static int is_bpf_image (const char *name) +{ +return strncmp (name,"bpf_trampoline_" ,sizeof ("bpf_trampoline_" ) -1 ) || +strncmp (name,"bpf_dispatcher_" ,sizeof ("bpf_dispatcher_" ) -1 ); +} +static int machine__process_ksymbol_register (struct machine *machine,union perf_event *event,struct perf_sample *sample__maybe_unused )
@@ -743,6 +749,11 @@ static int machine__process_ksymbol_register(struct machine *machine, map->end = map->start + event->ksymbol.len;maps__insert (&machine->kmaps, map);dso__set_loaded (dso); + +if (is_bpf_image (event->ksymbol.name)) { + dso->binary_type =DSO_BINARY_TYPE__BPF_IMAGE ; +dso__set_long_name (dso,"" , false); + } } sym = symbol__new(map->map_ip(map, map->start),
tools/perf/util/symbol.c +1 -0
@@ -1544,6 +1544,7 @@ static bool dso__is_compatible_symtab_type(struct dso *dso, bool kmod,return true;case DSO_BINARY_TYPE__BPF_PROG_INFO : +case DSO_BINARY_TYPE__BPF_IMAGE :case DSO_BINARY_TYPE__NOT_FOUND :default :return false;
Signature · 1 line
2.24.1
[tip: perf/core] perf annotate: Add basic support for bpf_image
The following commit has been merged into the perf/core branch of tip:
The following commit has been merged into the perf/core branch of tip:
Commit-ID: 3c29d4483e855b6ba5c6e35b0c81caad7d9e3984 Gitweb: https://git.kernel.org/tip/3c29d4483e855b6ba5c6e35b0c81caad7d9e3984 Author: Jiri Olsa <[email protected]> AuthorDate: Thu, 12 Mar 2020 20:56:10 +01:00 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitterDate: Thu, 16 Apr 2020 12:19:06 -03:00
perf annotate: Add basic support for bpf_image
Add the DSO_BINARY_TYPE__BPF_IMAGE dso binary type to recognize BPF images that carry trampoline or dispatcher.
Upcoming patches will add support to read the image data, store it within the BPF feature in perf.data and display it for annotation purposes.
Currently we only display following message:
# ./perf annotate bpf_trampoline_24456 --stdio
Percent | Source code & Disassembly of . for cycles (504 ...
--------------------------------------------------------------- ...
: to be implemented--- tools/perf/util/annotate.c | 20 ++++++++++++++++++++ tools/perf/util/dso.c | 1 + tools/perf/util/dso.h | 1 + tools/perf/util/machine.c | 11 +++++++++++ tools/perf/util/symbol.c | 1 + 5 files changed, 34 insertions(+)
tools/perf/util/annotate.c +20 -0
@@ -1821,6 +1821,24 @@ static int symbol__disassemble_bpf(struct symbol *sym __maybe_unused, }#endif // defined(HAVE_LIBBFD_SUPPORT) && defined(HAVE_LIBBPF_SUPPORT) +static int +symbol__disassemble_bpf_image (struct symbol *sym, +struct annotate_args *args) +{ +struct annotation *notes =symbol__annotation (sym); +struct disasm_line *dl; + + args->offset =-1 ; + args->line =strdup ("to be implemented" ); + args->line_nr =0 ; + dl =disasm_line__new (args); +if (dl) +annotation_line__add (&dl->al, ¬es->src->source); + +free (args->line); +return 0 ; +} +/* * Possibly create a new version of line with tabs expanded. Returns the * existing or new line, storage is updated if a new line is allocated. If
@@ -1920,6 +1938,8 @@ static int symbol__disassemble(struct symbol *sym, struct annotate_args *args)if (dso->binary_type ==DSO_BINARY_TYPE__BPF_PROG_INFO ) {return symbol__disassemble_bpf (sym, args); + }else if (dso->binary_type ==DSO_BINARY_TYPE__BPF_IMAGE ) { +return symbol__disassemble_bpf_image (sym, args); }else if (dso__is_kcore (dso)) { kce.kcore_filename = symfs_filename; kce.addr =map__rip_2objdump (map, sym->start);
tools/perf/util/dso.c +1 -0
@@ -191,6 +191,7 @@ int dso__read_binary_type_filename(const struct dso *dso,case DSO_BINARY_TYPE__GUEST_KALLSYMS :case DSO_BINARY_TYPE__JAVA_JIT :case DSO_BINARY_TYPE__BPF_PROG_INFO : +case DSO_BINARY_TYPE__BPF_IMAGE :case DSO_BINARY_TYPE__NOT_FOUND : ret =-1 ;break ;
tools/perf/util/dso.h +1 -0
@@ -40,6 +40,7 @@ enum dso_binary_type {DSO_BINARY_TYPE__GUEST_KCORE ,DSO_BINARY_TYPE__OPENEMBEDDED_DEBUGINFO ,DSO_BINARY_TYPE__BPF_PROG_INFO , +DSO_BINARY_TYPE__BPF_IMAGE , DSO_BINARY_TYPE__NOT_FOUND, };
tools/perf/util/machine.c +11 -0
@@ -736,6 +736,12 @@ int machine__process_switch_event(struct machine *machine __maybe_unused,return 0 ; } +static int is_bpf_image (const char *name) +{ +return strncmp (name,"bpf_trampoline_" ,sizeof ("bpf_trampoline_" ) -1 ) || +strncmp (name,"bpf_dispatcher_" ,sizeof ("bpf_dispatcher_" ) -1 ); +} +static int machine__process_ksymbol_register (struct machine *machine,union perf_event *event,struct perf_sample *sample__maybe_unused )
@@ -760,6 +766,11 @@ static int machine__process_ksymbol_register(struct machine *machine, map->end = map->start + event->ksymbol.len;maps__insert (&machine->kmaps, map);dso__set_loaded (dso); + +if (is_bpf_image (event->ksymbol.name)) { + dso->binary_type =DSO_BINARY_TYPE__BPF_IMAGE ; +dso__set_long_name (dso,"" , false); + } } sym = symbol__new(map->map_ip(map, map->start),
tools/perf/util/symbol.c +1 -0
@@ -1544,6 +1544,7 @@ static bool dso__is_compatible_symtab_type(struct dso *dso, bool kmod,return true;case DSO_BINARY_TYPE__BPF_PROG_INFO : +case DSO_BINARY_TYPE__BPF_IMAGE :case DSO_BINARY_TYPE__NOT_FOUND :default :return false;
Quoted 4 lines · Jiri Olsa
hi,
this patchset adds trampoline and dispatcher objects to be visible in/proc/kallsyms. The last patch also adds sorting for all bpf objects in/proc/kallsyms.
I removed second sentence from the cover letter and applied the first 12 patches.
Thanks a lot!
Quoted 5 lines
For perf tool to properly display trampoline/dispatcher you need also Arnaldo's perf/urgent branch changes. I merged everything into following branch:
git://git.kernel.org/pub/scm/linux/kernel/git/jolsa/perf.gitbpf/kallsyms
It sounds that you folks want to land the last three patches via Arnaldo's tree to avoid conflicts?
Right?
Quoted 14 lines · Alexei Starovoitov
Quoted 4 lines · Jiri Olsa
hi,
this patchset adds trampoline and dispatcher objects to be visible in/proc/kallsyms. The last patch also adds sorting for all bpf objects in/proc/kallsyms.I removed second sentence from the cover letter and applied the first 12 patches.
Thanks a lot!Quoted 4 lines
For perf tool to properly display trampoline/dispatcher you need also Arnaldo's perf/urgent branch changes. I merged everything into following branch:
Quoted 5 lines
Quoted 1 line
git://git.kernel.org/pub/scm/linux/kernel/git/jolsa/perf.gitbpf/kallsymsIt sounds that you folks want to land the last three patches via Arnaldo's tree to avoid conflicts?
Right?
right, thanks
jirka
Em Fri, Mar 13, 2020 at 09:31:51AM +0100, Jiri Olsa escreveu:
Quoted 15 lines · Alexei Starovoitov
Quoted 14 lines · Jiri Olsa
Quoted 4 lines
hi,
this patchset adds trampoline and dispatcher objects to be visible in/proc/kallsyms. The last patch also adds sorting for all bpf objects in/proc/kallsyms.I removed second sentence from the cover letter and applied the first 12 patches.
Thanks a lot!Quoted 4 lines
For perf tool to properly display trampoline/dispatcher you need also Arnaldo's perf/urgent branch changes. I merged everything into following branch:
Quoted 7 lines
Quoted 5 lines
Quoted 1 line
git://git.kernel.org/pub/scm/linux/kernel/git/jolsa/perf.gitbpf/kallsymsIt sounds that you folks want to land the last three patches via Arnaldo's tree to avoid conflicts?
Right?right, thanks
Thanks, applied those 3 patches, will try and test this all when I get my branch merged,
- Arnaldo