Commit 164b04f2 authored by Andrii Nakryiko's avatar Andrii Nakryiko Committed by Alexei Starovoitov
Browse files

bpftool: Update btf_dump__new() and perf_buffer__new_raw() calls 



Use v1.0-compatible variants of btf_dump and perf_buffer "constructors".
This is also a demonstration of reusing struct perf_buffer_raw_opts as
OPTS-style option struct for new perf_buffer__new_raw() API.

Signed-off-by: default avatarAndrii Nakryiko <andrii@kernel.org>
Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
Link: https://lore.kernel.org/bpf/20211111053624.190580-10-andrii@kernel.org
parent eda8bfa5

tools/bpf/bpftool/btf.c

+1 −1
Original line number Diff line number Diff line
@@ -418,7 +418,7 @@ static int dump_btf_c(const struct btf *btf, 
	struct btf_dump *d;

	int err = 0, i;



	d = btf_dump__new(btf, NULL, NULL, btf_dump_printf);

	d = btf_dump__new(btf, btf_dump_printf, NULL, NULL);

	if (IS_ERR(d))

		return PTR_ERR(d);

tools/bpf/bpftool/gen.c

+1 −1
Original line number Diff line number Diff line
@@ -218,7 +218,7 @@ static int codegen_datasecs(struct bpf_object *obj, const char *obj_name) 
	char sec_ident[256], map_ident[256];

	int i, err = 0;



	d = btf_dump__new(btf, NULL, NULL, codegen_btf_dump_printf);

	d = btf_dump__new(btf, codegen_btf_dump_printf, NULL, NULL);

	if (IS_ERR(d))

		return PTR_ERR(d);

tools/bpf/bpftool/map_perf_ring.c

+3 −6
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ int do_event_pipe(int argc, char **argv) 
		.wakeup_events = 1,

	};

	struct bpf_map_info map_info = {};

	struct perf_buffer_raw_opts opts = {};

	LIBBPF_OPTS(perf_buffer_raw_opts, opts);

	struct event_pipe_ctx ctx = {

		.all_cpus = true,

		.cpu = -1,
@@ -190,14 +190,11 @@ int do_event_pipe(int argc, char **argv) 
		ctx.idx = 0;

	}



	opts.attr = &perf_attr;

	opts.event_cb = print_bpf_output;

	opts.ctx = &ctx;

	opts.cpu_cnt = ctx.all_cpus ? 0 : 1;

	opts.cpus = &ctx.cpu;

	opts.map_keys = &ctx.idx;



	pb = perf_buffer__new_raw(map_fd, MMAP_PAGE_CNT, &opts);

	pb = perf_buffer__new_raw(map_fd, MMAP_PAGE_CNT, &perf_attr,

				  print_bpf_output, &ctx, &opts);

	err = libbpf_get_error(pb);

	if (err) {

		p_err("failed to create perf buffer: %s (%d)",