| Message ID | 20221030073204.1876-1-mrpre@163.com (mailing list archive) |
|---|---|
| State | Changes Requested |
| Delegated to: | BPF |
| Headers | show |
| Series | [v2] fix missing map name when creating a eBPF map | expand |
| Context | Check | Description |
|---|---|---|
| netdev/tree_selection | success | Not a local patch |
| bpf/vmtest-bpf-PR | fail | merge-conflict |
Hi mrpre, On 10/30/22 8:32 AM, mrpre wrote: > Signed-off-by: mrpre <mrpre@163.com> Small form letter: Please indicate iproute2 in subject, add a proper commit message / bug report and please also use an actual name instead of "mrpre" for the Signed-off-by. Thanks a lot, Daniel > --- > lib/bpf_legacy.c | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > diff --git a/lib/bpf_legacy.c b/lib/bpf_legacy.c > index 4fabdcc8..0fff035b 100644 > --- a/lib/bpf_legacy.c > +++ b/lib/bpf_legacy.c > @@ -1264,7 +1264,7 @@ static int bpf_map_create(enum bpf_map_type type, uint32_t size_key, > uint32_t size_value, uint32_t max_elem, > uint32_t flags, int inner_fd, int btf_fd, > uint32_t ifindex, uint32_t btf_id_key, > - uint32_t btf_id_val) > + uint32_t btf_id_val, const char *name) > { > union bpf_attr attr = {}; > > @@ -1278,6 +1278,7 @@ static int bpf_map_create(enum bpf_map_type type, uint32_t size_key, > attr.btf_fd = btf_fd; > attr.btf_key_type_id = btf_id_key; > attr.btf_value_type_id = btf_id_val; > + strncpy(attr.map_name, name, sizeof(attr.map_name)); > > return bpf(BPF_MAP_CREATE, &attr, sizeof(attr)); > } > @@ -1682,7 +1683,7 @@ probe: > errno = 0; > fd = bpf_map_create(map->type, map->size_key, map->size_value, > map->max_elem, map->flags, map_inner_fd, ctx->btf_fd, > - ifindex, ext->btf_id_key, ext->btf_id_val); > + ifindex, ext->btf_id_key, ext->btf_id_val, name); > > if (fd < 0 || ctx->verbose) { > bpf_map_report(fd, name, map, ctx, map_inner_fd); >
diff --git a/lib/bpf_legacy.c b/lib/bpf_legacy.c index 4fabdcc8..0fff035b 100644 --- a/lib/bpf_legacy.c +++ b/lib/bpf_legacy.c @@ -1264,7 +1264,7 @@ static int bpf_map_create(enum bpf_map_type type, uint32_t size_key, uint32_t size_value, uint32_t max_elem, uint32_t flags, int inner_fd, int btf_fd, uint32_t ifindex, uint32_t btf_id_key, - uint32_t btf_id_val) + uint32_t btf_id_val, const char *name) { union bpf_attr attr = {}; @@ -1278,6 +1278,7 @@ static int bpf_map_create(enum bpf_map_type type, uint32_t size_key, attr.btf_fd = btf_fd; attr.btf_key_type_id = btf_id_key; attr.btf_value_type_id = btf_id_val; + strncpy(attr.map_name, name, sizeof(attr.map_name)); return bpf(BPF_MAP_CREATE, &attr, sizeof(attr)); } @@ -1682,7 +1683,7 @@ probe: errno = 0; fd = bpf_map_create(map->type, map->size_key, map->size_value, map->max_elem, map->flags, map_inner_fd, ctx->btf_fd, - ifindex, ext->btf_id_key, ext->btf_id_val); + ifindex, ext->btf_id_key, ext->btf_id_val, name); if (fd < 0 || ctx->verbose) { bpf_map_report(fd, name, map, ctx, map_inner_fd);
Signed-off-by: mrpre <mrpre@163.com> --- lib/bpf_legacy.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)