bpf: allow bpf_for_each_map_elem() helper with different input maps
Subsystems (4)
cover bpf: allow bpf_for_each_map_elem() helper with different input maps
Currently, taking different maps within a single bpf_for_each_map_elem call is not allowed. For example the following codes cannot pass the verifier (with error "tail_call abusing map_ptr"):
```
static void test_by_pid(int pid)
{
if (pid <= 100)
bpf_for_each_map_elem(&map1, map_elem_cb, NULL, 0);
else
bpf_for_each_map_elem(&map2, map_elem_cb, NULL, 0);
}
```This is because during bpf_for_each_map_elem verifying, bpf_insn_aux_data->map_ptr_state is expected as map_ptr (instead of poison state), which is then needed by set_map_elem_callback_state. However, as there are two different map ptr input, map_ptr_state is marked as BPF_MAP_PTR_POISON, and thus the second map_ptr would be lost. BPF_MAP_PTR_POISON is also needed by bpf_for_each_map_elem to skip retpoline optimization in do_misc_fixups(). Therefore, map_ptr_state and map_ptr are both needed for bpf_for_each_map_elem.
This patchset solves it by transform bpf_insn_aux_data->map_ptr_state as a new struct, storing poison/unpriv state and map pointer together without additional memory overhead. Then bpf_for_each_map_elem works well with different input maps. It also makes map_ptr_state logic clearer.
A test case is added to selftest, which would fail to load without this patchset.
Please review, thanks.
Philo Lu (3):
bpf: store both map ptr and state in bpf_insn_aux_data
bpf: allow invoking bpf_for_each_map_elem with different maps selftests/bpf: add test for bpf_for_each_map_elem() with different
maps
include/linux/bpf_verifier.h | 9 ++- kernel/bpf/verifier.c | 42 +++++------- .../selftests/bpf/prog_tests/for_each.c | 67 +++++++++++++++++++ .../selftests/bpf/progs/for_each_multi_maps.c | 49 ++++++++++++++ 4 files changed, 141 insertions(+), 26 deletions(-) create mode 100644 tools/testing/selftests/bpf/progs/for_each_multi_maps.c
--
2.32.0.3.g01195cf9f
PATCH 1/3 bpf: store both map ptr and state in bpf_insn_aux_data
Currently, bpf_insn_aux_data->map_ptr_state is used to store either map_ptr or its poison state (i.e., BPF_MAP_PTR_POISON). Thus BPF_MAP_PTR_POISON must be checked before reading map_ptr. However we do need both of them sometimes, e.g., in bpf_for_each_map_elem() helper ().
This patch changes map_ptr_state into a new struct including both map pointer and its state (poison/unpriv). It's in the same union with struct bpf_loop_inline_state, so there is no extra memory overhead. Besides, macros BPF_MAP_PTR_UNPRIV/BPF_MAP_PTR_POISON/BPF_MAP_PTR are no longer needed.
--- include/linux/bpf_verifier.h | 9 ++++++++- kernel/bpf/verifier.c | 36 ++++++++++++++++-------------------- 2 files changed, 24 insertions(+), 21 deletions(-)
include/linux/bpf_verifier.h +8 -1
@@ -502,6 +502,13 @@ struct bpf_loop_inline_state {u32 callback_subprogno;/* valid when fit_for_inline is true */ }; +/* pointer and state for maps */ +struct bpf_map_ptr_state { +struct bpf_map *map_ptr; +unsigned int poison:1 ; +unsigned int unpriv:1 ; +}; +/* Possible states for alu_state member. */ #define BPF_ALU_SANITIZE_SRC (1U << 0)#define BPF_ALU_SANITIZE_DST (1U << 1)
@@ -514,7 +521,7 @@ struct bpf_loop_inline_state { struct bpf_insn_aux_data { union { enum bpf_reg_type ptr_type; /* pointer type for load/store insns */ - unsigned long map_ptr_state; /* pointer/poison value for maps */ + struct bpf_map_ptr_state map_ptr_state; s32 call_imm; /* saved imm field of call insn */ u32 alu_limit; /* limit for add/sub register with pointer */ struct {
kernel/bpf/verifier.c +16 -20
@@ -190,11 +190,6 @@ struct bpf_verifier_stack_elem {#define BPF_MAP_KEY_POISON (1ULL << 63)#define BPF_MAP_KEY_SEEN (1ULL << 62) -#define BPF_MAP_PTR_UNPRIV 1UL -#define BPF_MAP_PTR_POISON ((void *)((0xeB9FUL << 1) + \ - POISON_POINTER_DELTA)) -#define BPF_MAP_PTR (X ) ((struct bpf_map *)((X) & ~BPF_MAP_PTR_UNPRIV)) -#define BPF_GLOBAL_PERCPU_MA_MAX_SIZE 512static int acquire_reference_state (struct bpf_verifier_env *env,int insn_idx);
@@ -209,21 +204,22 @@ static bool is_trusted_reg(const struct bpf_reg_state *reg);static bool bpf_map_ptr_poisoned (const struct bpf_insn_aux_data *aux) { -return BPF_MAP_PTR (aux->map_ptr_state) ==BPF_MAP_PTR_POISON ; +return !!aux->map_ptr_state.poison; }static bool bpf_map_ptr_unpriv (const struct bpf_insn_aux_data *aux) { -return aux->map_ptr_state &BPF_MAP_PTR_UNPRIV ; +return !!aux->map_ptr_state.unpriv; }static void bpf_map_ptr_store (struct bpf_insn_aux_data *aux, -const struct bpf_map *map,bool unpriv) +struct bpf_map *map, +bool unpriv,bool poison) { -BUILD_BUG_ON ((unsigned long )BPF_MAP_PTR_POISON &BPF_MAP_PTR_UNPRIV ); unpriv |=bpf_map_ptr_unpriv (aux); - aux->map_ptr_state = (unsigned long )map | - (unpriv ?BPF_MAP_PTR_UNPRIV :0UL ); + aux->map_ptr_state.unpriv = unpriv; + aux->map_ptr_state.poison = poison; + aux->map_ptr_state.map_ptr = map; }static bool bpf_map_key_poisoned (const struct bpf_insn_aux_data *aux)
@@ -9658,7 +9654,7 @@ static int set_map_elem_callback_state(struct bpf_verifier_env *env,return -EINVAL ; } - map =BPF_MAP_PTR (insn_aux->map_ptr_state); + map = insn_aux->map_ptr_state.map_ptr;if (!map->ops->map_set_for_each_callback_args || !map->ops->map_for_each_callback) {verbose (env,"callback function not allowed for map\n" );
@@ -10017,12 +10013,12 @@ record_func_map(struct bpf_verifier_env *env, struct bpf_call_arg_meta *meta,return -EACCES ; } -if (!BPF_MAP_PTR (aux->map_ptr_state)) +if (!aux->map_ptr_state.map_ptr) +bpf_map_ptr_store (aux, meta->map_ptr, + !meta->map_ptr->bypass_spec_v1, false); +else if (aux->map_ptr_state.map_ptr != meta->map_ptr)bpf_map_ptr_store (aux, meta->map_ptr, - !meta->map_ptr->bypass_spec_v1); -else if (BPF_MAP_PTR (aux->map_ptr_state) != meta->map_ptr) -bpf_map_ptr_store (aux,BPF_MAP_PTR_POISON , - !meta->map_ptr->bypass_spec_v1); + !meta->map_ptr->bypass_spec_v1, true);return 0 ; }
@@ -19829,7 +19825,7 @@ static int do_misc_fixups(struct bpf_verifier_env *env) !bpf_map_ptr_unpriv(aux)) {struct bpf_jit_poke_descriptor desc = { .reason =BPF_POKE_REASON_TAIL_CALL , - .tail_call.map =BPF_MAP_PTR (aux->map_ptr_state), + .tail_call.map = aux->map_ptr_state.map_ptr, .tail_call.key =bpf_map_key_immediate (aux), .insn_idx = i + delta, };
@@ -19858,7 +19854,7 @@ static int do_misc_fixups(struct bpf_verifier_env *env)return -EINVAL ; } - map_ptr =BPF_MAP_PTR (aux->map_ptr_state); + map_ptr = aux->map_ptr_state.map_ptr; insn_buf[0 ] =BPF_JMP_IMM (BPF_JGE ,BPF_REG_3 , map_ptr->max_entries,2 ); insn_buf[1] = BPF_ALU32_IMM(BPF_AND, BPF_REG_3,
@@ -19966,7 +19962,7 @@ static int do_misc_fixups(struct bpf_verifier_env *env)if (bpf_map_ptr_poisoned (aux)) goto patch_call_imm; - map_ptr =BPF_MAP_PTR (aux->map_ptr_state); + map_ptr = aux->map_ptr_state.map_ptr; ops = map_ptr->ops;if (insn->imm == BPF_FUNC_map_lookup_elem && ops->map_gen_lookup) {
Signature · 1 line
2.32.0.3.g01195cf9f
Yonghong Song
reviewerRe: [PATCH bpf-next 1/3] bpf: store both map ptr and state in bpf_insn_aux_data
Quoted 4 lines · Philo Lu
Currently,
bpf_insn_aux_data->map_ptr_stateis used to store eithermap_ptror its poison state (i.e.,BPF_MAP_PTR_POISON). ThusBPF_MAP_PTR_POISONmust be checked before readingmap_ptr. However we do need both of them sometimes, e.g., inbpf_for_each_map_elem()helper ().
You can say:
In certain cases, we may need valid map_ptr even in case of poison state. This will be explained in next patch with bpf_for_each_map_elem() helper.
Quoted 6 lines
This patch changes
map_ptr_stateinto a new struct including both map pointer and its state (poison/unpriv). It's in the same union with structbpf_loop_inline_state, so there is no extra memory overhead. Besides, macros BPF_MAP_PTR_UNPRIV/BPF_MAP_PTR_POISON/BPF_MAP_PTR are no longer needed.
You can further mention that this patch does not change any existing functionality.
Quoted 12 lines
Signed-off-by Philo Lu <[email protected]>--- include/linux/bpf_verifier.h | 9 ++++++++- kernel/bpf/verifier.c | 36 ++++++++++++++++-------------------- 2 files changed, 24 insertions(+), 21 deletions(-)include/linux/bpf_verifier.h +0
-0
include/linux/bpf_verifier.h struct bpf_loop_inline_state { · line 509
Quoted 8 lines
include/linux/bpf_verifier.h +5
-0@@ -502,6 +502,13 @@ struct bpf_loop_inline_state {u32 callback_subprogno;/* valid when fit_for_inline is true */ }; +/* pointer and state for maps */ +struct bpf_map_ptr_state { +struct bpf_map *map_ptr; +unsigned int poison:1 ; +unsigned int unpriv:1 ;
Let us change 'unsigned int' to 'bool' which is more appropriate.
Quoted 31 lines
include/linux/bpf_verifier.h +3
-1+}; +/* Possible states for alu_state member. */ #define BPF_ALU_SANITIZE_SRC (1U << 0)#define BPF_ALU_SANITIZE_DST (1U << 1)@@ -514,7 +521,7 @@ struct bpf_loop_inline_state { struct bpf_insn_aux_data { union { enum bpf_reg_type ptr_type; /* pointer type for load/store insns */ - unsigned long map_ptr_state; /* pointer/poison value for maps */ + struct bpf_map_ptr_state map_ptr_state; s32 call_imm; /* saved imm field of call insn */ u32 alu_limit; /* limit for add/sub register with pointer */ struct {kernel/bpf/verifier.c +0
-5@@ -190,11 +190,6 @@ struct bpf_verifier_stack_elem {#define BPF_MAP_KEY_POISON (1ULL << 63)#define BPF_MAP_KEY_SEEN (1ULL << 62) -#define BPF_MAP_PTR_UNPRIV 1UL -#define BPF_MAP_PTR_POISON ((void *)((0xeB9FUL << 1) + \ - POISON_POINTER_DELTA)) -#define BPF_MAP_PTR (X ) ((struct bpf_map *)((X) & ~BPF_MAP_PTR_UNPRIV)) -#define BPF_GLOBAL_PERCPU_MA_MAX_SIZE 512static int acquire_reference_state (struct bpf_verifier_env *env,int insn_idx);
kernel/bpf/verifier.c static bool is_trusted_reg(const struct bpf_reg_state *reg); · line 207
Quoted 5 lines
kernel/bpf/verifier.c +1
-1@@ -209,21 +204,22 @@ static bool is_trusted_reg(const struct bpf_reg_state *reg);static bool bpf_map_ptr_poisoned (const struct bpf_insn_aux_data *aux) { -return BPF_MAP_PTR (aux->map_ptr_state) ==BPF_MAP_PTR_POISON ; +return !!aux->map_ptr_state.poison;
with 'poison' is bool type, just return aux->map_ptr_state.poison.
kernel/bpf/verifier.c static bool is_trusted_reg(const struct bpf_reg_state *reg); · line 212
Quoted 6 lines
kernel/bpf/verifier.c +1
-1}static bool bpf_map_ptr_unpriv (const struct bpf_insn_aux_data *aux) { -return aux->map_ptr_state &BPF_MAP_PTR_UNPRIV ; +return !!aux->map_ptr_state.unpriv;
return aux->map_ptr_state.unpriv.
Quoted 16 lines
kernel/bpf/verifier.c +5
-4}static void bpf_map_ptr_store (struct bpf_insn_aux_data *aux, -const struct bpf_map *map,bool unpriv) +struct bpf_map *map, +bool unpriv,bool poison) { -BUILD_BUG_ON ((unsigned long )BPF_MAP_PTR_POISON &BPF_MAP_PTR_UNPRIV ); unpriv |=bpf_map_ptr_unpriv (aux); - aux->map_ptr_state = (unsigned long )map | - (unpriv ?BPF_MAP_PTR_UNPRIV :0UL ); + aux->map_ptr_state.unpriv = unpriv; + aux->map_ptr_state.poison = poison; + aux->map_ptr_state.map_ptr = map; }
[...]
PATCH 2/3 bpf: allow invoking bpf_for_each_map_elem with different maps
In reply to Philo LuTaking different maps within a single bpf_for_each_map_elem call is not allowed before, because from the second map, bpf_insn_aux_data->map_ptr_state will be marked as *poison*. In fact both map_ptr and state are needed to support this use case: map_ptr is used by set_map_elem_callback_state() while poison state is needed to determine whether to use direct call.
--- kernel/bpf/verifier.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)
kernel/bpf/verifier.c +1 -5
@@ -9649,11 +9649,7 @@ static int set_map_elem_callback_state(struct bpf_verifier_env *env,struct bpf_map *map;int err; -if (bpf_map_ptr_poisoned (insn_aux)) { -verbose (env,"tail_call abusing map_ptr\n" ); -return -EINVAL ; - } - +/* should not check poison */ map = insn_aux->map_ptr_state.map_ptr;if (!map->ops->map_set_for_each_callback_args || !map->ops->map_for_each_callback) {
Signature · 1 line
2.32.0.3.g01195cf9f
Yonghong Song
reviewerRe: [PATCH bpf-next 2/3] bpf: allow invoking bpf_for_each_map_elem with different maps
Quoted 17 lines · Philo Lu
Taking different maps within a single
bpf_for_each_map_elemcall is not allowed before, because from the second map,bpf_insn_aux_data->map_ptr_statewill be marked as *poison*. In fact bothmap_ptrand state are needed to support this use case:map_ptris used byset_map_elem_callback_state()while poison state is needed to determine whether to use direct call.Signed-off-by Philo Lu <[email protected]>--- kernel/bpf/verifier.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)kernel/bpf/verifier.c +0
-0
kernel/bpf/verifier.c static int set_map_elem_callback_state(struct bpf_verifier_env *env, · line 9652
Quoted 9 lines
kernel/bpf/verifier.c +1
-5@@ -9649,11 +9649,7 @@ static int set_map_elem_callback_state(struct bpf_verifier_env *env,struct bpf_map *map;int err; -if (bpf_map_ptr_poisoned (insn_aux)) { -verbose (env,"tail_call abusing map_ptr\n" ); -return -EINVAL ; - } - +/* should not check poison */
Maybe change comments to below?
/* valid map_ptr and poison value does not matter */
Quoted 3 lines
kernel/bpf/verifier.c +0
-0map = insn_aux->map_ptr_state.map_ptr;if (!map->ops->map_set_for_each_callback_args || !map->ops->map_for_each_callback) {
PATCH 3/3 selftests/bpf: add test for bpf_for_each_map_elem() with different maps
In reply to Philo LuA test is added for bpf_for_each_map_elem() with either an arraymap or a hashmap.
$ tools/testing/selftests/bpf/test_progs -t for_each #93/1 for_each/hash_map:OK #93/2 for_each/array_map:OK #93/3 for_each/write_map_key:OK #93/4 for_each/multi_maps:OK #93 for_each:OK Summary: 1/4 PASSED, 0 SKIPPED, 0 FAILED
--- .../selftests/bpf/prog_tests/for_each.c | 67 +++++++++++++++++++ .../selftests/bpf/progs/for_each_multi_maps.c | 49 ++++++++++++++ 2 files changed, 116 insertions(+) create mode 100644 tools/testing/selftests/bpf/progs/for_each_multi_maps.c
tools/testing/selftests/bpf/prog_tests/for_each.c +67 -0
@@ -5,6 +5,7 @@#include "for_each_hash_map_elem.skel.h" #include "for_each_array_map_elem.skel.h" #include "for_each_map_elem_write_key.skel.h" +#include "for_each_multi_maps.skel.h" static unsigned int duration;
@@ -143,6 +144,70 @@ static void test_write_map_key(void)for_each_map_elem_write_key__destroy (skel); } +static void test_multi_maps (void ) +{ +struct for_each_multi_maps *skel; +__u64 val, array_total, hash_total; +__u32 key, max_entries; +int i, err; + +LIBBPF_OPTS (bpf_test_run_opts, topts, + .data_in = &pkt_v4, + .data_size_in = sizeof(pkt_v4), + .repeat = 1, + ); + + skel =for_each_multi_maps__open_and_load (); +if (!ASSERT_OK_PTR (skel,"for_each_multi_maps__open_and_load" )) +return ; + + array_total =0 ; +/* left last element as empty */ + max_entries =bpf_map__max_entries (skel->maps.arraymap) -1 ; +for (i =0 ; i < max_entries; i++) { + key = i; + val = i +1 ; + array_total += val; + err =bpf_map__update_elem (skel->maps.arraymap, &key,sizeof (key), + &val,sizeof (val),BPF_ANY ); +if (!ASSERT_OK (err,"array_map_update" )) + goto out; + } + + hash_total =0 ; + max_entries =bpf_map__max_entries (skel->maps.hashmap) -1 ; +for (i =0 ; i < max_entries; i++) { + key = i +100 ; + val = i +1 ; + hash_total += val; + err =bpf_map__update_elem (skel->maps.hashmap, &key,sizeof (key), + &val,sizeof (val),BPF_ANY ); +if (!ASSERT_OK (err,"hash_map_update" )) + goto out; + } + + skel->bss->data_output =0 ; + skel->bss->use_array =1 ; + err =bpf_prog_test_run_opts (bpf_program__fd (skel->progs.test_pkt_access), &topts); +if (CHECK (err || topts.retval,"ipv4" ,"err %d errno %d retval %d\n" , + err, errno, topts.retval)) + goto out; + +ASSERT_EQ (skel->bss->data_output, array_total,"array output" ); + + skel->bss->data_output =0 ; + skel->bss->use_array =0 ; + err =bpf_prog_test_run_opts (bpf_program__fd (skel->progs.test_pkt_access), &topts); +if (CHECK (err || topts.retval,"ipv4" ,"err %d errno %d retval %d\n" , + err, errno, topts.retval)) + goto out; + +ASSERT_EQ (skel->bss->data_output, hash_total,"hash output" ); + +out: +for_each_multi_maps__destroy (skel); +} +void test_for_each (void ) {if (test__start_subtest ("hash_map" ))
@@ -151,4 +216,6 @@ void test_for_each(void)test_array_map ();if (test__start_subtest ("write_map_key" ))test_write_map_key (); +if (test__start_subtest ("multi_maps" )) +test_multi_maps (); }
tools/testing/selftests/bpf/progs/for_each_multi_maps.c new file +49 -0
49 lines not on this page · raw message
Signature · 1 line
2.32.0.3.g01195cf9f
Yonghong Song
reviewerRe: [PATCH bpf-next 3/3] selftests/bpf: add test for bpf_for_each_map_elem() with different maps
Quoted 43 lines · Philo Lu
A test is added for
bpf_for_each_map_elem()with either an arraymap or a hashmap.$ tools/testing/selftests/bpf/test_progs -t for_each #93/1 for_each/hash_map:OK #93/2 for_each/array_map:OK #93/3 for_each/write_map_key:OK #93/4 for_each/multi_maps:OK #93 for_each:OK Summary: 1/4 PASSED, 0 SKIPPED, 0 FAILEDSigned-off-by Philo Lu <[email protected]>--- .../selftests/bpf/prog_tests/for_each.c | 67 +++++++++++++++++++ .../selftests/bpf/progs/for_each_multi_maps.c | 49 ++++++++++++++ 2 files changed, 116 insertions(+)create mode 100644
tools/testing/selftests/bpf/progs/for_each_multi_maps.ctools/testing/selftests/bpf/prog_tests/for_each.c +11
-0@@ -5,6 +5,7 @@#include "for_each_hash_map_elem.skel.h" #include "for_each_array_map_elem.skel.h" #include "for_each_map_elem_write_key.skel.h" +#include "for_each_multi_maps.skel.h" static unsigned int duration;@@ -143,6 +144,70 @@ static void test_write_map_key(void)for_each_map_elem_write_key__destroy (skel); } +static void test_multi_maps (void ) +{ +struct for_each_multi_maps *skel; +__u64 val, array_total, hash_total; +__u32 key, max_entries; +int i, err; + + LIBBPF_OPTS(bpf_test_run_opts, topts, + .data_in = &pkt_v4, + .data_size_in = sizeof(pkt_v4),
tools/testing/selftests/bpf/prog_tests/for_each.c static void test_write_map_key(void) · line 166
Quoted 10 lines
tools/testing/selftests/bpf/prog_tests/for_each.c +10
-0+ .repeat = 1, + ); + + skel =for_each_multi_maps__open_and_load (); +if (!ASSERT_OK_PTR (skel,"for_each_multi_maps__open_and_load" )) +return ; + + array_total =0 ; +/* left last element as empty */ + max_entries =bpf_map__max_entries (skel->maps.arraymap) -1 ;
Any particular reason you skip the last element?
tools/testing/selftests/bpf/prog_tests/for_each.c static void test_write_map_key(void) · line 178
Quoted 12 lines
tools/testing/selftests/bpf/prog_tests/for_each.c +12
-0+for (i =0 ; i < max_entries; i++) { + key = i; + val = i +1 ; + array_total += val; + err =bpf_map__update_elem (skel->maps.arraymap, &key,sizeof (key), + &val,sizeof (val),BPF_ANY ); +if (!ASSERT_OK (err,"array_map_update" )) + goto out; + } + + hash_total =0 ; + max_entries =bpf_map__max_entries (skel->maps.hashmap) -1 ;
ditto.
Quoted 6 lines
tools/testing/selftests/bpf/prog_tests/for_each.c +6
-0+for (i =0 ; i < max_entries; i++) { + key = i +100 ; + val = i +1 ; + hash_total += val; + err =bpf_map__update_elem (skel->maps.hashmap, &key,sizeof (key), + &val,sizeof (val),BPF_ANY );
tools/testing/selftests/bpf/prog_tests/for_each.c static void test_write_map_key(void) · line 194
Quoted 10 lines
tools/testing/selftests/bpf/prog_tests/for_each.c +10
-0+if (!ASSERT_OK (err,"hash_map_update" )) + goto out; + } + + skel->bss->data_output =0 ; + skel->bss->use_array =1 ; + err =bpf_prog_test_run_opts (bpf_program__fd (skel->progs.test_pkt_access), &topts); +if (CHECK (err || topts.retval,"ipv4" ,"err %d errno %d retval %d\n" , + err, errno, topts.retval)) + goto out;
Let us use ASSERT_* macros here. In this case, you can do
ASSERT_OK(err, "bpf_prog_test_run_opts"); ASSERT_OK(opts.retval, "retval");
There is no need to goto out, we can continue testing below.
tools/testing/selftests/bpf/prog_tests/for_each.c static void test_write_map_key(void) · line 203
Quoted 9 lines
tools/testing/selftests/bpf/prog_tests/for_each.c +9
-0+ +ASSERT_EQ (skel->bss->data_output, array_total,"array output" ); + + skel->bss->data_output =0 ; + skel->bss->use_array =0 ; + err =bpf_prog_test_run_opts (bpf_program__fd (skel->progs.test_pkt_access), &topts); +if (CHECK (err || topts.retval,"ipv4" ,"err %d errno %d retval %d\n" , + err, errno, topts.retval)) + goto out;
Do two ASSERT_OK similar to the above.
Quoted 8 lines
tools/testing/selftests/bpf/prog_tests/for_each.c +7
-0+ +ASSERT_EQ (skel->bss->data_output, hash_total,"hash output" ); + +out: +for_each_multi_maps__destroy (skel); +} +
Re: [PATCH bpf-next 3/3] selftests/bpf: add test for bpf_for_each_map_elem() with different maps
Quoted 46 lines · Yonghong Song
Quoted 44 lines · Philo Lu
A test is added for
bpf_for_each_map_elem()with either an arraymap or a hashmap.$ tools/testing/selftests/bpf/test_progs -t for_each #93/1 for_each/hash_map:OK #93/2 for_each/array_map:OK #93/3 for_each/write_map_key:OK #93/4 for_each/multi_maps:OK #93 for_each:OK Summary: 1/4 PASSED, 0 SKIPPED, 0 FAILEDSigned-off-by Philo Lu <[email protected]>---
.../selftests/bpf/prog_tests/for_each.c | 67 +++++++++++++++++++.../selftests/bpf/progs/for_each_multi_maps.c| 49 ++++++++++++++2 files changed, 116 insertions(+)create mode 100644
tools/testing/selftests/bpf/progs/for_each_multi_maps.ctools/testing/selftests/bpf/prog_tests/for_each.c +15
-0@@ -5,6 +5,7 @@ #include "for_each_hash_map_elem.skel.h" #include "for_each_array_map_elem.skel.h" #include "for_each_map_elem_write_key.skel.h" +#include "for_each_multi_maps.skel.h" static unsigned int duration;@@ -143,6 +144,70 @@ static void test_write_map_key(void) for_each_map_elem_write_key__destroy(skel); } +static void test_multi_maps (void ) +{ + struct for_each_multi_maps *skel; + __u64 val, array_total, hash_total; + __u32 key, max_entries; + int i, err; + + LIBBPF_OPTS(bpf_test_run_opts, topts, + .data_in = &pkt_v4, + .data_size_in = sizeof(pkt_v4), + .repeat = 1, + ); + + skel = for_each_multi_maps__open_and_load();
Quoted 9 lines
tools/testing/selftests/bpf/prog_tests/for_each.c static void test_write_map_key(void) · line 166
Quoted 6 lines
tools/testing/selftests/bpf/prog_tests/for_each.c +6
-0+ if (!ASSERT_OK_PTR(skel, "for_each_multi_maps__open_and_load")) + return; + + array_total = 0; + /* left last element as empty */ + max_entries = bpf_map__max_entries(skel->maps.arraymap) - 1;Any particular reason you skip the last element?
No actually, I will remove it in the next version.
Thanks for your comments Yonghong! I will send a next version soon.