From: Jesper Dangaard Brouer <brouer@redhat.com>
To: kafai@fb.com
Cc: netdev@vger.kernel.org, eric@regit.org,
Daniel Borkmann <borkmann@iogearbox.net>,
Alexei Starovoitov <alexei.starovoitov@gmail.com>,
Jesper Dangaard Brouer <brouer@redhat.com>
Subject: [net-next PATCH 4/4] samples/bpf: export map_data[] for more info on maps
Date: Tue, 02 May 2017 14:32:06 +0200 [thread overview]
Message-ID: <149372832617.22268.13214976764737514956.stgit@firesoul> (raw)
In-Reply-To: <149372826543.22268.3617359219409721129.stgit@firesoul>
Giving *_user.c side tools access to map_data[] provides easier
access to information on the maps being loaded. Still provide
the guarantee that the order maps are being defined in inside the
_kern.c file corresponds with the order in the array. Now user
tools are not blind, but can inspect and verify the maps that got
loaded from the ELF binary.
Signed-off-by: Jesper Dangaard Brouer <brouer@redhat.com>
---
samples/bpf/bpf_load.h | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/samples/bpf/bpf_load.h b/samples/bpf/bpf_load.h
index 4d4fd4678a64..ca0563d04744 100644
--- a/samples/bpf/bpf_load.h
+++ b/samples/bpf/bpf_load.h
@@ -24,12 +24,18 @@ struct bpf_map_data {
typedef void (*fixup_map_cb)(struct bpf_map_data *map, int idx);
-extern int map_fd[MAX_MAPS];
extern int prog_fd[MAX_PROGS];
extern int event_fd[MAX_PROGS];
extern char bpf_log_buf[BPF_LOG_BUF_SIZE];
extern int prog_cnt;
+/* There is a one-to-one mapping between map_fd[] and map_data[].
+ * The map_data[] just contains more rich info on the given map.
+ */
+extern int map_fd[MAX_MAPS];
+extern struct bpf_map_data map_data[MAX_MAPS];
+extern int map_data_count;
+
/* parses elf file compiled by llvm .c->.o
* . parses 'maps' section and creates maps via BPF syscall
* . parses 'license' section and passes it to syscall
next prev parent reply other threads:[~2017-05-02 12:32 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-02 12:31 [net-next PATCH 0/4] Improve bpf ELF-loader under samples/bpf Jesper Dangaard Brouer
2017-05-02 12:31 ` [net-next PATCH 1/4] samples/bpf: adjust rlimit RLIMIT_MEMLOCK for traceex2, tracex3 and tracex4 Jesper Dangaard Brouer
2017-05-03 0:53 ` Alexei Starovoitov
2017-05-03 8:12 ` Jesper Dangaard Brouer
2017-05-03 13:31 ` David Miller
2017-05-02 12:31 ` [net-next PATCH 2/4] samples/bpf: make bpf_load.c code compatible with ELF maps section changes Jesper Dangaard Brouer
2017-05-03 0:54 ` Alexei Starovoitov
2017-05-03 5:48 ` Jesper Dangaard Brouer
2017-05-02 12:32 ` [net-next PATCH 3/4] samples/bpf: load_bpf.c make callback fixup more flexible Jesper Dangaard Brouer
2017-05-02 12:32 ` Jesper Dangaard Brouer [this message]
2017-05-02 19:40 ` [net-next PATCH 0/4] Improve bpf ELF-loader under samples/bpf David Miller
2017-05-02 20:30 ` Daniel Borkmann
2017-05-02 21:10 ` Daniel Borkmann
2017-05-03 6:16 ` Jesper Dangaard Brouer
2017-05-03 11:48 ` Daniel Borkmann
2017-05-03 13:30 ` David Miller
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=149372832617.22268.13214976764737514956.stgit@firesoul \
--to=brouer@redhat.com \
--cc=alexei.starovoitov@gmail.com \
--cc=borkmann@iogearbox.net \
--cc=eric@regit.org \
--cc=kafai@fb.com \
--cc=netdev@vger.kernel.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