From: Prashant Bhole <bhole_prashant_q7@lab.ntt.co.jp>
To: "David S . Miller" <davem@davemloft.net>
Cc: Prashant Bhole <bhole_prashant_q7@lab.ntt.co.jp>,
netdev@vger.kernel.org, Alexei Starovoitov <ast@kernel.org>,
Daniel Borkmann <daniel@iogearbox.net>,
Quentin Monnet <quentin.monnet@netronome.com>,
Jakub Kicinski <jakub.kicinski@netronome.com>
Subject: [PATCH net-next 1/3] tools: bpftool: open pinned object without type check
Date: Tue, 31 Oct 2017 16:36:30 +0900 [thread overview]
Message-ID: <20171031073632.8140-2-bhole_prashant_q7@lab.ntt.co.jp> (raw)
In-Reply-To: <20171031073632.8140-1-bhole_prashant_q7@lab.ntt.co.jp>
This was needed for opening any file in bpf-fs without knowing
its object type
Signed-off-by: Prashant Bhole <bhole_prashant_q7@lab.ntt.co.jp>
---
tools/bpf/bpftool/common.c | 15 +++++++++++++--
tools/bpf/bpftool/main.h | 1 +
2 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/tools/bpf/bpftool/common.c b/tools/bpf/bpftool/common.c
index f028826..4556947 100644
--- a/tools/bpf/bpftool/common.c
+++ b/tools/bpf/bpftool/common.c
@@ -91,9 +91,8 @@ static int mnt_bpffs(const char *target, char *buff, size_t bufflen)
return 0;
}
-int open_obj_pinned_any(char *path, enum bpf_obj_type exp_type)
+int open_obj_pinned(char *path)
{
- enum bpf_obj_type type;
int fd;
fd = bpf_obj_get(path);
@@ -105,6 +104,18 @@ int open_obj_pinned_any(char *path, enum bpf_obj_type exp_type)
return -1;
}
+ return fd;
+}
+
+int open_obj_pinned_any(char *path, enum bpf_obj_type exp_type)
+{
+ enum bpf_obj_type type;
+ int fd;
+
+ fd = open_obj_pinned(path);
+ if (fd < 0)
+ return -1;
+
type = get_fd_type(fd);
if (type < 0) {
close(fd);
diff --git a/tools/bpf/bpftool/main.h b/tools/bpf/bpftool/main.h
index d315d01..4b56850 100644
--- a/tools/bpf/bpftool/main.h
+++ b/tools/bpf/bpftool/main.h
@@ -86,6 +86,7 @@ int cmd_select(const struct cmd *cmds, int argc, char **argv,
int get_fd_type(int fd);
const char *get_fd_type_name(enum bpf_obj_type type);
char *get_fdinfo(int fd, const char *key);
+int open_obj_pinned(char *path);
int open_obj_pinned_any(char *path, enum bpf_obj_type exp_type);
int do_pin_any(int argc, char **argv, int (*get_fd_by_id)(__u32));
--
1.8.3.1
next prev parent reply other threads:[~2017-10-31 8:34 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-31 7:36 [PATCH net-next 0/3] tools: bpftool: show filenames of pinned objects Prashant Bhole
2017-10-31 7:36 ` Prashant Bhole [this message]
2017-10-31 7:36 ` [PATCH net-next 2/3] " Prashant Bhole
2017-10-31 11:41 ` Quentin Monnet
2017-10-31 17:35 ` Jakub Kicinski
2017-11-02 7:57 ` Prashant Bhole
2017-10-31 7:36 ` [PATCH net-next 3/3] tools: bpftool: optionally " Prashant Bhole
2017-10-31 11:54 ` Quentin Monnet
2017-10-31 17:37 ` Jakub Kicinski
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=20171031073632.8140-2-bhole_prashant_q7@lab.ntt.co.jp \
--to=bhole_prashant_q7@lab.ntt.co.jp \
--cc=ast@kernel.org \
--cc=daniel@iogearbox.net \
--cc=davem@davemloft.net \
--cc=jakub.kicinski@netronome.com \
--cc=netdev@vger.kernel.org \
--cc=quentin.monnet@netronome.com \
/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).