Commit 60ba87bb authored by Andrii Nakryiko's avatar Andrii Nakryiko Committed by Alexei Starovoitov
Browse files

selftests/bpf: Update btf_dump__new() uses to v1.0+ variant 



Update to-be-deprecated forms of btf_dump__new().

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-8-andrii@kernel.org
parent 0b52a5f4

tools/testing/selftests/bpf/btf_helpers.c

+1 −3
Original line number Diff line number Diff line
@@ -238,7 +238,6 @@ const char *btf_type_c_dump(const struct btf *btf) 
	static char buf[16 * 1024];

	FILE *buf_file;

	struct btf_dump *d = NULL;

	struct btf_dump_opts opts = {};

	int err, i;



	buf_file = fmemopen(buf, sizeof(buf) - 1, "w");
@@ -247,8 +246,7 @@ const char *btf_type_c_dump(const struct btf *btf) 
		return NULL;

	}



	opts.ctx = buf_file;

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

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

	if (libbpf_get_error(d)) {

		fprintf(stderr, "Failed to create btf_dump instance: %ld\n", libbpf_get_error(d));

		goto err_out;

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

+13 −20
Original line number Diff line number Diff line
@@ -13,25 +13,23 @@ static struct btf_dump_test_case { 
	const char *name;

	const char *file;

	bool known_ptr_sz;

	struct btf_dump_opts opts;

} btf_dump_test_cases[] = {

	{"btf_dump: syntax", "btf_dump_test_case_syntax", true, {}},

	{"btf_dump: ordering", "btf_dump_test_case_ordering", false, {}},

	{"btf_dump: padding", "btf_dump_test_case_padding", true, {}},

	{"btf_dump: packing", "btf_dump_test_case_packing", true, {}},

	{"btf_dump: bitfields", "btf_dump_test_case_bitfields", true, {}},

	{"btf_dump: multidim", "btf_dump_test_case_multidim", false, {}},

	{"btf_dump: namespacing", "btf_dump_test_case_namespacing", false, {}},

	{"btf_dump: syntax", "btf_dump_test_case_syntax", true},

	{"btf_dump: ordering", "btf_dump_test_case_ordering", false},

	{"btf_dump: padding", "btf_dump_test_case_padding", true},

	{"btf_dump: packing", "btf_dump_test_case_packing", true},

	{"btf_dump: bitfields", "btf_dump_test_case_bitfields", true},

	{"btf_dump: multidim", "btf_dump_test_case_multidim", false},

	{"btf_dump: namespacing", "btf_dump_test_case_namespacing", false},

};



static int btf_dump_all_types(const struct btf *btf,

			      const struct btf_dump_opts *opts)

static int btf_dump_all_types(const struct btf *btf, void *ctx)

{

	size_t type_cnt = btf__type_cnt(btf);

	struct btf_dump *d;

	int err = 0, id;



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

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

	err = libbpf_get_error(d);

	if (err)

		return err;
@@ -88,8 +86,7 @@ static int test_btf_dump_case(int n, struct btf_dump_test_case *t) 
		goto done;

	}



	t->opts.ctx = f;

	err = btf_dump_all_types(btf, &t->opts);

	err = btf_dump_all_types(btf, f);

	fclose(f);

	close(fd);

	if (CHECK(err, "btf_dump", "failure during C dumping: %d\n", err)) {
@@ -137,7 +134,6 @@ static void test_btf_dump_incremental(void) 
{

	struct btf *btf = NULL;

	struct btf_dump *d = NULL;

	struct btf_dump_opts opts;

	int id, err, i;



	dump_buf_file = open_memstream(&dump_buf, &dump_buf_sz);
@@ -146,8 +142,7 @@ static void test_btf_dump_incremental(void) 
	btf = btf__new_empty();

	if (!ASSERT_OK_PTR(btf, "new_empty"))

		goto err_out;

	opts.ctx = dump_buf_file;

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

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

	if (!ASSERT_OK(libbpf_get_error(d), "btf_dump__new"))

		goto err_out;
@@ -815,7 +810,6 @@ static void test_btf_datasec(struct btf *btf, struct btf_dump *d, char *str, 
static void test_btf_dump_datasec_data(char *str)

{

	struct btf *btf;

	struct btf_dump_opts opts = { .ctx = str };

	char license[4] = "GPL";

	struct btf_dump *d;
@@ -823,7 +817,7 @@ static void test_btf_dump_datasec_data(char *str) 
	if (!ASSERT_OK_PTR(btf, "xdping_kern.o BTF not found"))

		return;



	d = btf_dump__new(btf, NULL, &opts, btf_dump_snprintf);

	d = btf_dump__new(btf, btf_dump_snprintf, str, NULL);

	if (!ASSERT_OK_PTR(d, "could not create BTF dump"))

		goto out;
@@ -837,7 +831,6 @@ static void test_btf_dump_datasec_data(char *str) 


void test_btf_dump() {

	char str[STRSIZE];

	struct btf_dump_opts opts = { .ctx = str };

	struct btf_dump *d;

	struct btf *btf;

	int i;
@@ -857,7 +850,7 @@ void test_btf_dump() { 
	if (!ASSERT_OK_PTR(btf, "no kernel BTF found"))

		return;



	d = btf_dump__new(btf, NULL, &opts, btf_dump_snprintf);

	d = btf_dump__new(btf, btf_dump_snprintf, str, NULL);

	if (!ASSERT_OK_PTR(d, "could not create BTF dump"))

		return;

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

+1 −3
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@ static void btf_dump_printf(void *ctx, const char *fmt, va_list args) 
}



void test_btf_split() {

	struct btf_dump_opts opts;

	struct btf_dump *d = NULL;

	const struct btf_type *t;

	struct btf *btf1, *btf2;
@@ -68,8 +67,7 @@ void test_btf_split() { 
	dump_buf_file = open_memstream(&dump_buf, &dump_buf_sz);

	if (!ASSERT_OK_PTR(dump_buf_file, "dump_memstream"))

		return;

	opts.ctx = dump_buf_file;

	d = btf_dump__new(btf2, NULL, &opts, btf_dump_printf);

	d = btf_dump__new(btf2, btf_dump_printf, dump_buf_file, NULL);

	if (!ASSERT_OK_PTR(d, "btf_dump__new"))

		goto cleanup;

	for (i = 1; i < btf__type_cnt(btf2); i++) {