| Message ID | 20220112142709.102423-3-mauricio@kinvolk.io (mailing list archive) |
|---|---|
| State | Changes Requested |
| Delegated to: | BPF |
| Headers | show |
| Series | libbpf: Implement BTFGen | expand |
2022-01-12 09:27 UTC-0500 ~ Mauricio Vásquez <mauricio@kinvolk.io> > This commit extends libbpf with the features that are needed to > implement BTFGen: > > - Implement bpf_core_create_cand_cache() and bpf_core_free_cand_cache() > to handle candidates cache. > - Expose bpf_core_add_cands() and bpf_core_free_cands to handle > candidates list. > - Expose bpf_core_calc_relo_insn() to bpftool. > > Signed-off-by: Mauricio Vásquez <mauricio@kinvolk.io> > Signed-off-by: Rafael David Tinoco <rafael.tinoco@aquasec.com> > Signed-off-by: Lorenzo Fontana <lorenzo.fontana@elastic.co> > Signed-off-by: Leonardo Di Donato <leonardo.didonato@elastic.co> > --- > tools/lib/bpf/Makefile | 2 +- > tools/lib/bpf/libbpf.c | 43 +++++++++++++++++++++------------ > tools/lib/bpf/libbpf_internal.h | 12 +++++++++ > 3 files changed, 41 insertions(+), 16 deletions(-) > > diff --git a/tools/lib/bpf/Makefile b/tools/lib/bpf/Makefile > index f947b61b2107..dba019ee2832 100644 > --- a/tools/lib/bpf/Makefile > +++ b/tools/lib/bpf/Makefile > @@ -239,7 +239,7 @@ install_lib: all_cmd > > SRC_HDRS := bpf.h libbpf.h btf.h libbpf_common.h libbpf_legacy.h xsk.h \ > bpf_helpers.h bpf_tracing.h bpf_endian.h bpf_core_read.h \ > - skel_internal.h libbpf_version.h > + skel_internal.h libbpf_version.h relo_core.h libbpf_internal.h > GEN_HDRS := $(BPF_GENERATED) I don't think these headers should be added to libbpf's SRC_HDRS. If we must make them available to bpftool, we probably want to copy them explicitly through LIBBPF_INTERNAL_HDRS in bpftool's Makefile.
On Wed, Jan 12, 2022 at 6:27 AM Mauricio Vásquez <mauricio@kinvolk.io> wrote: > > This commit extends libbpf with the features that are needed to > implement BTFGen: > > - Implement bpf_core_create_cand_cache() and bpf_core_free_cand_cache() > to handle candidates cache. > - Expose bpf_core_add_cands() and bpf_core_free_cands to handle > candidates list. > - Expose bpf_core_calc_relo_insn() to bpftool. > > Signed-off-by: Mauricio Vásquez <mauricio@kinvolk.io> > Signed-off-by: Rafael David Tinoco <rafael.tinoco@aquasec.com> > Signed-off-by: Lorenzo Fontana <lorenzo.fontana@elastic.co> > Signed-off-by: Leonardo Di Donato <leonardo.didonato@elastic.co> > --- > tools/lib/bpf/Makefile | 2 +- > tools/lib/bpf/libbpf.c | 43 +++++++++++++++++++++------------ > tools/lib/bpf/libbpf_internal.h | 12 +++++++++ > 3 files changed, 41 insertions(+), 16 deletions(-) > > diff --git a/tools/lib/bpf/Makefile b/tools/lib/bpf/Makefile > index f947b61b2107..dba019ee2832 100644 > --- a/tools/lib/bpf/Makefile > +++ b/tools/lib/bpf/Makefile > @@ -239,7 +239,7 @@ install_lib: all_cmd > > SRC_HDRS := bpf.h libbpf.h btf.h libbpf_common.h libbpf_legacy.h xsk.h \ > bpf_helpers.h bpf_tracing.h bpf_endian.h bpf_core_read.h \ > - skel_internal.h libbpf_version.h > + skel_internal.h libbpf_version.h relo_core.h libbpf_internal.h this is the list of public API headers, this is not the right place, as Quentin pointed out > GEN_HDRS := $(BPF_GENERATED) > > INSTALL_PFX := $(DESTDIR)$(prefix)/include/bpf > diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c > index 4959c03a46f4..344b8b8e8a50 100644 > --- a/tools/lib/bpf/libbpf.c > +++ b/tools/lib/bpf/libbpf.c > @@ -5185,18 +5185,18 @@ size_t bpf_core_essential_name_len(const char *name) > return n; > } > > -static void bpf_core_free_cands(struct bpf_core_cand_list *cands) > +void bpf_core_free_cands(struct bpf_core_cand_list *cands) > { > free(cands->cands); > free(cands); > } > > -static int bpf_core_add_cands(struct bpf_core_cand *local_cand, > - size_t local_essent_len, > - const struct btf *targ_btf, > - const char *targ_btf_name, > - int targ_start_id, > - struct bpf_core_cand_list *cands) > +int bpf_core_add_cands(struct bpf_core_cand *local_cand, > + size_t local_essent_len, > + const struct btf *targ_btf, > + const char *targ_btf_name, > + int targ_start_id, > + struct bpf_core_cand_list *cands) > { > struct bpf_core_cand *new_cands, *cand; > const struct btf_type *t, *local_t; > @@ -5567,6 +5567,24 @@ static int bpf_core_resolve_relo(struct bpf_program *prog, > targ_res); > } > > +struct hashmap *bpf_core_create_cand_cache(void) > +{ > + return hashmap__new(bpf_core_hash_fn, bpf_core_equal_fn, NULL); > +} > + > +void bpf_core_free_cand_cache(struct hashmap *cand_cache) > +{ > + struct hashmap_entry *entry; > + int i; > + > + if (!IS_ERR_OR_NULL(cand_cache)) { with separate function for clean up, it's nicer to invert the if condition and exit early to reduce nesting > + hashmap__for_each_entry(cand_cache, entry, i) { > + bpf_core_free_cands(entry->value); > + } > + hashmap__free(cand_cache); > + } > +} > + [...]
On Wed, Jan 12, 2022 at 1:08 PM Quentin Monnet <quentin@isovalent.com> wrote: > > 2022-01-12 09:27 UTC-0500 ~ Mauricio Vásquez <mauricio@kinvolk.io> > > This commit extends libbpf with the features that are needed to > > implement BTFGen: > > > > - Implement bpf_core_create_cand_cache() and bpf_core_free_cand_cache() > > to handle candidates cache. > > - Expose bpf_core_add_cands() and bpf_core_free_cands to handle > > candidates list. > > - Expose bpf_core_calc_relo_insn() to bpftool. > > > > Signed-off-by: Mauricio Vásquez <mauricio@kinvolk.io> > > Signed-off-by: Rafael David Tinoco <rafael.tinoco@aquasec.com> > > Signed-off-by: Lorenzo Fontana <lorenzo.fontana@elastic.co> > > Signed-off-by: Leonardo Di Donato <leonardo.didonato@elastic.co> > > --- > > tools/lib/bpf/Makefile | 2 +- > > tools/lib/bpf/libbpf.c | 43 +++++++++++++++++++++------------ > > tools/lib/bpf/libbpf_internal.h | 12 +++++++++ > > 3 files changed, 41 insertions(+), 16 deletions(-) > > > > diff --git a/tools/lib/bpf/Makefile b/tools/lib/bpf/Makefile > > index f947b61b2107..dba019ee2832 100644 > > --- a/tools/lib/bpf/Makefile > > +++ b/tools/lib/bpf/Makefile > > @@ -239,7 +239,7 @@ install_lib: all_cmd > > > > SRC_HDRS := bpf.h libbpf.h btf.h libbpf_common.h libbpf_legacy.h xsk.h \ > > bpf_helpers.h bpf_tracing.h bpf_endian.h bpf_core_read.h \ > > - skel_internal.h libbpf_version.h > > + skel_internal.h libbpf_version.h relo_core.h libbpf_internal.h > > GEN_HDRS := $(BPF_GENERATED) > > I don't think these headers should be added to libbpf's SRC_HDRS. If we > must make them available to bpftool, we probably want to copy them > explicitly through LIBBPF_INTERNAL_HDRS in bpftool's Makefile. I got confused, thanks for catching this up!
diff --git a/tools/lib/bpf/Makefile b/tools/lib/bpf/Makefile index f947b61b2107..dba019ee2832 100644 --- a/tools/lib/bpf/Makefile +++ b/tools/lib/bpf/Makefile @@ -239,7 +239,7 @@ install_lib: all_cmd SRC_HDRS := bpf.h libbpf.h btf.h libbpf_common.h libbpf_legacy.h xsk.h \ bpf_helpers.h bpf_tracing.h bpf_endian.h bpf_core_read.h \ - skel_internal.h libbpf_version.h + skel_internal.h libbpf_version.h relo_core.h libbpf_internal.h GEN_HDRS := $(BPF_GENERATED) INSTALL_PFX := $(DESTDIR)$(prefix)/include/bpf diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c index 4959c03a46f4..344b8b8e8a50 100644 --- a/tools/lib/bpf/libbpf.c +++ b/tools/lib/bpf/libbpf.c @@ -5185,18 +5185,18 @@ size_t bpf_core_essential_name_len(const char *name) return n; } -static void bpf_core_free_cands(struct bpf_core_cand_list *cands) +void bpf_core_free_cands(struct bpf_core_cand_list *cands) { free(cands->cands); free(cands); } -static int bpf_core_add_cands(struct bpf_core_cand *local_cand, - size_t local_essent_len, - const struct btf *targ_btf, - const char *targ_btf_name, - int targ_start_id, - struct bpf_core_cand_list *cands) +int bpf_core_add_cands(struct bpf_core_cand *local_cand, + size_t local_essent_len, + const struct btf *targ_btf, + const char *targ_btf_name, + int targ_start_id, + struct bpf_core_cand_list *cands) { struct bpf_core_cand *new_cands, *cand; const struct btf_type *t, *local_t; @@ -5567,6 +5567,24 @@ static int bpf_core_resolve_relo(struct bpf_program *prog, targ_res); } +struct hashmap *bpf_core_create_cand_cache(void) +{ + return hashmap__new(bpf_core_hash_fn, bpf_core_equal_fn, NULL); +} + +void bpf_core_free_cand_cache(struct hashmap *cand_cache) +{ + struct hashmap_entry *entry; + int i; + + if (!IS_ERR_OR_NULL(cand_cache)) { + hashmap__for_each_entry(cand_cache, entry, i) { + bpf_core_free_cands(entry->value); + } + hashmap__free(cand_cache); + } +} + static int bpf_object__relocate_core(struct bpf_object *obj, const char *targ_btf_path) { @@ -5574,7 +5592,6 @@ bpf_object__relocate_core(struct bpf_object *obj, const char *targ_btf_path) struct bpf_core_relo_res targ_res; const struct bpf_core_relo *rec; const struct btf_ext_info *seg; - struct hashmap_entry *entry; struct hashmap *cand_cache = NULL; struct bpf_program *prog; struct bpf_insn *insn; @@ -5593,7 +5610,7 @@ bpf_object__relocate_core(struct bpf_object *obj, const char *targ_btf_path) } } - cand_cache = hashmap__new(bpf_core_hash_fn, bpf_core_equal_fn, NULL); + cand_cache = bpf_core_create_cand_cache(); if (IS_ERR(cand_cache)) { err = PTR_ERR(cand_cache); goto out; @@ -5697,12 +5714,8 @@ bpf_object__relocate_core(struct bpf_object *obj, const char *targ_btf_path) btf__free(obj->btf_vmlinux_override); obj->btf_vmlinux_override = NULL; - if (!IS_ERR_OR_NULL(cand_cache)) { - hashmap__for_each_entry(cand_cache, entry, i) { - bpf_core_free_cands(entry->value); - } - hashmap__free(cand_cache); - } + bpf_core_free_cand_cache(cand_cache); + return err; } diff --git a/tools/lib/bpf/libbpf_internal.h b/tools/lib/bpf/libbpf_internal.h index 1565679eb432..0c258c252919 100644 --- a/tools/lib/bpf/libbpf_internal.h +++ b/tools/lib/bpf/libbpf_internal.h @@ -526,4 +526,16 @@ static inline int ensure_good_fd(int fd) return fd; } +struct hashmap; + +struct hashmap *bpf_core_create_cand_cache(void); +void bpf_core_free_cand_cache(struct hashmap *cand_cache); +int bpf_core_add_cands(struct bpf_core_cand *local_cand, + size_t local_essent_len, + const struct btf *targ_btf, + const char *targ_btf_name, + int targ_start_id, + struct bpf_core_cand_list *cands); +void bpf_core_free_cands(struct bpf_core_cand_list *cands); + #endif /* __LIBBPF_LIBBPF_INTERNAL_H */