selftests/bpf: Switch to new btf__type_cnt/btf__raw_data APIs

Replace the calls to btf__get_nr_types/btf__get_raw_data in
selftests with new APIs btf__type_cnt/btf__raw_data. The old
APIs will be deprecated in libbpf v0.7+.

Signed-off-by: Hengqi Chen <hengqi.chen@gmail.com>
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Link: https://lore.kernel.org/bpf/20211022130623.1548429-6-hengqi.chen@gmail.com

diff --git a/tools/testing/selftests/bpf/btf_helpers.c b/tools/testing/selftests/bpf/btf_helpers.c
index 668cfa2..b5b6b01 100644 (file)
--- a/tools/testing/selftests/bpf/btf_helpers.c
+++ b/tools/testing/selftests/bpf/btf_helpers.c
@@ -215,7 +215,7 @@ int btf_validate_raw(struct btf *btf, int nr_types, const char *exp_types[])
        int i;
        bool ok = true;
 
-       ASSERT_EQ(btf__get_nr_types(btf), nr_types, "btf_nr_types");
+       ASSERT_EQ(btf__type_cnt(btf) - 1, nr_types, "btf_nr_types");
 
        for (i = 1; i <= nr_types; i++) {
                if (!ASSERT_STREQ(btf_type_raw_dump(btf, i), exp_types[i - 1], "raw_dump"))
@@ -254,7 +254,7 @@ const char *btf_type_c_dump(const struct btf *btf)
                return NULL;
        }
 
