On 06/25/2019 01:57 AM, allanzhang wrote: > Software event output is only enabled by a few prog types. > This test is to ensure that all supported types are enbled for
Nit, typo: enbled > bpf_perf_event_output sucessfully. Nit, typo: sucessfully > Signed-off-by: allanzhang <[email protected]> For SOB, could you add proper formatted name before the email? > --- > tools/testing/selftests/bpf/test_verifier.c | 33 ++++++- > .../selftests/bpf/verifier/event_output.c | 94 +++++++++++++++++++ > 2 files changed, 126 insertions(+), 1 deletion(-) > create mode 100644 tools/testing/selftests/bpf/verifier/event_output.c > > diff --git a/tools/testing/selftests/bpf/test_verifier.c > b/tools/testing/selftests/bpf/test_verifier.c > index c5514daf8865..901a188e1eea 100644 > --- a/tools/testing/selftests/bpf/test_verifier.c > +++ b/tools/testing/selftests/bpf/test_verifier.c > @@ -50,7 +50,7 @@ > #define MAX_INSNS BPF_MAXINSNS > #define MAX_TEST_INSNS 1000000 > #define MAX_FIXUPS 8 > -#define MAX_NR_MAPS 18 > +#define MAX_NR_MAPS 19 > #define MAX_TEST_RUNS 8 > #define POINTER_VALUE 0xcafe4all > #define TEST_DATA_LEN 64 > @@ -84,6 +84,7 @@ struct bpf_test { > int fixup_map_array_wo[MAX_FIXUPS]; > int fixup_map_array_small[MAX_FIXUPS]; > int fixup_sk_storage_map[MAX_FIXUPS]; > + int fixup_map_event_output[MAX_FIXUPS]; > const char *errstr; > const char *errstr_unpriv; > uint32_t retval, retval_unpriv, insn_processed; > @@ -604,6 +605,28 @@ static int create_sk_storage_map(void) > return fd; > } > > +static int create_event_output_map(void) > +{ > + struct bpf_create_map_attr attr = { > + .name = "test_map", > + .map_type = BPF_MAP_TYPE_PERF_EVENT_ARRAY, > + .key_size = 4, > + .value_size = 4, > + .max_entries = 1, > + }; > + 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); This does not look correct, BTF for spinlock does not belong to perf event array. > + close(attr.btf_fd); > + if (fd < 0) > + printf("Failed to create event_output\n"); > + return fd; > +} > + > static char bpf_vlog[UINT_MAX >> 8]; > > static void do_test_fixup(struct bpf_test *test, enum bpf_prog_type > prog_type, > @@ -627,6 +650,7 @@ static void do_test_fixup(struct bpf_test *test, enum > bpf_prog_type prog_type, > int *fixup_map_array_wo = test->fixup_map_array_wo; > int *fixup_map_array_small = test->fixup_map_array_small; > int *fixup_sk_storage_map = test->fixup_sk_storage_map; > + int *fixup_map_event_output = test->fixup_map_event_output; > > if (test->fill_helper) { > test->fill_insns = calloc(MAX_TEST_INSNS, sizeof(struct > bpf_insn)); > @@ -788,6 +812,13 @@ static void do_test_fixup(struct bpf_test *test, enum > bpf_prog_type prog_type, > fixup_sk_storage_map++; > } while (*fixup_sk_storage_map); > } > + if (*fixup_map_event_output) { > + map_fds[18] = create_event_output_map(); > + do { > + prog[*fixup_map_event_output].imm = map_fds[18]; > + fixup_map_event_output++; > + } while (*fixup_map_event_output); > + } > } > > static int set_admin(bool admin) > diff --git a/tools/testing/selftests/bpf/verifier/event_output.c > b/tools/testing/selftests/bpf/verifier/event_output.c > new file mode 100644 > index 000000000000..b25eabcfaa56 > --- /dev/null > +++ b/tools/testing/selftests/bpf/verifier/event_output.c > @@ -0,0 +1,94 @@ > +/* instructions used to output a skb based software event, produced > + * from code snippet: > +struct TMP { > + uint64_t tmp; > +} tt; > +tt.tmp = 5; > +bpf_perf_event_output(skb, &connection_tracking_event_map, 0, > + &tt, sizeof(tt)); > +return 1; [...]
