bpftool: Migrate from bpf_prog_test_run_xattr

bpf_prog_test_run is being deprecated in favor of the OPTS-based
bpf_prog_test_run_opts.

Signed-off-by: Delyan Kratunov <delyank@fb.com>
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Link: https://lore.kernel.org/bpf/20220202235423.1097270-4-delyank@fb.com

diff --git a/tools/bpf/bpftool/prog.c b/tools/bpf/bpftool/prog.c
index 87593f9..92a6f67 100644 (file)
--- a/tools/bpf/bpftool/prog.c
+++ b/tools/bpf/bpftool/prog.c
@@ -1272,12 +1272,12 @@ static int do_run(int argc, char **argv)
 {
        char *data_fname_in = NULL, *data_fname_out = NULL;
        char *ctx_fname_in = NULL, *ctx_fname_out = NULL;
-       struct bpf_prog_test_run_attr test_attr = {0};
        const unsigned int default_size = SZ_32K;
        void *data_in = NULL, *data_out = NULL;
        void *ctx_in = NULL, *ctx_out = NULL;
        unsigned int repeat = 1;
        int fd, err;
+       LIBBPF_OPTS(bpf_test_run_opts, test_attr);
 
        if (!REQ_ARGS(4))
                return -1;
@@ -1395,14 +1395,13 @@ static int do_run(int argc, char **argv)
                        goto free_ctx_in;
        }
 
-       test_attr.prog_fd       = fd;
        test_attr.repeat        = repeat;
        test_attr.data_in       = data_in;
        test_attr.data_out      = data_out;
        test_attr.ctx_in        = ctx_in;
        test_attr.ctx_out       = ctx_out;
 
-       err = bpf_prog_test_run_xattr(&test_attr);
+       err = bpf_prog_test_run_opts(fd, &test_attr);
        if (err) {
                p_err("failed to run program: %s", strerror(errno));
                goto free_ctx_out;