Merge branch 'bpf-bpftool-various-fixes' (aee65746) · Commits · 戴 / test

Jakub Kicinski says: ==================== Two small fixes here to listing maps and programs. The loop for showing maps is written slightly differently to programs which was missed in JSON output support, and output would be broken if any of the system calls failed. Second fix is in very unlikely case that program or map disappears after we get its ID we should just skip over that object instead of failing. ==================== Signed-off-by:

Daniel Borkmann <daniel@iogearbox.net>

tools/bpf/bpftool/map.c

+5 −3

Original line number	Diff line number	Diff line
		@@ -523,21 +523,23 @@ static int do_show(int argc, char **argv)
		break;
		p_err("can't get next map: %s%s", strerror(errno),
		errno == EINVAL ? " -- kernel too old?" : "");
		return -1;
		break;
		}

		fd = bpf_map_get_fd_by_id(id);
		if (fd < 0) {
		if (errno == ENOENT)
		continue;
		p_err("can't get map by id (%u): %s",
		id, strerror(errno));
		return -1;
		break;
		}

		err = bpf_obj_get_info_by_fd(fd, &info, &len);
		if (err) {
		p_err("can't get map info: %s", strerror(errno));
		close(fd);
		return -1;
		break;
		}

		if (json_output)

tools/bpf/bpftool/prog.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -382,6 +382,8 @@ static int do_show(int argc, char **argv)

		fd = bpf_prog_get_fd_by_id(id);
		if (fd < 0) {
		if (errno == ENOENT)
		continue;
		p_err("can't get prog by id (%u): %s",
		id, strerror(errno));
		err = -1;

Admin message