-       for (i = 1; i <= btf__get_nr_types(btf); i++) {
+       for (i = 1; i < btf__type_cnt(btf); i++) {
                err = btf_dump__dump_type(d, i);
                if (err) {
                        fprintf(stderr, "Failed to dump type [%d]: %d\n", i, err);

diff --git a/tools/testing/selftests/bpf/prog_tests/btf.c b/tools/testing/selftests/bpf/prog_tests/btf.c
index fa67f25..557f948 100644 (file)
--- a/tools/testing/selftests/bpf/prog_tests/btf.c
+++ b/tools/testing/selftests/bpf/prog_tests/btf.c
@@ -7274,8 +7274,8 @@ static void do_test_dedup(unsigned int test_num)
                goto done;
        }
 
-       test_btf_data = btf__get_raw_data(test_btf, &test_btf_size);
-       expect_btf_data = btf__get_raw_data(expect_btf, &expect_btf_size);
+       test_btf_data = btf__raw_data(test_btf, &test_btf_size);
+       expect_btf_data = btf__raw_data(expect_btf, &expect_btf_size);
        if (CHECK(test_btf_size != expect_btf_size,
                  "test_btf_size:%u != expect_btf_size:%u",
                  test_btf_size, expect_btf_size)) {
@@ -7329,8 +7329,8 @@ static void do_test_dedup(unsigned int test_num)
                expect_str_cur += expect_len + 1;
        }
 
-       test_nr_types = btf__get_nr_types(test_btf);
-       expect_nr_types = btf__get_nr_types(expect_btf);
+       test_nr_types = btf__type_cnt(test_btf);
+       expect_nr_types = btf__type_cnt(expect_btf);
        if (CHECK(test_nr_types != expect_nr_types,
                  "test_nr_types:%u != expect_nr_types:%u",
                  test_nr_types, expect_nr_types)) {
@@ -7338,7 +7338,7 @@ static void do_test_dedup(unsigned int test_num)
                goto done;
        }
 
-       for (i = 1; i <= test_nr_types; i++) {
+       for (i = 1; i < test_nr_types; i++) {
                const struct btf_type *test_type, *expect_type;
                int test_size, expect_size;
 

diff --git a/tools/testing/selftests/bpf/prog_tests/btf_dump.c b/tools/testing/selftests/bpf/prog_tests/btf_dump.c
index 12f457b..3d837a7 100644 (file)
--- a/tools/testing/selftests/bpf/prog_tests/btf_dump.c
+++ b/tools/testing/selftests/bpf/prog_tests/btf_dump.c
@@ -27,7 +27,7 @@ static struct btf_dump_test_case {
 static int btf_dump_all_types(const struct btf *btf,
                              const struct btf_dump_opts *opts)
 {
-       size_t type_cnt = btf__get_nr_types(btf);
+       size_t type_cnt = btf__type_cnt(btf);
        struct btf_dump *d;
        int err = 0, id;
 
@@ -36,7 +36,7 @@ static int btf_dump_all_types(const struct btf *btf,
        if (err)
                return err;
 
-       for (id = 1; id <= type_cnt; id++) {
+       for (id = 1; id < type_cnt; id++) {
                err = btf_dump__dump_type(d, id);
                if (err)
                        goto done;
@@ -171,7 +171,7 @@ void test_btf_dump_incremental(void)
        err = btf__add_field(btf, "x", 2, 0, 0);
        ASSERT_OK(err, "field_ok");
 
-       for (i = 1; i <= btf__get_nr_types(btf); i++) {
+       for (i = 1; i < btf__type_cnt(btf); i++) {
                err = btf_dump__dump_type(d, i);
                ASSERT_OK(err, "dump_type_ok");
        }
@@ -210,7 +210,7 @@ void test_btf_dump_incremental(void)
        err = btf__add_field(btf, "s", 3, 32, 0);
        ASSERT_OK(err, "field_ok");
 
-       for (i = 1; i <= btf__get_nr_types(btf); i++) {
+       for (i = 1; i < btf__type_cnt(btf); i++) {
                err = btf_dump__dump_type(d, i);
                ASSERT_OK(err, "dump_type_ok");
        }

diff --git a/tools/testing/selftests/bpf/prog_tests/btf_endian.c b/tools/testing/selftests/bpf/prog_tests/btf_endian.c
index 8ab5d3e..2653cc4 100644 (file)
--- a/tools/testing/selftests/bpf/prog_tests/btf_endian.c
+++ b/tools/testing/selftests/bpf/prog_tests/btf_endian.c
@@ -32,7 +32,7 @@ void test_btf_endian() {
        ASSERT_EQ(btf__endianness(btf), swap_endian, "endian");
 
        /* Get raw BTF data in non-native endianness... */
-       raw_data = btf__get_raw_data(btf, &raw_sz);
+       raw_data = btf__raw_data(btf, &raw_sz);
        if (!ASSERT_OK_PTR(raw_data, "raw_data_inverted"))
                goto err_out;
 
@@ -42,9 +42,9 @@ void test_btf_endian() {
                goto err_out;
 
        ASSERT_EQ(btf__endianness(swap_btf), swap_endian, "endian");
-       ASSERT_EQ(btf__get_nr_types(swap_btf), btf__get_nr_types(btf), "nr_types");
+       ASSERT_EQ(btf__type_cnt(swap_btf), btf__type_cnt(btf), "nr_types");
 
-       swap_raw_data = btf__get_raw_data(swap_btf, &swap_raw_sz);
+       swap_raw_data = btf__raw_data(swap_btf, &swap_raw_sz);
        if (!ASSERT_OK_PTR(swap_raw_data, "swap_raw_data"))
                goto err_out;
 
@@ -58,7 +58,7 @@ void test_btf_endian() {
 
        /* swap it back to native endianness */
        btf__set_endianness(swap_btf, endian);
-       swap_raw_data = btf__get_raw_data(swap_btf, &swap_raw_sz);
+       swap_raw_data = btf__raw_data(swap_btf, &swap_raw_sz);
        if (!ASSERT_OK_PTR(swap_raw_data, "swap_raw_data"))
                goto err_out;
 
@@ -75,7 +75,7 @@ void test_btf_endian() {
        swap_btf = NULL;
 
        btf__set_endianness(btf, swap_endian);
-       raw_data = btf__get_raw_data(btf, &raw_sz);
+       raw_data = btf__raw_data(btf, &raw_sz);
        if (!ASSERT_OK_PTR(raw_data, "raw_data_inverted"))
                goto err_out;
 
@@ -85,7 +85,7 @@ void test_btf_endian() {
                goto err_out;
 
        ASSERT_EQ(btf__endianness(swap_btf), swap_endian, "endian");
-       ASSERT_EQ(btf__get_nr_types(swap_btf), btf__get_nr_types(btf), "nr_types");
+       ASSERT_EQ(btf__type_cnt(swap_btf), btf__type_cnt(btf), "nr_types");
 
        /* the type should appear as if it was stored in native endianness */
        t = btf__type_by_id(swap_btf, var_id);

diff --git a/tools/testing/selftests/bpf/prog_tests/btf_split.c b/tools/testing/selftests/bpf/prog_tests/btf_split.c
index ca7c2a9..b1ffe61 100644 (file)
--- a/tools/testing/selftests/bpf/prog_tests/btf_split.c
+++ b/tools/testing/selftests/bpf/prog_tests/btf_split.c
@@ -72,7 +72,7 @@ void test_btf_split() {
        d = btf_dump__new(btf2, NULL, &opts, btf_dump_printf);
        if (!ASSERT_OK_PTR(d, "btf_dump__new"))
                goto cleanup;
-       for (i = 1; i <= btf__get_nr_types(btf2); i++) {
+       for (i = 1; i < btf__type_cnt(btf2); i++) {
                err = btf_dump__dump_type(d, i);
                ASSERT_OK(err, "dump_type_ok");
        }

diff --git a/tools/testing/selftests/bpf/prog_tests/core_autosize.c b/tools/testing/selftests/bpf/prog_tests/core_autosize.c
index 2a0dac6..1dfe14f 100644 (file)
--- a/tools/testing/selftests/bpf/prog_tests/core_autosize.c
+++ b/tools/testing/selftests/bpf/prog_tests/core_autosize.c
@@ -112,7 +112,7 @@ void test_core_autosize(void)
        if (!ASSERT_OK_PTR(f, "btf_fdopen"))
                goto cleanup;
 
-       raw_data = btf__get_raw_data(btf, &raw_sz);
+       raw_data = btf__raw_data(btf, &raw_sz);
        if (!ASSERT_OK_PTR(raw_data, "raw_data"))
                goto cleanup;
        written = fwrite(raw_data, 1, raw_sz, f);

diff --git a/tools/testing/selftests/bpf/prog_tests/core_reloc.c b/tools/testing/selftests/bpf/prog_tests/core_reloc.c
index cc50f8f..55ec85b 100644 (file)
--- a/tools/testing/selftests/bpf/prog_tests/core_reloc.c
+++ b/tools/testing/selftests/bpf/prog_tests/core_reloc.c
@@ -381,7 +381,7 @@ static int setup_type_id_case_local(struct core_reloc_test_case *test)
        exp->local_anon_void_ptr = -1;
        exp->local_anon_arr = -1;
 
-       for (i = 1; i <= btf__get_nr_types(local_btf); i++)
+       for (i = 1; i < btf__type_cnt(local_btf); i++)
        {
                t = btf__type_by_id(local_btf, i);
                /* we are interested only in anonymous types */

diff --git a/tools/testing/selftests/bpf/prog_tests/resolve_btfids.c b/tools/testing/selftests/bpf/prog_tests/resolve_btfids.c
index f623613..badda63 100644 (file)
--- a/tools/testing/selftests/bpf/prog_tests/resolve_btfids.c
+++ b/tools/testing/selftests/bpf/prog_tests/resolve_btfids.c
@@ -106,9 +106,9 @@ static int resolve_symbols(void)
                  "Failed to load BTF from btf_data.o\n"))
                return -1;
 
-       nr = btf__get_nr_types(btf);
+       nr = btf__type_cnt(btf);
 
-       for (type_id = 1; type_id <= nr; type_id++) {
+       for (type_id = 1; type_id < nr; type_id++) {
                if (__resolve_symbol(btf, type_id))
                        break;
        }