diff mbox series

[RESEND] bpftool: Support use full prog name in prog subcommand

Message ID 2851b8859666a02878bc897d6c2fb51c80cadce8.1667356049.git.chentao.kernel@linux.alibaba.com
State New
Headers
Series [RESEND] bpftool: Support use full prog name in prog subcommand |

Commit Message

Tao Chen Nov. 2, 2022, 2:35 a.m. UTC 
  Now that the commit: <b662000aff84> ("bpftool: Adding support for BTF
program names") supported show the full prog name, we can also use
the full prog name more than 16 (BPF_OBJ_NAME_LEN) chars in prog
subcommand, such as "bpftool prog show name PROG_NAME".

Signed-off-by: Tao Chen <chentao.kernel@linux.alibaba.com>
---
 tools/bpf/bpftool/common.c | 45 ++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 40 insertions(+), 5 deletions(-)

Comments

Quentin Monnet Nov. 2, 2022, 11:56 a.m. UTC | #1 
2022-11-02 10:35 UTC+0800 ~ Tao Chen <chentao.kernel@linux.alibaba.com>
> Now that the commit: <b662000aff84> ("bpftool: Adding support for BTF
> program names") supported show the full prog name, we can also use
> the full prog name more than 16 (BPF_OBJ_NAME_LEN) chars in prog
> subcommand, such as "bpftool prog show name PROG_NAME".
> 
> Signed-off-by: Tao Chen <chentao.kernel@linux.alibaba.com>

Thanks! But you mean you want something like this, correct?

	# ./bpftool prog pin \
		name prog_with_a_very_long_name /sys/fs/bpf/foo

This is already possible since commit d55dfe587bc0 ("bpftool: Remove
BPF_OBJ_NAME_LEN restriction when looking up bpf program by name"). Your
first version of the patch was based on a version that didn't have this
commit, but bpftool from bpf-next already supports this.

Quentin
Tao Chen Nov. 2, 2022, 12:55 p.m. UTC | #2 
在 2022/11/2 下午7:56, Quentin Monnet 写道:
> 2022-11-02 10:35 UTC+0800 ~ Tao Chen <chentao.kernel@linux.alibaba.com>
>> Now that the commit: <b662000aff84> ("bpftool: Adding support for BTF
>> program names") supported show the full prog name, we can also use
>> the full prog name more than 16 (BPF_OBJ_NAME_LEN) chars in prog
>> subcommand, such as "bpftool prog show name PROG_NAME".
>>
>> Signed-off-by: Tao Chen <chentao.kernel@linux.alibaba.com>
> 
> Thanks! But you mean you want something like this, correct?
> 
> 	# ./bpftool prog pin \
> 		name prog_with_a_very_long_name /sys/fs/bpf/foo
> 
> This is already possible since commit d55dfe587bc0 ("bpftool: Remove
> BPF_OBJ_NAME_LEN restriction when looking up bpf program by name"). Your
> first version of the patch was based on a version that didn't have this
> commit, but bpftool from bpf-next already supports this.
> 
> Quentin
Yes, sorry my branch is a little behind，please ignore this patch, thank 
you for your reply!
diff mbox series

Patch

diff --git a/tools/bpf/bpftool/common.c b/tools/bpf/bpftool/common.c
index 8727765..5d61f26 100644
--- a/tools/bpf/bpftool/common.c
+++ b/tools/bpf/bpftool/common.c
@@ -720,6 +720,40 @@  print_all_levels(__maybe_unused enum libbpf_print_level level,
 	return vfprintf(stderr, format, args);
 }
 
+static bool is_invalid_name(char *nametag, struct bpf_prog_info *info,
+				struct bpf_func_info *finfo, bool tag)
+{
+	const struct btf *prog_btf;
+	const struct btf_type *func_type;
+	const char *name;
+
+	if (tag)
+		return memcmp(nametag, info->tag, BPF_TAG_SIZE);
+
+	if (strlen(nametag) < BPF_OBJ_NAME_LEN)
+		return strncmp(nametag, info->name, BPF_OBJ_NAME_LEN);
+
+	prog_btf = btf__load_from_kernel_by_id(info->btf_id);
+	if (!prog_btf) {
+		p_err("get prog btf failed, btf_id:%u\n", info->btf_id);
+		return true;
+	}
+
+	func_type = btf__type_by_id(prog_btf, finfo->type_id);
+	if (!func_type || !btf_is_func(func_type)) {
+		p_err("func type invalid, type_id:%u\n", finfo->type_id);
+		return true;
+	}
+
+	name = btf__name_by_offset(prog_btf, func_type->name_off);
+	if (!name) {
+		p_err("func name invalid, name_off:%u\n", func_type->name_off);
+		return true;
+	}
+
+	return strncmp(nametag, name, strlen(name));
+}
+
 static int prog_fd_by_nametag(void *nametag, int **fds, bool tag)
 {
 	char prog_name[MAX_PROG_FULL_NAME];
@@ -730,6 +764,7 @@  static int prog_fd_by_nametag(void *nametag, int **fds, bool tag)
 
 	while (true) {
 		struct bpf_prog_info info = {};
+		struct bpf_func_info finfo = {};
 		__u32 len = sizeof(info);
 
 		err = bpf_prog_get_next_id(id, &id);
@@ -748,6 +783,10 @@  static int prog_fd_by_nametag(void *nametag, int **fds, bool tag)
 			goto err_close_fds;
 		}
 
+		info.nr_func_info = 1;
+		info.func_info_rec_size = sizeof(finfo);
+		info.func_info = ptr_to_u64(&finfo);
+
 		err = bpf_obj_get_info_by_fd(fd, &info, &len);
 		if (err) {
 			p_err("can't get prog info (%u): %s",
@@ -755,7 +794,7 @@  static int prog_fd_by_nametag(void *nametag, int **fds, bool tag)
 			goto err_close_fd;
 		}
 
-		if (tag && memcmp(nametag, info.tag, BPF_TAG_SIZE)) {
+		if (is_invalid_name(nametag, &info, &finfo, tag)) {
 			close(fd);
 			continue;
 		}
@@ -829,10 +868,6 @@  int prog_parse_fds(int *argc, char ***argv, int **fds)
 		NEXT_ARGP();
 
 		name = **argv;
-		if (strlen(name) > MAX_PROG_FULL_NAME - 1) {
-			p_err("can't parse name");
-			return -1;
-		}
 		NEXT_ARGP();
 
 		return prog_fd_by_nametag(name, fds, false);