On Mon, Oct 8, 2018 at 6:07 PM Prashant Bhole
<bhole_prashant...@lab.ntt.co.jp> wrote:
>
> Currently fixup map are named like fixup_map1, fixup_map2, and so on.
> As suggested by Alexei let's change change map names such that we can
> identify map type by looking at the name.
>
> This patch is basically a find and replace change:
> fixup_map1 -> fixup_map_hash_8b
> fixup_map2 -> fixup_map_hash_48b
> fixup_map3 -> fixup_map_hash_16b
> fixup_map4 -> fixup_map_array_48b
>
> Suggested-by: Alexei Starovoitov <a...@kernel.org>
> Signed-off-by: Prashant Bhole <bhole_prashant...@lab.ntt.co.jp>
> Acked-by: Alexei Starovoitov <a...@kernel.org>
Acked-by: Song Liu <songliubrav...@fb.com>
> ---
> tools/testing/selftests/bpf/test_verifier.c | 380 ++++++++++----------
> 1 file changed, 190 insertions(+), 190 deletions(-)
>
> diff --git a/tools/testing/selftests/bpf/test_verifier.c
> b/tools/testing/selftests/bpf/test_verifier.c
> index bc9cd8537467..65ae44c85d27 100644
> --- a/tools/testing/selftests/bpf/test_verifier.c
> +++ b/tools/testing/selftests/bpf/test_verifier.c
> @@ -61,10 +61,10 @@ static bool unpriv_disabled = false;
> struct bpf_test {
> const char *descr;
> struct bpf_insn insns[MAX_INSNS];
> - int fixup_map1[MAX_FIXUPS];
> - int fixup_map2[MAX_FIXUPS];
> - int fixup_map3[MAX_FIXUPS];
> - int fixup_map4[MAX_FIXUPS];
> + int fixup_map_hash_8b[MAX_FIXUPS];
> + int fixup_map_hash_48b[MAX_FIXUPS];
> + int fixup_map_hash_16b[MAX_FIXUPS];
> + int fixup_map_array_48b[MAX_FIXUPS];
> int fixup_prog1[MAX_FIXUPS];
> int fixup_prog2[MAX_FIXUPS];
> int fixup_map_in_map[MAX_FIXUPS];
> @@ -876,7 +876,7 @@ static struct bpf_test tests[] = {
> BPF_FUNC_map_lookup_elem),
> BPF_EXIT_INSN(),
> },
> - .fixup_map1 = { 2 },
> + .fixup_map_hash_8b = { 2 },
> .errstr = "invalid indirect read from stack",
> .result = REJECT,
> },
> @@ -1110,7 +1110,7 @@ static struct bpf_test tests[] = {
> BPF_ST_MEM(BPF_DW, BPF_REG_0, 0, 0),
> BPF_EXIT_INSN(),
> },
> - .fixup_map1 = { 3 },
> + .fixup_map_hash_8b = { 3 },
> .errstr = "R0 invalid mem access 'map_value_or_null'",
> .result = REJECT,
> },
> @@ -1127,7 +1127,7 @@ static struct bpf_test tests[] = {
> BPF_ST_MEM(BPF_DW, BPF_REG_0, 4, 0),
> BPF_EXIT_INSN(),
> },
> - .fixup_map1 = { 3 },
> + .fixup_map_hash_8b = { 3 },
> .errstr = "misaligned value access",
> .result = REJECT,
> .flags = F_LOAD_WITH_STRICT_ALIGNMENT,
> @@ -1147,7 +1147,7 @@ static struct bpf_test tests[] = {
> BPF_ST_MEM(BPF_DW, BPF_REG_0, 0, 1),
> BPF_EXIT_INSN(),
> },
> - .fixup_map1 = { 3 },
> + .fixup_map_hash_8b = { 3 },
> .errstr = "R0 invalid mem access",
> .errstr_unpriv = "R0 leaks addr",
> .result = REJECT,
> @@ -1237,7 +1237,7 @@ static struct bpf_test tests[] = {
> BPF_FUNC_map_delete_elem),
> BPF_EXIT_INSN(),
> },
> - .fixup_map1 = { 24 },
> + .fixup_map_hash_8b = { 24 },
> .errstr_unpriv = "R1 pointer comparison",
> .result_unpriv = REJECT,
> .result = ACCEPT,
> @@ -1391,7 +1391,7 @@ static struct bpf_test tests[] = {
> offsetof(struct __sk_buff, pkt_type)),
> BPF_EXIT_INSN(),
> },
> - .fixup_map1 = { 4 },
> + .fixup_map_hash_8b = { 4 },
> .errstr = "different pointers",
> .errstr_unpriv = "R1 pointer comparison",
> .result = REJECT,
> @@ -1414,7 +1414,7 @@ static struct bpf_test tests[] = {
> BPF_MOV64_REG(BPF_REG_1, BPF_REG_0),
> BPF_JMP_IMM(BPF_JA, 0, 0, -12),
> },
> - .fixup_map1 = { 6 },
> + .fixup_map_hash_8b = { 6 },
> .errstr = "different pointers",
> .errstr_unpriv = "R1 pointer comparison",
> .result = REJECT,
> @@ -1438,7 +1438,7 @@ static struct bpf_test tests[] = {
> BPF_MOV64_REG(BPF_REG_1, BPF_REG_0),
> BPF_JMP_IMM(BPF_JA, 0, 0, -13),
> },
> - .fixup_map1 = { 7 },
> + .fixup_map_hash_8b = { 7 },
> .errstr = "different pointers",
> .errstr_unpriv = "R1 pointer comparison",
> .result = REJECT,
> @@ -2575,7 +2575,7 @@ static struct bpf_test tests[] = {
> BPF_MOV64_IMM(BPF_REG_0, 0),
> BPF_EXIT_INSN(),
> },
> - .fixup_map1 = { 3 },
> + .fixup_map_hash_8b = { 3 },
> .errstr_unpriv = "R4 leaks addr",
> .result_unpriv = REJECT,
> .result = ACCEPT,
> @@ -2592,7 +2592,7 @@ static struct bpf_test tests[] = {
> BPF_MOV64_IMM(BPF_REG_0, 0),
> BPF_EXIT_INSN(),
> },
> - .fixup_map1 = { 3 },
> + .fixup_map_hash_8b = { 3 },
> .errstr = "invalid indirect read from stack off -8+0 size 8",
> .result = REJECT,
> },
> @@ -2894,7 +2894,7 @@ static struct bpf_test tests[] = {
> BPF_STX_MEM(BPF_DW, BPF_REG_0, BPF_REG_0, 0),
> BPF_EXIT_INSN(),
> },
> - .fixup_map1 = { 3 },
> + .fixup_map_hash_8b = { 3 },
> .errstr_unpriv = "R0 leaks addr",
> .result_unpriv = REJECT,
> .result = ACCEPT,
> @@ -2934,7 +2934,7 @@ static struct bpf_test tests[] = {
> BPF_MOV64_IMM(BPF_REG_0, 0),
> BPF_EXIT_INSN(),
> },
> - .fixup_map1 = { 1 },
> + .fixup_map_hash_8b = { 1 },
> .errstr_unpriv = "R1 pointer comparison",
> .result_unpriv = REJECT,
> .result = ACCEPT,
> @@ -4073,7 +4073,7 @@ static struct bpf_test tests[] = {
> BPF_MOV64_IMM(BPF_REG_0, 0),
> BPF_EXIT_INSN(),
> },
> - .fixup_map1 = { 5 },
> + .fixup_map_hash_8b = { 5 },
> .result_unpriv = ACCEPT,
> .result = ACCEPT,
> .prog_type = BPF_PROG_TYPE_XDP,
> @@ -4089,7 +4089,7 @@ static struct bpf_test tests[] = {
> BPF_MOV64_IMM(BPF_REG_0, 0),
> BPF_EXIT_INSN(),
> },
> - .fixup_map1 = { 1 },
> + .fixup_map_hash_8b = { 1 },
> .result = REJECT,
> .errstr = "invalid access to packet",
> .prog_type = BPF_PROG_TYPE_XDP,
> @@ -4117,7 +4117,7 @@ static struct bpf_test tests[] = {
> BPF_MOV64_IMM(BPF_REG_0, 0),
> BPF_EXIT_INSN(),
> },
> - .fixup_map1 = { 11 },
> + .fixup_map_hash_8b = { 11 },
> .result = ACCEPT,
> .prog_type = BPF_PROG_TYPE_XDP,
> },
> @@ -4139,7 +4139,7 @@ static struct bpf_test tests[] = {
> BPF_MOV64_IMM(BPF_REG_0, 0),
> BPF_EXIT_INSN(),
> },
> - .fixup_map1 = { 7 },
> + .fixup_map_hash_8b = { 7 },
> .result = REJECT,
> .errstr = "invalid access to packet",
> .prog_type = BPF_PROG_TYPE_XDP,
> @@ -4161,7 +4161,7 @@ static struct bpf_test tests[] = {
> BPF_MOV64_IMM(BPF_REG_0, 0),
> BPF_EXIT_INSN(),
> },
> - .fixup_map1 = { 6 },
> + .fixup_map_hash_8b = { 6 },
> .result = REJECT,
> .errstr = "invalid access to packet",
> .prog_type = BPF_PROG_TYPE_XDP,
> @@ -4184,7 +4184,7 @@ static struct bpf_test tests[] = {
> BPF_MOV64_IMM(BPF_REG_0, 0),
> BPF_EXIT_INSN(),
> },
> - .fixup_map1 = { 5 },
> + .fixup_map_hash_8b = { 5 },
> .result = ACCEPT,
> .prog_type = BPF_PROG_TYPE_SCHED_CLS,
> },
> @@ -4199,7 +4199,7 @@ static struct bpf_test tests[] = {
> BPF_MOV64_IMM(BPF_REG_0, 0),
> BPF_EXIT_INSN(),
> },
> - .fixup_map1 = { 1 },
> + .fixup_map_hash_8b = { 1 },
> .result = REJECT,
> .errstr = "invalid access to packet",
> .prog_type = BPF_PROG_TYPE_SCHED_CLS,
> @@ -4227,7 +4227,7 @@ static struct bpf_test tests[] = {
> BPF_MOV64_IMM(BPF_REG_0, 0),
> BPF_EXIT_INSN(),
> },
> - .fixup_map1 = { 11 },
> + .fixup_map_hash_8b = { 11 },
> .result = ACCEPT,
> .prog_type = BPF_PROG_TYPE_SCHED_CLS,
> },
> @@ -4249,7 +4249,7 @@ static struct bpf_test tests[] = {
> BPF_MOV64_IMM(BPF_REG_0, 0),
> BPF_EXIT_INSN(),
> },
> - .fixup_map1 = { 7 },
> + .fixup_map_hash_8b = { 7 },
> .result = REJECT,
> .errstr = "invalid access to packet",
> .prog_type = BPF_PROG_TYPE_SCHED_CLS,
> @@ -4271,7 +4271,7 @@ static struct bpf_test tests[] = {
> BPF_MOV64_IMM(BPF_REG_0, 0),
> BPF_EXIT_INSN(),
> },
> - .fixup_map1 = { 6 },
> + .fixup_map_hash_8b = { 6 },
> .result = REJECT,
> .errstr = "invalid access to packet",
> .prog_type = BPF_PROG_TYPE_SCHED_CLS,
> @@ -4555,7 +4555,7 @@ static struct bpf_test tests[] = {
> offsetof(struct test_val, foo)),
> BPF_EXIT_INSN(),
> },
> - .fixup_map2 = { 3 },
> + .fixup_map_hash_48b = { 3 },
> .errstr_unpriv = "R0 leaks addr",
> .result_unpriv = REJECT,
> .result = ACCEPT,
> @@ -4577,7 +4577,7 @@ static struct bpf_test tests[] = {
> offsetof(struct test_val, foo)),
> BPF_EXIT_INSN(),
> },
> - .fixup_map2 = { 3 },
> + .fixup_map_hash_48b = { 3 },
> .errstr_unpriv = "R0 leaks addr",
> .result_unpriv = REJECT,
> .result = ACCEPT,
> @@ -4601,7 +4601,7 @@ static struct bpf_test tests[] = {
> offsetof(struct test_val, foo)),
> BPF_EXIT_INSN(),
> },
> - .fixup_map2 = { 3 },
> + .fixup_map_hash_48b = { 3 },
> .errstr_unpriv = "R0 leaks addr",
> .result_unpriv = REJECT,
> .result = ACCEPT,
> @@ -4629,7 +4629,7 @@ static struct bpf_test tests[] = {
> offsetof(struct test_val, foo)),
> BPF_EXIT_INSN(),
> },
> - .fixup_map2 = { 3 },
> + .fixup_map_hash_48b = { 3 },
> .errstr_unpriv = "R0 leaks addr",
> .result_unpriv = REJECT,
> .result = ACCEPT,
> @@ -4649,7 +4649,7 @@ static struct bpf_test tests[] = {
> offsetof(struct test_val, foo)),
> BPF_EXIT_INSN(),
> },
> - .fixup_map2 = { 3 },
> + .fixup_map_hash_48b = { 3 },
> .errstr = "invalid access to map value, value_size=48 off=48
> size=8",
> .result = REJECT,
> },
> @@ -4670,7 +4670,7 @@ static struct bpf_test tests[] = {
> offsetof(struct test_val, foo)),
> BPF_EXIT_INSN(),
> },
> - .fixup_map2 = { 3 },
> + .fixup_map_hash_48b = { 3 },
> .errstr = "R0 min value is outside of the array range",
> .result = REJECT,
> .flags = F_NEEDS_EFFICIENT_UNALIGNED_ACCESS,
> @@ -4692,7 +4692,7 @@ static struct bpf_test tests[] = {
> offsetof(struct test_val, foo)),
> BPF_EXIT_INSN(),
> },
> - .fixup_map2 = { 3 },
> + .fixup_map_hash_48b = { 3 },
> .errstr = "R0 unbounded memory access, make sure to bounds
> check any array access into a map",
> .result = REJECT,
> .flags = F_NEEDS_EFFICIENT_UNALIGNED_ACCESS,
> @@ -4717,7 +4717,7 @@ static struct bpf_test tests[] = {
> offsetof(struct test_val, foo)),
> BPF_EXIT_INSN(),
> },
> - .fixup_map2 = { 3 },
> + .fixup_map_hash_48b = { 3 },
> .errstr_unpriv = "R0 leaks addr",
> .errstr = "R0 unbounded memory access",
> .result_unpriv = REJECT,
> @@ -4744,7 +4744,7 @@ static struct bpf_test tests[] = {
> offsetof(struct test_val, foo)),
> BPF_EXIT_INSN(),
> },
> - .fixup_map2 = { 3 },
> + .fixup_map_hash_48b = { 3 },
> .errstr_unpriv = "R0 leaks addr",
> .errstr = "invalid access to map value, value_size=48 off=44
> size=8",
> .result_unpriv = REJECT,
> @@ -4774,7 +4774,7 @@ static struct bpf_test tests[] = {
> offsetof(struct test_val, foo)),
> BPF_EXIT_INSN(),
> },
> - .fixup_map2 = { 3, 11 },
> + .fixup_map_hash_48b = { 3, 11 },
> .errstr = "R0 pointer += pointer",
> .result = REJECT,
> .flags = F_NEEDS_EFFICIENT_UNALIGNED_ACCESS,
> @@ -4807,7 +4807,7 @@ static struct bpf_test tests[] = {
> BPF_ALU64_IMM(BPF_AND, BPF_REG_0, 1),
> BPF_EXIT_INSN(),
> },
> - .fixup_map1 = { 1 },
> + .fixup_map_hash_8b = { 1 },
> .result = REJECT,
> .errstr = "cannot pass map_type 1 into func
> bpf_get_local_storage",
> .prog_type = BPF_PROG_TYPE_CGROUP_SKB,
> @@ -4922,7 +4922,7 @@ static struct bpf_test tests[] = {
> BPF_ALU64_IMM(BPF_AND, BPF_REG_0, 1),
> BPF_EXIT_INSN(),
> },
> - .fixup_map1 = { 1 },
> + .fixup_map_hash_8b = { 1 },
> .result = REJECT,
> .errstr = "cannot pass map_type 1 into func
> bpf_get_local_storage",
> .prog_type = BPF_PROG_TYPE_CGROUP_SKB,
> @@ -5024,7 +5024,7 @@ static struct bpf_test tests[] = {
> BPF_ST_MEM(BPF_DW, BPF_REG_4, 0, 0),
> BPF_EXIT_INSN(),
> },
> - .fixup_map1 = { 4 },
> + .fixup_map_hash_8b = { 4 },
> .result = ACCEPT,
> .prog_type = BPF_PROG_TYPE_SCHED_CLS
> },
> @@ -5045,7 +5045,7 @@ static struct bpf_test tests[] = {
> BPF_ST_MEM(BPF_DW, BPF_REG_4, 0, 0),
> BPF_EXIT_INSN(),
> },
> - .fixup_map1 = { 4 },
> + .fixup_map_hash_8b = { 4 },
> .errstr = "R4 pointer arithmetic on map_value_or_null",
> .result = REJECT,
> .prog_type = BPF_PROG_TYPE_SCHED_CLS
> @@ -5066,7 +5066,7 @@ static struct bpf_test tests[] = {
> BPF_ST_MEM(BPF_DW, BPF_REG_4, 0, 0),
> BPF_EXIT_INSN(),
> },
> - .fixup_map1 = { 4 },
> + .fixup_map_hash_8b = { 4 },
> .errstr = "R4 pointer arithmetic on map_value_or_null",
> .result = REJECT,
> .prog_type = BPF_PROG_TYPE_SCHED_CLS
> @@ -5087,7 +5087,7 @@ static struct bpf_test tests[] = {
> BPF_ST_MEM(BPF_DW, BPF_REG_4, 0, 0),
> BPF_EXIT_INSN(),
> },
> - .fixup_map1 = { 4 },
> + .fixup_map_hash_8b = { 4 },
> .errstr = "R4 pointer arithmetic on map_value_or_null",
> .result = REJECT,
> .prog_type = BPF_PROG_TYPE_SCHED_CLS
> @@ -5113,7 +5113,7 @@ static struct bpf_test tests[] = {
> BPF_ST_MEM(BPF_DW, BPF_REG_4, 0, 0),
> BPF_EXIT_INSN(),
> },
> - .fixup_map1 = { 4 },
> + .fixup_map_hash_8b = { 4 },
> .result = REJECT,
> .errstr = "R4 !read_ok",
> .prog_type = BPF_PROG_TYPE_SCHED_CLS
> @@ -5141,7 +5141,7 @@ static struct bpf_test tests[] = {
> BPF_ST_MEM(BPF_DW, BPF_REG_4, 0, 0),
> BPF_EXIT_INSN(),
> },
> - .fixup_map1 = { 4 },
> + .fixup_map_hash_8b = { 4 },
> .result = ACCEPT,
> .prog_type = BPF_PROG_TYPE_SCHED_CLS
> },
> @@ -5162,7 +5162,7 @@ static struct bpf_test tests[] = {
> BPF_ST_MEM(BPF_DW, BPF_REG_0, 0, offsetof(struct
> test_val, foo)),
> BPF_EXIT_INSN(),
> },
> - .fixup_map2 = { 3 },
> + .fixup_map_hash_48b = { 3 },
> .errstr = "R0 unbounded memory access",
> .result = REJECT,
> .errstr_unpriv = "R0 leaks addr",
> @@ -5412,7 +5412,7 @@ static struct bpf_test tests[] = {
> offsetof(struct __sk_buff, cb[0])),
> BPF_EXIT_INSN(),
> },
> - .fixup_map1 = { 2 },
> + .fixup_map_hash_8b = { 2 },
> .errstr_unpriv = "R2 leaks addr into mem",
> .result_unpriv = REJECT,
> .result = REJECT,
> @@ -5442,7 +5442,7 @@ static struct bpf_test tests[] = {
> offsetof(struct __sk_buff, cb[0])),
> BPF_EXIT_INSN(),
> },
> - .fixup_map1 = { 1 },
> + .fixup_map_hash_8b = { 1 },
> .errstr_unpriv = "R2 leaks addr into ctx",
> .result_unpriv = REJECT,
> .result = ACCEPT,
> @@ -5464,7 +5464,7 @@ static struct bpf_test tests[] = {
> BPF_MOV64_IMM(BPF_REG_0, 0),
> BPF_EXIT_INSN(),
> },
> - .fixup_map1 = { 4 },
> + .fixup_map_hash_8b = { 4 },
> .errstr_unpriv = "R6 leaks addr into mem",
> .result_unpriv = REJECT,
> .result = ACCEPT,
> @@ -5484,7 +5484,7 @@ static struct bpf_test tests[] = {
> BPF_EMIT_CALL(BPF_FUNC_probe_read),
> BPF_EXIT_INSN(),
> },
> - .fixup_map2 = { 3 },
> + .fixup_map_hash_48b = { 3 },
> .result = ACCEPT,
> .prog_type = BPF_PROG_TYPE_TRACEPOINT,
> },
> @@ -5503,7 +5503,7 @@ static struct bpf_test tests[] = {
> BPF_EMIT_CALL(BPF_FUNC_probe_read),
> BPF_EXIT_INSN(),
> },
> - .fixup_map2 = { 3 },
> + .fixup_map_hash_48b = { 3 },
> .result = ACCEPT,
> .prog_type = BPF_PROG_TYPE_TRACEPOINT,
> },
> @@ -5521,7 +5521,7 @@ static struct bpf_test tests[] = {
> BPF_EMIT_CALL(BPF_FUNC_trace_printk),
> BPF_EXIT_INSN(),
> },
> - .fixup_map2 = { 3 },
> + .fixup_map_hash_48b = { 3 },
> .errstr = "invalid access to map value, value_size=48 off=0
> size=0",
> .result = REJECT,
> .prog_type = BPF_PROG_TYPE_TRACEPOINT,
> @@ -5541,7 +5541,7 @@ static struct bpf_test tests[] = {
> BPF_EMIT_CALL(BPF_FUNC_probe_read),
> BPF_EXIT_INSN(),
> },
> - .fixup_map2 = { 3 },
> + .fixup_map_hash_48b = { 3 },
> .errstr = "invalid access to map value, value_size=48 off=0
> size=56",
> .result = REJECT,
> .prog_type = BPF_PROG_TYPE_TRACEPOINT,
> @@ -5561,7 +5561,7 @@ static struct bpf_test tests[] = {
> BPF_EMIT_CALL(BPF_FUNC_probe_read),
> BPF_EXIT_INSN(),
> },
> - .fixup_map2 = { 3 },
> + .fixup_map_hash_48b = { 3 },
> .errstr = "R2 min value is negative",
> .result = REJECT,
> .prog_type = BPF_PROG_TYPE_TRACEPOINT,
> @@ -5585,7 +5585,7 @@ static struct bpf_test tests[] = {
> BPF_EMIT_CALL(BPF_FUNC_probe_read),
> BPF_EXIT_INSN(),
> },
> - .fixup_map2 = { 3 },
> + .fixup_map_hash_48b = { 3 },
> .result = ACCEPT,
> .prog_type = BPF_PROG_TYPE_TRACEPOINT,
> },
> @@ -5606,7 +5606,7 @@ static struct bpf_test tests[] = {
> BPF_EMIT_CALL(BPF_FUNC_probe_read),
> BPF_EXIT_INSN(),
> },
> - .fixup_map2 = { 3 },
> + .fixup_map_hash_48b = { 3 },
> .result = ACCEPT,
> .prog_type = BPF_PROG_TYPE_TRACEPOINT,
> },
> @@ -5626,7 +5626,7 @@ static struct bpf_test tests[] = {
> BPF_EMIT_CALL(BPF_FUNC_trace_printk),
> BPF_EXIT_INSN(),
> },
> - .fixup_map2 = { 3 },
> + .fixup_map_hash_48b = { 3 },
> .errstr = "invalid access to map value, value_size=48 off=4
> size=0",
> .result = REJECT,
> .prog_type = BPF_PROG_TYPE_TRACEPOINT,
> @@ -5650,7 +5650,7 @@ static struct bpf_test tests[] = {
> BPF_EMIT_CALL(BPF_FUNC_probe_read),
> BPF_EXIT_INSN(),
> },
> - .fixup_map2 = { 3 },
> + .fixup_map_hash_48b = { 3 },
> .errstr = "invalid access to map value, value_size=48 off=4
> size=52",
> .result = REJECT,
> .prog_type = BPF_PROG_TYPE_TRACEPOINT,
> @@ -5672,7 +5672,7 @@ static struct bpf_test tests[] = {
> BPF_EMIT_CALL(BPF_FUNC_probe_read),
> BPF_EXIT_INSN(),
> },
> - .fixup_map2 = { 3 },
> + .fixup_map_hash_48b = { 3 },
> .errstr = "R2 min value is negative",
> .result = REJECT,
> .prog_type = BPF_PROG_TYPE_TRACEPOINT,
> @@ -5694,7 +5694,7 @@ static struct bpf_test tests[] = {
> BPF_EMIT_CALL(BPF_FUNC_probe_read),
> BPF_EXIT_INSN(),
> },
> - .fixup_map2 = { 3 },
> + .fixup_map_hash_48b = { 3 },
> .errstr = "R2 min value is negative",
> .result = REJECT,
> .prog_type = BPF_PROG_TYPE_TRACEPOINT,
> @@ -5719,7 +5719,7 @@ static struct bpf_test tests[] = {
> BPF_EMIT_CALL(BPF_FUNC_probe_read),
> BPF_EXIT_INSN(),
> },
> - .fixup_map2 = { 3 },
> + .fixup_map_hash_48b = { 3 },
> .result = ACCEPT,
> .prog_type = BPF_PROG_TYPE_TRACEPOINT,
> },
> @@ -5741,7 +5741,7 @@ static struct bpf_test tests[] = {
> BPF_EMIT_CALL(BPF_FUNC_probe_read),
> BPF_EXIT_INSN(),
> },
> - .fixup_map2 = { 3 },
> + .fixup_map_hash_48b = { 3 },
> .result = ACCEPT,
> .prog_type = BPF_PROG_TYPE_TRACEPOINT,
> },
> @@ -5761,7 +5761,7 @@ static struct bpf_test tests[] = {
> BPF_EMIT_CALL(BPF_FUNC_trace_printk),
> BPF_EXIT_INSN(),
> },
> - .fixup_map2 = { 3 },
> + .fixup_map_hash_48b = { 3 },
> .errstr = "R1 min value is outside of the array range",
> .result = REJECT,
> .prog_type = BPF_PROG_TYPE_TRACEPOINT,
> @@ -5786,7 +5786,7 @@ static struct bpf_test tests[] = {
> BPF_EMIT_CALL(BPF_FUNC_probe_read),
> BPF_EXIT_INSN(),
> },
> - .fixup_map2 = { 3 },
> + .fixup_map_hash_48b = { 3 },
> .errstr = "invalid access to map value, value_size=48 off=4
> size=52",
> .result = REJECT,
> .prog_type = BPF_PROG_TYPE_TRACEPOINT,
> @@ -5809,7 +5809,7 @@ static struct bpf_test tests[] = {
> BPF_EMIT_CALL(BPF_FUNC_probe_read),
> BPF_EXIT_INSN(),
> },
> - .fixup_map2 = { 3 },
> + .fixup_map_hash_48b = { 3 },
> .errstr = "R2 min value is negative",
> .result = REJECT,
> .prog_type = BPF_PROG_TYPE_TRACEPOINT,
> @@ -5832,7 +5832,7 @@ static struct bpf_test tests[] = {
> BPF_EMIT_CALL(BPF_FUNC_probe_read),
> BPF_EXIT_INSN(),
> },
> - .fixup_map2 = { 3 },
> + .fixup_map_hash_48b = { 3 },
> .errstr = "R2 min value is negative",
> .result = REJECT,
> .prog_type = BPF_PROG_TYPE_TRACEPOINT,
> @@ -5858,7 +5858,7 @@ static struct bpf_test tests[] = {
> BPF_EMIT_CALL(BPF_FUNC_probe_read),
> BPF_EXIT_INSN(),
> },
> - .fixup_map2 = { 3 },
> + .fixup_map_hash_48b = { 3 },
> .result = ACCEPT,
> .prog_type = BPF_PROG_TYPE_TRACEPOINT,
> },
> @@ -5881,7 +5881,7 @@ static struct bpf_test tests[] = {
> BPF_EMIT_CALL(BPF_FUNC_probe_read),
> BPF_EXIT_INSN(),
> },
> - .fixup_map2 = { 3 },
> + .fixup_map_hash_48b = { 3 },
> .result = ACCEPT,
> .prog_type = BPF_PROG_TYPE_TRACEPOINT,
> },
> @@ -5903,7 +5903,7 @@ static struct bpf_test tests[] = {
> BPF_EMIT_CALL(BPF_FUNC_trace_printk),
> BPF_EXIT_INSN(),
> },
> - .fixup_map2 = { 3 },
> + .fixup_map_hash_48b = { 3 },
> .errstr = "R1 min value is outside of the array range",
> .result = REJECT,
> .prog_type = BPF_PROG_TYPE_TRACEPOINT,
> @@ -5925,7 +5925,7 @@ static struct bpf_test tests[] = {
> BPF_EMIT_CALL(BPF_FUNC_probe_read),
> BPF_EXIT_INSN(),
> },
> - .fixup_map2 = { 3 },
> + .fixup_map_hash_48b = { 3 },
> .errstr = "R1 unbounded memory access",
> .result = REJECT,
> .prog_type = BPF_PROG_TYPE_TRACEPOINT,
> @@ -5951,7 +5951,7 @@ static struct bpf_test tests[] = {
> BPF_EMIT_CALL(BPF_FUNC_probe_read),
> BPF_EXIT_INSN(),
> },
> - .fixup_map2 = { 3 },
> + .fixup_map_hash_48b = { 3 },
> .errstr = "invalid access to map value, value_size=48 off=4
> size=45",
> .result = REJECT,
> .prog_type = BPF_PROG_TYPE_TRACEPOINT,
> @@ -5975,7 +5975,7 @@ static struct bpf_test tests[] = {
> BPF_MOV64_IMM(BPF_REG_0, 0),
> BPF_EXIT_INSN(),
> },
> - .fixup_map2 = { 3 },
> + .fixup_map_hash_48b = { 3 },
> .result = ACCEPT,
> .prog_type = BPF_PROG_TYPE_TRACEPOINT,
> },
> @@ -5998,7 +5998,7 @@ static struct bpf_test tests[] = {
> BPF_MOV64_IMM(BPF_REG_0, 0),
> BPF_EXIT_INSN(),
> },
> - .fixup_map2 = { 3 },
> + .fixup_map_hash_48b = { 3 },
> .result = REJECT,
> .errstr = "R1 unbounded memory access",
> .prog_type = BPF_PROG_TYPE_TRACEPOINT,
> @@ -6022,7 +6022,7 @@ static struct bpf_test tests[] = {
> BPF_MOV64_IMM(BPF_REG_0, 0),
> BPF_EXIT_INSN(),
> },
> - .fixup_map2 = { 3 },
> + .fixup_map_hash_48b = { 3 },
> .result = ACCEPT,
> .prog_type = BPF_PROG_TYPE_TRACEPOINT,
> },
> @@ -6045,7 +6045,7 @@ static struct bpf_test tests[] = {
> BPF_MOV64_IMM(BPF_REG_0, 0),
> BPF_EXIT_INSN(),
> },
> - .fixup_map2 = { 3 },
> + .fixup_map_hash_48b = { 3 },
> .result = REJECT,
> .errstr = "R1 unbounded memory access",
> .prog_type = BPF_PROG_TYPE_TRACEPOINT,
> @@ -6070,7 +6070,7 @@ static struct bpf_test tests[] = {
> BPF_MOV64_IMM(BPF_REG_0, 0),
> BPF_EXIT_INSN(),
> },
> - .fixup_map2 = { 3 },
> + .fixup_map_hash_48b = { 3 },
> .result = ACCEPT,
> .prog_type = BPF_PROG_TYPE_TRACEPOINT,
> },
> @@ -6094,7 +6094,7 @@ static struct bpf_test tests[] = {
> BPF_MOV64_IMM(BPF_REG_0, 0),
> BPF_EXIT_INSN(),
> },
> - .fixup_map2 = { 3 },
> + .fixup_map_hash_48b = { 3 },
> .result = ACCEPT,
> .prog_type = BPF_PROG_TYPE_TRACEPOINT,
> },
> @@ -6118,7 +6118,7 @@ static struct bpf_test tests[] = {
> BPF_MOV64_IMM(BPF_REG_0, 0),
> BPF_EXIT_INSN(),
> },
> - .fixup_map2 = { 3 },
> + .fixup_map_hash_48b = { 3 },
> .result = REJECT,
> .errstr = "R1 min value is negative",
> .prog_type = BPF_PROG_TYPE_TRACEPOINT,
> @@ -6143,7 +6143,7 @@ static struct bpf_test tests[] = {
> BPF_MOV64_IMM(BPF_REG_0, 0),
> BPF_EXIT_INSN(),
> },
> - .fixup_map2 = { 3 },
> + .fixup_map_hash_48b = { 3 },
> .result = ACCEPT,
> .prog_type = BPF_PROG_TYPE_TRACEPOINT,
> },
> @@ -6167,7 +6167,7 @@ static struct bpf_test tests[] = {
> BPF_MOV64_IMM(BPF_REG_0, 0),
> BPF_EXIT_INSN(),
> },
> - .fixup_map2 = { 3 },
> + .fixup_map_hash_48b = { 3 },
> .result = ACCEPT,
> .prog_type = BPF_PROG_TYPE_TRACEPOINT,
> },
> @@ -6191,7 +6191,7 @@ static struct bpf_test tests[] = {
> BPF_MOV64_IMM(BPF_REG_0, 0),
> BPF_EXIT_INSN(),
> },
> - .fixup_map2 = { 3 },
> + .fixup_map_hash_48b = { 3 },
> .result = REJECT,
> .errstr = "R1 min value is negative",
> .prog_type = BPF_PROG_TYPE_TRACEPOINT,
> @@ -6210,7 +6210,7 @@ static struct bpf_test tests[] = {
> BPF_EMIT_CALL(BPF_FUNC_map_lookup_elem),
> BPF_EXIT_INSN(),
> },
> - .fixup_map3 = { 3, 8 },
> + .fixup_map_hash_16b = { 3, 8 },
> .result = ACCEPT,
> .prog_type = BPF_PROG_TYPE_TRACEPOINT,
> },
> @@ -6230,7 +6230,7 @@ static struct bpf_test tests[] = {
> BPF_EMIT_CALL(BPF_FUNC_map_update_elem),
> BPF_EXIT_INSN(),
> },
> - .fixup_map3 = { 3, 10 },
> + .fixup_map_hash_16b = { 3, 10 },
> .result = ACCEPT,
> .prog_type = BPF_PROG_TYPE_TRACEPOINT,
> },
> @@ -6250,8 +6250,8 @@ static struct bpf_test tests[] = {
> BPF_EMIT_CALL(BPF_FUNC_map_update_elem),
> BPF_EXIT_INSN(),
> },
> - .fixup_map1 = { 3 },
> - .fixup_map3 = { 10 },
> + .fixup_map_hash_8b = { 3 },
> + .fixup_map_hash_16b = { 10 },
> .result = REJECT,
> .errstr = "invalid access to map value, value_size=8 off=0
> size=16",
> .prog_type = BPF_PROG_TYPE_TRACEPOINT,
> @@ -6272,7 +6272,7 @@ static struct bpf_test tests[] = {
> BPF_EMIT_CALL(BPF_FUNC_map_lookup_elem),
> BPF_EXIT_INSN(),
> },
> - .fixup_map3 = { 3, 9 },
> + .fixup_map_hash_16b = { 3, 9 },
> .result = ACCEPT,
> .prog_type = BPF_PROG_TYPE_TRACEPOINT,
> },
> @@ -6292,7 +6292,7 @@ static struct bpf_test tests[] = {
> BPF_EMIT_CALL(BPF_FUNC_map_lookup_elem),
> BPF_EXIT_INSN(),
> },
> - .fixup_map3 = { 3, 9 },
> + .fixup_map_hash_16b = { 3, 9 },
> .result = REJECT,
> .errstr = "invalid access to map value, value_size=16 off=12
> size=8",
> .prog_type = BPF_PROG_TYPE_TRACEPOINT,
> @@ -6312,7 +6312,7 @@ static struct bpf_test tests[] = {
> BPF_EMIT_CALL(BPF_FUNC_map_lookup_elem),
> BPF_EXIT_INSN(),
> },
> - .fixup_map3 = { 3, 9 },
> + .fixup_map_hash_16b = { 3, 9 },
> .result = REJECT,
> .errstr = "invalid access to map value, value_size=16 off=-4
> size=8",
> .prog_type = BPF_PROG_TYPE_TRACEPOINT,
> @@ -6334,7 +6334,7 @@ static struct bpf_test tests[] = {
> BPF_EMIT_CALL(BPF_FUNC_map_lookup_elem),
> BPF_EXIT_INSN(),
> },
> - .fixup_map3 = { 3, 10 },
> + .fixup_map_hash_16b = { 3, 10 },
> .result = ACCEPT,
> .prog_type = BPF_PROG_TYPE_TRACEPOINT,
> },
> @@ -6355,7 +6355,7 @@ static struct bpf_test tests[] = {
> BPF_EMIT_CALL(BPF_FUNC_map_lookup_elem),
> BPF_EXIT_INSN(),
> },
> - .fixup_map3 = { 3, 10 },
> + .fixup_map_hash_16b = { 3, 10 },
> .result = REJECT,
> .errstr = "invalid access to map value, value_size=16 off=12
> size=8",
> .prog_type = BPF_PROG_TYPE_TRACEPOINT,
> @@ -6376,7 +6376,7 @@ static struct bpf_test tests[] = {
> BPF_EMIT_CALL(BPF_FUNC_map_lookup_elem),
> BPF_EXIT_INSN(),
> },
> - .fixup_map3 = { 3, 10 },
> + .fixup_map_hash_16b = { 3, 10 },
> .result = REJECT,
> .errstr = "invalid access to map value, value_size=16 off=-4
> size=8",
> .prog_type = BPF_PROG_TYPE_TRACEPOINT,
> @@ -6399,7 +6399,7 @@ static struct bpf_test tests[] = {
> BPF_EMIT_CALL(BPF_FUNC_map_lookup_elem),
> BPF_EXIT_INSN(),
> },
> - .fixup_map3 = { 3, 11 },
> + .fixup_map_hash_16b = { 3, 11 },
> .result = ACCEPT,
> .prog_type = BPF_PROG_TYPE_TRACEPOINT,
> },
> @@ -6419,7 +6419,7 @@ static struct bpf_test tests[] = {
> BPF_EMIT_CALL(BPF_FUNC_map_lookup_elem),
> BPF_EXIT_INSN(),
> },
> - .fixup_map3 = { 3, 10 },
> + .fixup_map_hash_16b = { 3, 10 },
> .result = REJECT,
> .errstr = "R2 unbounded memory access, make sure to bounds
> check any array access into a map",
> .prog_type = BPF_PROG_TYPE_TRACEPOINT,
> @@ -6442,7 +6442,7 @@ static struct bpf_test tests[] = {
> BPF_EMIT_CALL(BPF_FUNC_map_lookup_elem),
> BPF_EXIT_INSN(),
> },
> - .fixup_map3 = { 3, 11 },
> + .fixup_map_hash_16b = { 3, 11 },
> .result = REJECT,
> .errstr = "invalid access to map value, value_size=16 off=9
> size=8",
> .prog_type = BPF_PROG_TYPE_TRACEPOINT,
> @@ -6464,7 +6464,7 @@ static struct bpf_test tests[] = {
> BPF_ST_MEM(BPF_DW, BPF_REG_3, 0, 42),
> BPF_EXIT_INSN(),
> },
> - .fixup_map2 = { 3 },
> + .fixup_map_hash_48b = { 3 },
> .errstr_unpriv = "R0 leaks addr",
> .result = ACCEPT,
> .result_unpriv = REJECT,
> @@ -6485,7 +6485,7 @@ static struct bpf_test tests[] = {
> BPF_ST_MEM(BPF_DW, BPF_REG_3, 0, 42),
> BPF_EXIT_INSN(),
> },
> - .fixup_map2 = { 3 },
> + .fixup_map_hash_48b = { 3 },
> .errstr_unpriv = "R0 leaks addr",
> .result = ACCEPT,
> .result_unpriv = REJECT,
> @@ -6502,7 +6502,7 @@ static struct bpf_test tests[] = {
> BPF_STX_MEM(BPF_DW, BPF_REG_0, BPF_REG_1, 0),
> BPF_EXIT_INSN(),
> },
> - .fixup_map2 = { 3 },
> + .fixup_map_hash_48b = { 3 },
> .errstr_unpriv = "R1 !read_ok",
> .errstr = "R1 !read_ok",
> .result = REJECT,
> @@ -6536,7 +6536,7 @@ static struct bpf_test tests[] = {
> BPF_ST_MEM(BPF_DW, BPF_REG_7, -4, 24),
> BPF_EXIT_INSN(),
> },
> - .fixup_map2 = { 3 },
> + .fixup_map_hash_48b = { 3 },
> .errstr_unpriv = "R0 leaks addr",
> .result = ACCEPT,
> .result_unpriv = REJECT,
> @@ -6564,7 +6564,7 @@ static struct bpf_test tests[] = {
> BPF_LDX_MEM(BPF_DW, BPF_REG_7, BPF_REG_0, 4),
> BPF_EXIT_INSN(),
> },
> - .fixup_map2 = { 3 },
> + .fixup_map_hash_48b = { 3 },
> .errstr_unpriv = "R0 leaks addr",
> .result = ACCEPT,
> .result_unpriv = REJECT,
> @@ -6583,7 +6583,7 @@ static struct bpf_test tests[] = {
> BPF_ST_MEM(BPF_DW, BPF_REG_0, 0, 22),
> BPF_EXIT_INSN(),
> },
> - .fixup_map2 = { 3 },
> + .fixup_map_hash_48b = { 3 },
> .errstr = "R0 bitwise operator &= on pointer",
> .result = REJECT,
> },
> @@ -6600,7 +6600,7 @@ static struct bpf_test tests[] = {
> BPF_ST_MEM(BPF_DW, BPF_REG_0, 0, 22),
> BPF_EXIT_INSN(),
> },
> - .fixup_map2 = { 3 },
> + .fixup_map_hash_48b = { 3 },
> .errstr = "R0 32-bit pointer arithmetic prohibited",
> .result = REJECT,
> },
> @@ -6617,7 +6617,7 @@ static struct bpf_test tests[] = {
> BPF_ST_MEM(BPF_DW, BPF_REG_0, 0, 22),
> BPF_EXIT_INSN(),
> },
> - .fixup_map2 = { 3 },
> + .fixup_map_hash_48b = { 3 },
> .errstr = "R0 pointer arithmetic with /= operator",
> .result = REJECT,
> },
> @@ -6634,7 +6634,7 @@ static struct bpf_test tests[] = {
> BPF_ST_MEM(BPF_DW, BPF_REG_0, 0, 22),
> BPF_EXIT_INSN(),
> },
> - .fixup_map2 = { 3 },
> + .fixup_map_hash_48b = { 3 },
> .errstr_unpriv = "R0 pointer arithmetic prohibited",
> .errstr = "invalid mem access 'inv'",
> .result = REJECT,
> @@ -6658,7 +6658,7 @@ static struct bpf_test tests[] = {
> BPF_ST_MEM(BPF_DW, BPF_REG_0, 0, 22),
> BPF_EXIT_INSN(),
> },
> - .fixup_map2 = { 3 },
> + .fixup_map_hash_48b = { 3 },
> .errstr = "R0 invalid mem access 'inv'",
> .result = REJECT,
> },
> @@ -6681,7 +6681,7 @@ static struct bpf_test tests[] = {
> BPF_ST_MEM(BPF_DW, BPF_REG_3, 0, 42),
> BPF_EXIT_INSN(),
> },
> - .fixup_map2 = { 3 },
> + .fixup_map_hash_48b = { 3 },
> .errstr_unpriv = "R0 leaks addr",
> .result = ACCEPT,
> .result_unpriv = REJECT,
> @@ -6927,7 +6927,7 @@ static struct bpf_test tests[] = {
> BPF_MOV64_IMM(BPF_REG_0, 0),
> BPF_EXIT_INSN(),
> },
> - .fixup_map2 = { 3 },
> + .fixup_map_hash_48b = { 3 },
> .result = ACCEPT,
> .prog_type = BPF_PROG_TYPE_TRACEPOINT,
> },
> @@ -6953,7 +6953,7 @@ static struct bpf_test tests[] = {
> BPF_MOV64_IMM(BPF_REG_0, 0),
> BPF_EXIT_INSN(),
> },
> - .fixup_map2 = { 3 },
> + .fixup_map_hash_48b = { 3 },
> .errstr = "invalid access to map value, value_size=48 off=0
> size=49",
> .result = REJECT,
> .prog_type = BPF_PROG_TYPE_TRACEPOINT,
> @@ -6981,7 +6981,7 @@ static struct bpf_test tests[] = {
> BPF_MOV64_IMM(BPF_REG_0, 0),
> BPF_EXIT_INSN(),
> },
> - .fixup_map2 = { 3 },
> + .fixup_map_hash_48b = { 3 },
> .result = ACCEPT,
> .prog_type = BPF_PROG_TYPE_TRACEPOINT,
> },
> @@ -7008,7 +7008,7 @@ static struct bpf_test tests[] = {
> BPF_MOV64_IMM(BPF_REG_0, 0),
> BPF_EXIT_INSN(),
> },
> - .fixup_map2 = { 3 },
> + .fixup_map_hash_48b = { 3 },
> .errstr = "R1 min value is outside of the array range",
> .result = REJECT,
> .prog_type = BPF_PROG_TYPE_TRACEPOINT,
> @@ -7080,7 +7080,7 @@ static struct bpf_test tests[] = {
> BPF_EMIT_CALL(BPF_FUNC_csum_diff),
> BPF_EXIT_INSN(),
> },
> - .fixup_map1 = { 3 },
> + .fixup_map_hash_8b = { 3 },
> .result = ACCEPT,
> .prog_type = BPF_PROG_TYPE_SCHED_CLS,
> },
> @@ -7105,7 +7105,7 @@ static struct bpf_test tests[] = {
> BPF_EMIT_CALL(BPF_FUNC_csum_diff),
> BPF_EXIT_INSN(),
> },
> - .fixup_map1 = { 3 },
> + .fixup_map_hash_8b = { 3 },
> .result = ACCEPT,
> .prog_type = BPF_PROG_TYPE_SCHED_CLS,
> },
> @@ -7128,7 +7128,7 @@ static struct bpf_test tests[] = {
> BPF_EMIT_CALL(BPF_FUNC_csum_diff),
> BPF_EXIT_INSN(),
> },
> - .fixup_map1 = { 3 },
> + .fixup_map_hash_8b = { 3 },
> .result = ACCEPT,
> .prog_type = BPF_PROG_TYPE_SCHED_CLS,
> },
> @@ -7209,7 +7209,7 @@ static struct bpf_test tests[] = {
> BPF_EMIT_CALL(BPF_FUNC_probe_read),
> BPF_EXIT_INSN(),
> },
> - .fixup_map1 = { 3 },
> + .fixup_map_hash_8b = { 3 },
> .result = ACCEPT,
> .prog_type = BPF_PROG_TYPE_TRACEPOINT,
> },
> @@ -7230,7 +7230,7 @@ static struct bpf_test tests[] = {
> BPF_EMIT_CALL(BPF_FUNC_probe_read),
> BPF_EXIT_INSN(),
> },
> - .fixup_map1 = { 3 },
> + .fixup_map_hash_8b = { 3 },
> .result = ACCEPT,
> .prog_type = BPF_PROG_TYPE_TRACEPOINT,
> },
> @@ -7250,7 +7250,7 @@ static struct bpf_test tests[] = {
> BPF_EMIT_CALL(BPF_FUNC_probe_read),
> BPF_EXIT_INSN(),
> },
> - .fixup_map1 = { 3 },
> + .fixup_map_hash_8b = { 3 },
> .result = ACCEPT,
> .prog_type = BPF_PROG_TYPE_TRACEPOINT,
> },
> @@ -7325,7 +7325,7 @@ static struct bpf_test tests[] = {
> offsetof(struct test_val, foo)),
> BPF_EXIT_INSN(),
> },
> - .fixup_map2 = { 3 },
> + .fixup_map_hash_48b = { 3 },
> .errstr = "R0 max value is outside of the array range",
> .result = REJECT,
> .flags = F_NEEDS_EFFICIENT_UNALIGNED_ACCESS,
> @@ -7355,7 +7355,7 @@ static struct bpf_test tests[] = {
> BPF_MOV64_REG(BPF_REG_0, 0),
> BPF_EXIT_INSN(),
> },
> - .fixup_map2 = { 3 },
> + .fixup_map_hash_48b = { 3 },
> .errstr = "R0 max value is outside of the array range",
> .result = REJECT,
> .flags = F_NEEDS_EFFICIENT_UNALIGNED_ACCESS,
> @@ -7708,7 +7708,7 @@ static struct bpf_test tests[] = {
> BPF_MOV64_IMM(BPF_REG_0, 0),
> BPF_EXIT_INSN(),
> },
> - .fixup_map1 = { 3 },
> + .fixup_map_hash_8b = { 3 },
> .errstr = "unbounded min value",
> .result = REJECT,
> },
> @@ -7732,7 +7732,7 @@ static struct bpf_test tests[] = {
> BPF_MOV64_IMM(BPF_REG_0, 0),
> BPF_EXIT_INSN(),
> },
> - .fixup_map1 = { 3 },
> + .fixup_map_hash_8b = { 3 },
> .errstr = "unbounded min value",
> .result = REJECT,
> },
> @@ -7758,7 +7758,7 @@ static struct bpf_test tests[] = {
> BPF_MOV64_IMM(BPF_REG_0, 0),
> BPF_EXIT_INSN(),
> },
> - .fixup_map1 = { 3 },
> + .fixup_map_hash_8b = { 3 },
> .errstr = "unbounded min value",
> .result = REJECT,
> },
> @@ -7783,7 +7783,7 @@ static struct bpf_test tests[] = {
> BPF_MOV64_IMM(BPF_REG_0, 0),
> BPF_EXIT_INSN(),
> },
> - .fixup_map1 = { 3 },
> + .fixup_map_hash_8b = { 3 },
> .errstr = "unbounded min value",
> .result = REJECT,
> },
> @@ -7807,7 +7807,7 @@ static struct bpf_test tests[] = {
> BPF_MOV64_IMM(BPF_REG_0, 0),
> BPF_EXIT_INSN(),
> },
> - .fixup_map1 = { 3 },
> + .fixup_map_hash_8b = { 3 },
> .result = ACCEPT,
> },
> {
> @@ -7831,7 +7831,7 @@ static struct bpf_test tests[] = {
> BPF_MOV64_IMM(BPF_REG_0, 0),
> BPF_EXIT_INSN(),
> },
> - .fixup_map1 = { 3 },
> + .fixup_map_hash_8b = { 3 },
> .errstr = "unbounded min value",
> .result = REJECT,
> },
> @@ -7877,7 +7877,7 @@ static struct bpf_test tests[] = {
> BPF_MOV64_IMM(BPF_REG_0, 0),
> BPF_EXIT_INSN(),
> },
> - .fixup_map1 = { 3 },
> + .fixup_map_hash_8b = { 3 },
> .result = ACCEPT,
> },
> {
> @@ -7902,7 +7902,7 @@ static struct bpf_test tests[] = {
> BPF_MOV64_IMM(BPF_REG_0, 0),
> BPF_EXIT_INSN(),
> },
> - .fixup_map1 = { 3 },
> + .fixup_map_hash_8b = { 3 },
> .errstr = "unbounded min value",
> .result = REJECT,
> },
> @@ -7928,7 +7928,7 @@ static struct bpf_test tests[] = {
> BPF_MOV64_IMM(BPF_REG_0, 0),
> BPF_EXIT_INSN(),
> },
> - .fixup_map1 = { 3 },
> + .fixup_map_hash_8b = { 3 },
> .result = ACCEPT,
> },
> {
> @@ -7953,7 +7953,7 @@ static struct bpf_test tests[] = {
> BPF_MOV64_IMM(BPF_REG_0, 0),
> BPF_EXIT_INSN(),
> },
> - .fixup_map1 = { 3 },
> + .fixup_map_hash_8b = { 3 },
> .errstr = "unbounded min value",
> .result = REJECT,
> },
> @@ -7980,7 +7980,7 @@ static struct bpf_test tests[] = {
> BPF_MOV64_IMM(BPF_REG_0, 0),
> BPF_EXIT_INSN(),
> },
> - .fixup_map1 = { 3 },
> + .fixup_map_hash_8b = { 3 },
> .errstr = "unbounded min value",
> .result = REJECT,
> },
> @@ -8006,7 +8006,7 @@ static struct bpf_test tests[] = {
> BPF_MOV64_IMM(BPF_REG_0, 0),
> BPF_EXIT_INSN(),
> },
> - .fixup_map1 = { 3 },
> + .fixup_map_hash_8b = { 3 },
> .errstr = "unbounded min value",
> .result = REJECT,
> },
> @@ -8035,7 +8035,7 @@ static struct bpf_test tests[] = {
> BPF_MOV64_IMM(BPF_REG_0, 0),
> BPF_EXIT_INSN(),
> },
> - .fixup_map1 = { 3 },
> + .fixup_map_hash_8b = { 3 },
> .errstr = "unbounded min value",
>
