bpf: Add cmd alias BPF_PROG_RUN

Add BPF_PROG_RUN command as an alias to BPF_RPOG_TEST_RUN to better indicate the full range of use cases done by the command.

Alexei Starovoitov committed 5 years ago

Commit 5d67f341 parent 3d431673 files · +3 −1Browse files

Unified · Split

3 files

@@ -837,6 +837,7 @@ enum bpf_cmd { · 836 unmodified lines
837	BPF_PROG_ATTACH,	837	BPF_PROG_ATTACH,
838	BPF_PROG_DETACH,	838	BPF_PROG_DETACH,
839	BPF_PROG_TEST_RUN,	839	BPF_PROG_TEST_RUN,
		840	BPF_PROG_RUN = BPF_PROG_TEST_RUN,
840	BPF_PROG_GET_NEXT_ID,	841	BPF_PROG_GET_NEXT_ID,
841	BPF_MAP_GET_NEXT_ID,	842	BPF_MAP_GET_NEXT_ID,
842	BPF_PROG_GET_FD_BY_ID,	843	BPF_PROG_GET_FD_BY_ID,

@@ -837,6 +837,7 @@ enum bpf_cmd { · 836 unmodified lines
837	BPF_PROG_ATTACH,	837	BPF_PROG_ATTACH,
838	BPF_PROG_DETACH,	838	BPF_PROG_DETACH,
839	BPF_PROG_TEST_RUN,	839	BPF_PROG_TEST_RUN,
		840	BPF_PROG_RUN = BPF_PROG_TEST_RUN,
840	BPF_PROG_GET_NEXT_ID,	841	BPF_PROG_GET_NEXT_ID,
841	BPF_MAP_GET_NEXT_ID,	842	BPF_MAP_GET_NEXT_ID,
842	BPF_PROG_GET_FD_BY_ID,	843	BPF_PROG_GET_FD_BY_ID,

@@ -102,7 +102,7 @@ static inline int bpf_load_and_run(struct bpf_load_and_run_opts *opts) · 101 unmodified lines
102	attr.test.prog_fd = prog_fd;	102	attr.test.prog_fd = prog_fd;
103	attr.test.ctx_in = (long) opts->ctx;	103	attr.test.ctx_in = (long) opts->ctx;
104	attr.test.ctx_size_in = opts->ctx->sz;	104	attr.test.ctx_size_in = opts->ctx->sz;
105	err = skel_sys_bpf(BPF_PROG_TEST_RUN, &attr, sizeof(attr));	105	err = skel_sys_bpf(BPF_PROG_RUN, &attr, sizeof(attr));
106	if (err < 0 \|\| (int)attr.test.retval < 0) {	106	if (err < 0 \|\| (int)attr.test.retval < 0) {
107	opts->errstr = "failed to execute loader prog";	107	opts->errstr = "failed to execute loader prog";
108	if (err < 0)	108	if (err < 0)