diff options
| author | Alexei Starovoitov <ast@kernel.org> | 2019-02-28 02:03:14 +0100 |
|---|---|---|
| committer | Alexei Starovoitov <ast@kernel.org> | 2019-02-28 02:03:14 +0100 |
| commit | 3bcd60444519616508f72df454cc596511e726d1 (patch) | |
| tree | c081bdb931c9c0d7a9a30ff44d421e673e3f3bea | |
| parent | samples: bpf: fix: broken sample regarding removed function (diff) | |
| parent | tools/bpf: selftests: add map lookup to test_map_in_map bpf prog (diff) | |
| download | linux-3bcd60444519616508f72df454cc596511e726d1.tar.xz linux-3bcd60444519616508f72df454cc596511e726d1.zip | |
Merge branch 'inner_map_spin_lock-fix'
Yonghong Song says:
====================
The inner_map_meta->spin_lock_off is not set correctly during
map creation for BPF_MAP_TYPE_ARRAY_OF_MAPS and BPF_MAP_TYPE_HASH_OF_MAPS.
This may lead verifier error due to misinformation.
This patch set fixed the issue with Patch #1 for the kernel change
and Patch #2 for enhanced selftest test_maps.
====================
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
| -rw-r--r-- | kernel/bpf/map_in_map.c | 1 | ||||
| -rw-r--r-- | tools/testing/selftests/bpf/progs/test_map_in_map.c | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/kernel/bpf/map_in_map.c b/kernel/bpf/map_in_map.c index 583346a0ab29..3dff41403583 100644 --- a/kernel/bpf/map_in_map.c +++ b/kernel/bpf/map_in_map.c @@ -58,6 +58,7 @@ struct bpf_map *bpf_map_meta_alloc(int inner_map_ufd) inner_map_meta->value_size = inner_map->value_size; inner_map_meta->map_flags = inner_map->map_flags; inner_map_meta->max_entries = inner_map->max_entries; + inner_map_meta->spin_lock_off = inner_map->spin_lock_off; /* Misc members not needed in bpf_map_meta_equal() check. */ inner_map_meta->ops = inner_map->ops; diff --git a/tools/testing/selftests/bpf/progs/test_map_in_map.c b/tools/testing/selftests/bpf/progs/test_map_in_map.c index ce923e67e08e..2985f262846e 100644 --- a/tools/testing/selftests/bpf/progs/test_map_in_map.c +++ b/tools/testing/selftests/bpf/progs/test_map_in_map.c @@ -27,6 +27,7 @@ SEC("xdp_mimtest") int xdp_mimtest0(struct xdp_md *ctx) { int value = 123; + int *value_p; int key = 0; void *map; @@ -35,6 +36,9 @@ int xdp_mimtest0(struct xdp_md *ctx) return XDP_DROP; bpf_map_update_elem(map, &key, &value, 0); + value_p = bpf_map_lookup_elem(map, &key); + if (!value_p || *value_p != 123) + return XDP_DROP; map = bpf_map_lookup_elem(&mim_hash, &key); if (!map) |