Re: linux-next: manual merge of the net-next tree with the bpf tree

From: Martin KaFai Lau
Date: Thu Jul 26 2018 - 11:32:40 EST


On Thu, Jul 26, 2018 at 11:19:16AM +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the net-next tree got conflicts in:
>
> tools/lib/bpf/btf.c
> tools/lib/bpf/btf.h
>
> between commits:
>
> 5b891af7fca1 ("bpf: Replace [u]int32_t and [u]int64_t in libbpf")
> 38d5d3b3d5db ("bpf: Introduce BPF_ANNOTATE_KV_PAIR")
>
> from the bpf tree and commit:
>
> 92b57121ca79 ("bpf: btf: export btf types and name by offset from lib")
>
> from the net-next tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This
The fix LGTM. Thanks!

> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging. You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
>
> --
> Cheers,
> Stephen Rothwell
>
> diff --cc tools/lib/bpf/btf.c
> index 2d270c560df3,03161be094b4..000000000000
> --- a/tools/lib/bpf/btf.c
> +++ b/tools/lib/bpf/btf.c
> @@@ -269,9 -259,29 +266,29 @@@ __s64 btf__resolve_size(const struct bt
> return nelems * size;
> }
>
> + int btf__resolve_type(const struct btf *btf, __u32 type_id)
> + {
> + const struct btf_type *t;
> + int depth = 0;
> +
> + t = btf__type_by_id(btf, type_id);
> + while (depth < MAX_RESOLVE_DEPTH &&
> + !btf_type_is_void_or_null(t) &&
> + IS_MODIFIER(BTF_INFO_KIND(t->info))) {
> + type_id = t->type;
> + t = btf__type_by_id(btf, type_id);
> + depth++;
> + }
> +
> + if (depth == MAX_RESOLVE_DEPTH || btf_type_is_void_or_null(t))
> + return -EINVAL;
> +
> + return type_id;
> + }
> +
> -int32_t btf__find_by_name(const struct btf *btf, const char *type_name)
> +__s32 btf__find_by_name(const struct btf *btf, const char *type_name)
> {
> - uint32_t i;
> + __u32 i;
>
> if (!strcmp(type_name, "void"))
> return 0;
> @@@ -368,3 -379,20 +385,11 @@@ int btf__fd(const struct btf *btf
> {
> return btf->fd;
> }
> +
> + const char *btf__name_by_offset(const struct btf *btf, __u32 offset)
> + {
> + if (offset < btf->hdr->str_len)
> + return &btf->strings[offset];
> + else
> + return NULL;
> + }
> -
> -const struct btf_type *btf__type_by_id(const struct btf *btf,
> - __u32 type_id)
> -{
> - if (type_id > btf->nr_types)
> - return NULL;
> -
> - return btf->types[type_id];
> -}
> diff --cc tools/lib/bpf/btf.h
> index e2a09a155f84,24f361d99a5e..000000000000
> --- a/tools/lib/bpf/btf.h
> +++ b/tools/lib/bpf/btf.h
> @@@ -15,10 -14,12 +15,12 @@@ typedef int (*btf_print_fn_t)(const cha
> __attribute__((format(printf, 1, 2)));
>
> void btf__free(struct btf *btf);
> -struct btf *btf__new(uint8_t *data, uint32_t size, btf_print_fn_t err_log);
> -int32_t btf__find_by_name(const struct btf *btf, const char *type_name);
> -int64_t btf__resolve_size(const struct btf *btf, uint32_t type_id);
> +struct btf *btf__new(__u8 *data, __u32 size, btf_print_fn_t err_log);
> +__s32 btf__find_by_name(const struct btf *btf, const char *type_name);
> - const struct btf_type *btf__type_by_id(const struct btf *btf, __u32 id);
> +__s64 btf__resolve_size(const struct btf *btf, __u32 type_id);
> + int btf__resolve_type(const struct btf *btf, __u32 type_id);
> int btf__fd(const struct btf *btf);
> + const char *btf__name_by_offset(const struct btf *btf, __u32 offset);
> + const struct btf_type *btf__type_by_id(const struct btf *btf, __u32 type_id);
>
> #endif