Commit 0b52a5f4 authored by Andrii Nakryiko's avatar Andrii Nakryiko Committed by Alexei Starovoitov
Browse files

selftests/bpf: Migrate all deprecated perf_buffer uses 



Migrate all old-style perf_buffer__new() and perf_buffer__new_raw()
calls to new v1.0+ variants.

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-7-andrii@kernel.org
parent 41788934

tools/testing/selftests/bpf/benchs/bench_ringbufs.c

+2 −6
Original line number Diff line number Diff line
@@ -394,11 +394,6 @@ static void perfbuf_libbpf_setup() 
{

	struct perfbuf_libbpf_ctx *ctx = &perfbuf_libbpf_ctx;

	struct perf_event_attr attr;

	struct perf_buffer_raw_opts pb_opts = {

		.event_cb = perfbuf_process_sample_raw,

		.ctx = (void *)(long)0,

		.attr = &attr,

	};

	struct bpf_link *link;



	ctx->skel = perfbuf_setup_skeleton();
@@ -423,7 +418,8 @@ static void perfbuf_libbpf_setup() 
	}



	ctx->perfbuf = perf_buffer__new_raw(bpf_map__fd(ctx->skel->maps.perfbuf),

					    args.perfbuf_sz, &pb_opts);

					    args.perfbuf_sz, &attr,

					    perfbuf_process_sample_raw, NULL, NULL);

	if (!ctx->perfbuf) {

		fprintf(stderr, "failed to create perfbuf\n");

		exit(1);

tools/testing/selftests/bpf/prog_tests/get_stack_raw_tp.c

+2 −3
Original line number Diff line number Diff line
@@ -85,7 +85,6 @@ void test_get_stack_raw_tp(void) 
	const char *file_err = "./test_get_stack_rawtp_err.o";

	const char *prog_name = "raw_tracepoint/sys_enter";

	int i, err, prog_fd, exp_cnt = MAX_CNT_RAWTP;

	struct perf_buffer_opts pb_opts = {};

	struct perf_buffer *pb = NULL;

	struct bpf_link *link = NULL;

	struct timespec tv = {0, 10};
@@ -124,8 +123,8 @@ void test_get_stack_raw_tp(void) 
	if (!ASSERT_OK_PTR(link, "attach_raw_tp"))

		goto close_prog;



	pb_opts.sample_cb = get_stack_print_output;

	pb = perf_buffer__new(bpf_map__fd(map), 8, &pb_opts);

	pb = perf_buffer__new(bpf_map__fd(map), 8, get_stack_print_output,

			      NULL, NULL, NULL);

	if (!ASSERT_OK_PTR(pb, "perf_buf__new"))

		goto close_prog;

tools/testing/selftests/bpf/prog_tests/kfree_skb.c

+2 −4
Original line number Diff line number Diff line
@@ -66,7 +66,6 @@ void serial_test_kfree_skb(void) 
	struct bpf_map *perf_buf_map, *global_data;

	struct bpf_program *prog, *fentry, *fexit;

	struct bpf_object *obj, *obj2 = NULL;

	struct perf_buffer_opts pb_opts = {};

	struct perf_buffer *pb = NULL;

	int err, kfree_skb_fd;

	bool passed = false;
@@ -112,9 +111,8 @@ void serial_test_kfree_skb(void) 
		goto close_prog;



	/* set up perf buffer */

	pb_opts.sample_cb = on_sample;

	pb_opts.ctx = &passed;

	pb = perf_buffer__new(bpf_map__fd(perf_buf_map), 1, &pb_opts);

	pb = perf_buffer__new(bpf_map__fd(perf_buf_map), 1,

			      on_sample, NULL, &passed, NULL);

	if (!ASSERT_OK_PTR(pb, "perf_buf__new"))

		goto close_prog;

tools/testing/selftests/bpf/prog_tests/perf_buffer.c

+2 −4
Original line number Diff line number Diff line
@@ -47,7 +47,6 @@ void serial_test_perf_buffer(void) 
{

	int err, on_len, nr_on_cpus = 0, nr_cpus, i, j;

	int zero = 0, my_pid = getpid();

	struct perf_buffer_opts pb_opts = {};

	struct test_perf_buffer *skel;

	cpu_set_t cpu_seen;

	struct perf_buffer *pb;
@@ -82,9 +81,8 @@ void serial_test_perf_buffer(void) 
		goto out_close;



	/* set up perf buffer */

	pb_opts.sample_cb = on_sample;

	pb_opts.ctx = &cpu_seen;

	pb = perf_buffer__new(bpf_map__fd(skel->maps.perf_buf_map), 1, &pb_opts);

	pb = perf_buffer__new(bpf_map__fd(skel->maps.perf_buf_map), 1,

			      on_sample, NULL, &cpu_seen, NULL);

	if (!ASSERT_OK_PTR(pb, "perf_buf__new"))

		goto out_close;

tools/testing/selftests/bpf/prog_tests/xdp_bpf2bpf.c

+2 −5
Original line number Diff line number Diff line
@@ -49,7 +49,6 @@ void test_xdp_bpf2bpf(void) 
	struct vip key4 = {.protocol = 6, .family = AF_INET};

	struct bpf_program *prog;

	struct perf_buffer *pb = NULL;

	struct perf_buffer_opts pb_opts = {};



	/* Load XDP program to introspect */

	pkt_skel = test_xdp__open_and_load();
@@ -86,10 +85,8 @@ void test_xdp_bpf2bpf(void) 
		goto out;



	/* Set up perf buffer */

	pb_opts.sample_cb = on_sample;

	pb_opts.ctx = &passed;

	pb = perf_buffer__new(bpf_map__fd(ftrace_skel->maps.perf_buf_map),

			      1, &pb_opts);

	pb = perf_buffer__new(bpf_map__fd(ftrace_skel->maps.perf_buf_map), 1,

			      on_sample, NULL, &passed, NULL);

	if (!ASSERT_OK_PTR(pb, "perf_buf__new"))

		goto out;