selftests/bpf: Remove last bpf_create_map_xattr from test_verifier

bpf_create_map_xattr() call was reintroduced after merging bpf tree into
bpf-next tree. Convert the last instance into bpf_map_create() call.

Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Link: https://lore.kernel.org/bpf/20211212191341.2529573-1-andrii@kernel.org

diff --git a/tools/testing/selftests/bpf/test_verifier.c b/tools/testing/selftests/bpf/test_verifier.c
index 16ce2ad097f49bbefcc5fcbdcd7dcccff1fdd5d3..ad5d30bafd9389d11778048587b9910cf274e6e0 100644 (file)
--- a/tools/testing/selftests/bpf/test_verifier.c
+++ b/tools/testing/selftests/bpf/test_verifier.c
@@ -701,22 +701,18 @@ static int create_sk_storage_map(void)
 
 static int create_map_timer(void)
 {
-       struct bpf_create_map_attr attr = {
-               .name = "test_map",
-               .map_type = BPF_MAP_TYPE_ARRAY,
-               .key_size = 4,
-               .value_size = 16,
-               .max_entries = 1,
+       LIBBPF_OPTS(bpf_map_create_opts, opts,
                .btf_key_type_id = 1,
                .btf_value_type_id = 5,
-       };
+       );
        int fd, btf_fd;
 
        btf_fd = load_btf();
        if (btf_fd < 0)
                return -1;
-       attr.btf_fd = btf_fd;
-       fd = bpf_create_map_xattr(&attr);
+
+       opts.btf_fd = btf_fd;
+       fd = bpf_map_create(BPF_MAP_TYPE_ARRAY, "test_map", 4, 16, 1, &opts);
        if (fd < 0)
                printf("Failed to create map with timer\n");
        return fd;