OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

tools: bpftool: open pinned object without type check 

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>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Prashant Bhole 2017-11-08 13:55:47 +09:00 committed by David S. Miller
parent 329fca60a9
commit 1852719658
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tools/bpf/bpftool/common.c
View File

@ -122,9 +122,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);
@ -136,6 +135,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);

1
tools/bpf/bpftool/main.h
View File

@ -89,6 +89,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));