bpftool: don't print empty key/value for maps (04a5d323) · Commits · 戴 / test

When doing dump or lookup, don't print key if key_size == 0 or value if value_size == 0. The initial usecase is queue and stack, where we have only values. This is for regular output only, json still has all the fields. Before: bpftool map create /sys/fs/bpf/q type queue value 4 entries 10 name q bpftool map update pinned /sys/fs/bpf/q value 0 1 2 3 bpftool map lookup pinned /sys/fs/bpf/q key: value: 00 01 02 03 After: bpftool map create /sys/fs/bpf/q type queue value 4 entries 10 name q bpftool map update pinned /sys/fs/bpf/q value 0 1 2 3 bpftool map lookup pinned /sys/fs/bpf/q value: 00 01 02 03 Signed-off-by:

Stanislav Fomichev <sdf@google.com> Signed-off-by:

Daniel Borkmann <daniel@iogearbox.net>

tools/bpf/bpftool/map.c

+28 −19

Original line number	Diff line number	Diff line
		@@ -285,16 +285,21 @@ static void print_entry_plain(struct bpf_map_info info, unsigned char key,
		single_line = info->key_size + info->value_size <= 24 &&
		!break_names;

		if (info->key_size) {
		printf("key:%c", break_names ? '\n' : ' ');
		fprint_hex(stdout, key, info->key_size, " ");

		printf(single_line ? " " : "\n");
		}

		if (info->value_size) {
		printf("value:%c", break_names ? '\n' : ' ');
		if (value)
		fprint_hex(stdout, value, info->value_size, " ");
		fprint_hex(stdout, value, info->value_size,
		" ");
		else
		printf("<no entry>");
		}

		printf("\n");
		} else {
		@@ -303,9 +308,12 @@ static void print_entry_plain(struct bpf_map_info info, unsigned char key,
		n = get_possible_cpus();
		step = round_up(info->value_size, 8);

		if (info->key_size) {
		printf("key:\n");
		fprint_hex(stdout, key, info->key_size, " ");
		printf("\n");
		}
		if (info->value_size) {
		for (i = 0; i < n; i++) {
		printf("value (CPU %02d):%c",
		i, info->value_size > 16 ? '\n' : ' ');
		@@ -318,6 +326,7 @@ static void print_entry_plain(struct bpf_map_info info, unsigned char key,
		}
		}
		}
		}

		static char parse_bytes(char argv, const char name, unsigned char val,
		unsigned int n)

Admin message