netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: mrpre <mrpre@163.com>
To: daniel@iogearbox.net, stephen@networkplumber.org
Cc: netdev@vger.kernel.org, mrpre <mrpre@163.com>
Subject: [PATCH iproute2 v2] fix missing map name when creating eBPF maps
Date: Wed,  2 Nov 2022 07:05:06 +0000	[thread overview]
Message-ID: <20221102070506.1403-1-mrpre@163.com> (raw)
In-Reply-To: <ecd50658-d021-ef03-deac-868ad9416b4a@iogearbox.net>

fix missing map name when creating eBPF maps

Signed-off-by: Chen Jiayuan <mrpre@163.com>
---
 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);
-- 
2.25.1


      reply	other threads:[~2022-11-02  7:06 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <4079d76a.5b33.184195d2368.Coremail.mrpre@163.com>
2022-10-27 15:38 ` [PATCH iproute2]fix missing eBPF name Stephen Hemminger
2022-10-30  7:32   ` [PATCH v2] fix missing map name when creating a eBPF map mrpre
2022-11-01 14:09     ` Daniel Borkmann
2022-11-02  7:05       ` mrpre [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20221102070506.1403-1-mrpre@163.com \
    --to=mrpre@163.com \
    --cc=daniel@iogearbox.net \
    --cc=netdev@vger.kernel.org \
    --cc=stephen@networkplumber.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).