allow bpf_map_sum_elem_count for all program types
Subsystems (5)
A message that is not in the archive (sent off-list or not yet received): [email protected]
cover allow bpf_map_sum_elem_count for all program types
This short series is a follow up to the recent series [1] which added per-cpu insert/delete statistics for maps. The bpf_map_sum_elem_count kfunc presented in the original series was only available to tracing programs, so let's make it available to all.
The first patch allows to treat CONST_PTR_TO_MAP as trusted pointers from kfunc's point of view.
The second patch just adds const to the map argument of the bpf_map_sum_elem_count kfunc.
The third patch registers the bpf_map_sum_elem_count for all programs, and patches selftests correspondingly.
Anton Protopopov (3):
bpf: consider CONST_PTR_TO_MAP as trusted pointer to struct bpf_map
bpf: make an argument const in the bpf_map_sum_elem_count kfunc
bpf: allow any program to use the bpf_map_sum_elem_count kfunc
include/linux/btf_ids.h | 1 + kernel/bpf/map_iter.c | 7 +++---- kernel/bpf/verifier.c | 5 ++++- tools/testing/selftests/bpf/progs/map_ptr_kern.c | 5 +++++ 4 files changed, 13 insertions(+), 5 deletions(-)
Signature · 1 line
2.34.1
PATCH 1/3 bpf: consider CONST_PTR_TO_MAP as trusted pointer to struct bpf_map
Patch verifier to regard values of type CONST_PTR_TO_MAP as trusted pointers to struct bpf_map. This allows kfuncs to work with struct bpf_map * arguments.
Save some bytes by defining btf_bpf_map_id as BTF_ID_LIST_GLOBAL_SINGLE (which is u32[1]), not as BTF_ID_LIST (which is u32[64]).
--- include/linux/btf_ids.h | 1 + kernel/bpf/map_iter.c | 3 +-- kernel/bpf/verifier.c | 5 ++++- 3 files changed, 6 insertions(+), 3 deletions(-)
include/linux/btf_ids.h +1 -0
@@ -267,5 +267,6 @@ MAX_BTF_TRACING_TYPE,extern u32 btf_tracing_ids[];extern u32 bpf_cgroup_btf_id[];extern u32 bpf_local_storage_map_btf_id[]; +extern u32 btf_bpf_map_id[];#endif
kernel/bpf/map_iter.c +1 -2
@@ -78,8 +78,7 @@ static const struct seq_operations bpf_map_seq_ops = { .show = bpf_map_seq_show, }; -BTF_ID_LIST (btf_bpf_map_id) -BTF_ID(struct, bpf_map) +BTF_ID_LIST_GLOBAL_SINGLE(btf_bpf_map_id, struct, bpf_map)static const struct bpf_iter_seq_info bpf_map_seq_info = { .seq_ops = &bpf_map_seq_ops,
kernel/bpf/verifier.c +4 -1
@@ -5419,6 +5419,9 @@ static bool is_trusted_reg(const struct bpf_reg_state *reg)if (reg->ref_obj_id)return true; +if (reg->type ==CONST_PTR_TO_MAP ) +return true; +/* If a register is not referenced, it is trusted if it has the * MEM_ALLOC or PTR_TRUSTED type modifiers, and no others. Some of the * other type modifiers may be safe, but we elect to take an opt-in
@@ -10052,13 +10055,13 @@ static bool __btf_type_is_scalar_struct(struct bpf_verifier_env *env,return true; } -static u32 *reg2btf_ids[__BPF_REG_TYPE_MAX] = { #ifdef CONFIG_NET [PTR_TO_SOCKET ] = &btf_sock_ids[BTF_SOCK_TYPE_SOCK ], [PTR_TO_SOCK_COMMON ] = &btf_sock_ids[BTF_SOCK_TYPE_SOCK_COMMON ], [PTR_TO_TCP_SOCK ] = &btf_sock_ids[BTF_SOCK_TYPE_TCP ], #endif + [CONST_PTR_TO_MAP ] = btf_bpf_map_id, };enum kfunc_ptr_arg_type {
Signature · 1 line
2.34.1
Re: [PATCH bpf-next 1/3] bpf: consider CONST_PTR_TO_MAP as trusted pointer to struct bpf_map
Quoted 45 lines · Anton Protopopov
Patch verifier to regard values of type
CONST_PTR_TO_MAPas trusted pointers to structbpf_map. This allows kfuncs to work withstruct bpf_map *arguments.Save some bytes by defining
btf_bpf_map_idasBTF_ID_LIST_GLOBAL_SINGLE(which is u32[1]), not asBTF_ID_LIST(which is u32[64]).Signed-off-by Anton Protopopov <[email protected]>--- include/linux/btf_ids.h | 1 + kernel/bpf/map_iter.c | 3 +-- kernel/bpf/verifier.c | 5 ++++- 3 files changed, 6 insertions(+), 3 deletions(-)include/linux/btf_ids.h +1
-0@@ -267,5 +267,6 @@ MAX_BTF_TRACING_TYPE,extern u32 btf_tracing_ids[];extern u32 bpf_cgroup_btf_id[];extern u32 bpf_local_storage_map_btf_id[]; +extern u32 btf_bpf_map_id[];#endif kernel/bpf/map_iter.c +1
-2@@ -78,8 +78,7 @@ static const struct seq_operations bpf_map_seq_ops = { .show = bpf_map_seq_show, }; -BTF_ID_LIST (btf_bpf_map_id) -BTF_ID(struct, bpf_map) +BTF_ID_LIST_GLOBAL_SINGLE(btf_bpf_map_id, struct, bpf_map)static const struct bpf_iter_seq_info bpf_map_seq_info = { .seq_ops = &bpf_map_seq_ops,kernel/bpf/verifier.c +0
-0
kernel/bpf/verifier.c static bool is_trusted_reg(const struct bpf_reg_state *reg) · line 5424
Quoted 6 lines
kernel/bpf/verifier.c +3
-0@@ -5419,6 +5419,9 @@ static bool is_trusted_reg(const struct bpf_reg_state *reg)if (reg->ref_obj_id)return true; +if (reg->type ==CONST_PTR_TO_MAP ) +return true; +
Overall it looks great.
Instead of above, how about the following instead:
kernel/bpf/verifier.c +0 -0
@@ -10775,7 +10775,7 @@ static int check_kfunc_args(struct
bpf_verifier_env *env, struct bpf_kfunc_call_
if (!is_kfunc_trusted_args(meta) && !is_kfunc_rcu(meta))
break;- if (!is_trusted_reg(reg)) {
+ if (!is_trusted_reg(reg) &&
!reg2btf_ids[base_type(reg->type)]) {
This way we won't need to list every convertible type in is_trusted_reg.
I'm a bit hesitant to put reg2btf_ids[] check directly into is_trusted_reg(). Maybe it's ok, but it needs more analysis.
Re: [PATCH bpf-next 1/3] bpf: consider CONST_PTR_TO_MAP as trusted pointer to struct bpf_map
Quoted 70 lines · Alexei Starovoitov
Quoted 45 lines · Anton Protopopov
Patch verifier to regard values of type
CONST_PTR_TO_MAPas trusted pointers to structbpf_map. This allows kfuncs to work withstruct bpf_map *arguments.Save some bytes by defining
btf_bpf_map_idasBTF_ID_LIST_GLOBAL_SINGLE(which is u32[1]), not asBTF_ID_LIST(which is u32[64]).Signed-off-by Anton Protopopov <[email protected]>--- include/linux/btf_ids.h | 1 + kernel/bpf/map_iter.c | 3 +-- kernel/bpf/verifier.c | 5 ++++- 3 files changed, 6 insertions(+), 3 deletions(-)include/linux/btf_ids.h +1
-0@@ -267,5 +267,6 @@ MAX_BTF_TRACING_TYPE,extern u32 btf_tracing_ids[];extern u32 bpf_cgroup_btf_id[];extern u32 bpf_local_storage_map_btf_id[]; +extern u32 btf_bpf_map_id[];#endif kernel/bpf/map_iter.c +1
-2@@ -78,8 +78,7 @@ static const struct seq_operations bpf_map_seq_ops = { .show = bpf_map_seq_show, }; -BTF_ID_LIST (btf_bpf_map_id) -BTF_ID(struct, bpf_map) +BTF_ID_LIST_GLOBAL_SINGLE(btf_bpf_map_id, struct, bpf_map)static const struct bpf_iter_seq_info bpf_map_seq_info = { .seq_ops = &bpf_map_seq_ops,kernel/bpf/verifier.c +0
-0kernel/bpf/verifier.c static bool is_trusted_reg(const struct bpf_reg_state *reg) · line 5424
Quoted 6 lines
kernel/bpf/verifier.c +3
-0@@ -5419,6 +5419,9 @@ static bool is_trusted_reg(const struct bpf_reg_state *reg)if (reg->ref_obj_id)return true; +if (reg->type ==CONST_PTR_TO_MAP ) +return true; +Overall it looks great.
Instead of above, how about the following instead:kernel/bpf/verifier.c +0
-0@@ -10775,7 +10775,7 @@ static int check_kfunc_args(struct
bpf_verifier_env*env, structbpf_kfunc_call_if (!is_kfunc_trusted_args(meta) && !is_kfunc_rcu(meta)) break;kernel/bpf/verifier.c +1
-1-if (!is_trusted_reg (reg)) { + if (!is_trusted_reg(reg) &&!reg2btf_ids[base_type(reg->type)]) {
Quoted 4 lines
This way we won't need to list every convertible type in
is_trusted_reg.I'm a bit hesitant to put reg2btf_ids[] check directly into
is_trusted_reg(). Maybe it's ok, but it needs more analysis.
I am not sure I see a difference in adding a check you proposed above and adding the reg2btf_ids[] check directly into the is_trusted_reg() function. Basically, we say "if type is in reg2btf_ids[], then consider it trusted" in both cases. AFAIS, currently the reg2btf_ids[] contains only trusted types, however, could it happen that we add a non-trusted type there?
So, I would leave the patch as is (which also makes sense because the const-ptr-to-map is a special case), or add the "reg2btf_ids[] check" directly into the is_trusted_reg() function.
Re: [PATCH bpf-next 1/3] bpf: consider CONST_PTR_TO_MAP as trusted pointer to struct bpf_map
Quoted 83 lines · Anton Protopopov
Quoted 70 lines · Alexei Starovoitov
Quoted 45 lines · Anton Protopopov
Patch verifier to regard values of type
CONST_PTR_TO_MAPas trusted pointers to structbpf_map. This allows kfuncs to work withstruct bpf_map *arguments.Save some bytes by defining
btf_bpf_map_idasBTF_ID_LIST_GLOBAL_SINGLE(which is u32[1]), not asBTF_ID_LIST(which is u32[64]).Signed-off-by Anton Protopopov <[email protected]>--- include/linux/btf_ids.h | 1 + kernel/bpf/map_iter.c | 3 +-- kernel/bpf/verifier.c | 5 ++++- 3 files changed, 6 insertions(+), 3 deletions(-)include/linux/btf_ids.h +1
-0@@ -267,5 +267,6 @@ MAX_BTF_TRACING_TYPE,extern u32 btf_tracing_ids[];extern u32 bpf_cgroup_btf_id[];extern u32 bpf_local_storage_map_btf_id[]; +extern u32 btf_bpf_map_id[];#endif kernel/bpf/map_iter.c +1
-2@@ -78,8 +78,7 @@ static const struct seq_operations bpf_map_seq_ops = { .show = bpf_map_seq_show, }; -BTF_ID_LIST (btf_bpf_map_id) -BTF_ID(struct, bpf_map) +BTF_ID_LIST_GLOBAL_SINGLE(btf_bpf_map_id, struct, bpf_map)static const struct bpf_iter_seq_info bpf_map_seq_info = { .seq_ops = &bpf_map_seq_ops,kernel/bpf/verifier.c +0
-0kernel/bpf/verifier.c static bool is_trusted_reg(const struct bpf_reg_state *reg) · line 5424
Quoted 6 lines
kernel/bpf/verifier.c +3
-0@@ -5419,6 +5419,9 @@ static bool is_trusted_reg(const struct bpf_reg_state *reg)if (reg->ref_obj_id)return true; +if (reg->type ==CONST_PTR_TO_MAP ) +return true; +Overall it looks great.
Instead of above, how about the following instead:kernel/bpf/verifier.c +0
-0@@ -10775,7 +10775,7 @@ static int check_kfunc_args(struct
bpf_verifier_env*env, structbpf_kfunc_call_if (!is_kfunc_trusted_args(meta) && !is_kfunc_rcu(meta)) break;kernel/bpf/verifier.c +1
-1-if (!is_trusted_reg (reg)) { + if (!is_trusted_reg(reg) &&!reg2btf_ids[base_type(reg->type)]) {
Quoted 4 lines
This way we won't need to list every convertible type in
is_trusted_reg.I'm a bit hesitant to put reg2btf_ids[] check directly into
is_trusted_reg(). Maybe it's ok, but it needs more analysis.I am not sure I see a difference in adding a check you proposed above and adding the reg2btf_ids[] check directly into the
is_trusted_reg()function. Basically, we say "if type is in reg2btf_ids[], then consider it trusted" in both cases. AFAIS, currently the reg2btf_ids[] contains only trusted types, however, could it happen that we add a non-trusted type there?
Quoted 3 lines
So, I would leave the patch as is (which also makes sense because the const-ptr-to-map is a special case), or add the "reg2btf_ids[] check" directly into the
is_trusted_reg()function.
Fair enough. Let's add reg2btf_ids[] to is_trusted_reg() directly.
Re: [PATCH bpf-next 1/3] bpf: consider CONST_PTR_TO_MAP as trusted pointer to struct bpf_map
Quoted 84 lines · Alexei Starovoitov
Quoted 83 lines · Anton Protopopov
Quoted 70 lines · Alexei Starovoitov
Quoted 45 lines · Anton Protopopov
Patch verifier to regard values of type
CONST_PTR_TO_MAPas trusted pointers to structbpf_map. This allows kfuncs to work withstruct bpf_map *arguments.Save some bytes by defining
btf_bpf_map_idasBTF_ID_LIST_GLOBAL_SINGLE(which is u32[1]), not asBTF_ID_LIST(which is u32[64]).Signed-off-by Anton Protopopov <[email protected]>--- include/linux/btf_ids.h | 1 + kernel/bpf/map_iter.c | 3 +-- kernel/bpf/verifier.c | 5 ++++- 3 files changed, 6 insertions(+), 3 deletions(-)include/linux/btf_ids.h +1
-0@@ -267,5 +267,6 @@ MAX_BTF_TRACING_TYPE,extern u32 btf_tracing_ids[];extern u32 bpf_cgroup_btf_id[];extern u32 bpf_local_storage_map_btf_id[]; +extern u32 btf_bpf_map_id[];#endif kernel/bpf/map_iter.c +1
-2@@ -78,8 +78,7 @@ static const struct seq_operations bpf_map_seq_ops = { .show = bpf_map_seq_show, }; -BTF_ID_LIST (btf_bpf_map_id) -BTF_ID(struct, bpf_map) +BTF_ID_LIST_GLOBAL_SINGLE(btf_bpf_map_id, struct, bpf_map)static const struct bpf_iter_seq_info bpf_map_seq_info = { .seq_ops = &bpf_map_seq_ops,kernel/bpf/verifier.c +0
-0kernel/bpf/verifier.c static bool is_trusted_reg(const struct bpf_reg_state *reg) · line 5424
Quoted 6 lines
kernel/bpf/verifier.c +3
-0@@ -5419,6 +5419,9 @@ static bool is_trusted_reg(const struct bpf_reg_state *reg)if (reg->ref_obj_id)return true; +if (reg->type ==CONST_PTR_TO_MAP ) +return true; +Overall it looks great.
Instead of above, how about the following instead:kernel/bpf/verifier.c +0
-0@@ -10775,7 +10775,7 @@ static int check_kfunc_args(struct
bpf_verifier_env*env, structbpf_kfunc_call_if (!is_kfunc_trusted_args(meta) && !is_kfunc_rcu(meta)) break;kernel/bpf/verifier.c +1
-1-if (!is_trusted_reg (reg)) { + if (!is_trusted_reg(reg) &&!reg2btf_ids[base_type(reg->type)]) {
Quoted 4 lines
This way we won't need to list every convertible type in
is_trusted_reg.I'm a bit hesitant to put reg2btf_ids[] check directly into
is_trusted_reg(). Maybe it's ok, but it needs more analysis.I am not sure I see a difference in adding a check you proposed above and adding the reg2btf_ids[] check directly into the
is_trusted_reg()function. Basically, we say "if type is in reg2btf_ids[], then consider it trusted" in both cases. AFAIS, currently the reg2btf_ids[] contains only trusted types, however, could it happen that we add a non-trusted type there?
Quoted 5 lines
Quoted 3 lines
So, I would leave the patch as is (which also makes sense because the const-ptr-to-map is a special case), or add the "reg2btf_ids[] check" directly into the
is_trusted_reg()function.Fair enough. Let's add reg2btf_ids[] to
is_trusted_reg()directly.
Thanks, I will send v2.
PATCH 2/3 bpf: make an argument const in the bpf_map_sum_elem_count kfunc
In reply to Anton ProtopopovWe use the map pointer only to read the counter values, no locking involved, so mark the argument as const.
--- kernel/bpf/map_iter.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/bpf/map_iter.c +1 -1
@@ -197,7 +197,7 @@ __diag_push();__diag_ignore_all ("-Wmissing-prototypes" ,"Global functions as their definitions will be in vmlinux BTF" ); -__bpf_kfunc s64 bpf_map_sum_elem_count(struct bpf_map *map) +__bpf_kfunc s64 bpf_map_sum_elem_count(const struct bpf_map *map) {s64 *pcount;s64 ret =0 ;
Signature · 1 line
2.34.1
PATCH 3/3 bpf: allow any program to use the bpf_map_sum_elem_count kfunc
In reply to Anton ProtopopovRegister the bpf_map_sum_elem_count func for all programs, and update the map_ptr subtest of the test_progs test to test the new functionality.
The usage is allowed as long as the pointer to the map is trusted (when using tracing programs) or is a const pointer to map, as in the following example:
struct {
__uint(type, BPF_MAP_TYPE_HASH);
...
} hash SEC(".maps");
...
static inline int some_bpf_prog(void)
{
struct bpf_map *map = (struct bpf_map *)&hash;
__s64 count;
count = bpf_map_sum_elem_count(map);
...
}--- kernel/bpf/map_iter.c | 2 +- tools/testing/selftests/bpf/progs/map_ptr_kern.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-)
kernel/bpf/map_iter.c +1 -1
@@ -226,6 +226,6 @@ static const struct btf_kfunc_id_set bpf_map_iter_kfunc_set = {static int init_subsystem (void ) { -return register_btf_kfunc_id_set (BPF_PROG_TYPE_TRACING , &bpf_map_iter_kfunc_set); +return register_btf_kfunc_id_set (BPF_PROG_TYPE_UNSPEC , &bpf_map_iter_kfunc_set); }late_initcall (init_subsystem);
tools/testing/selftests/bpf/progs/map_ptr_kern.c +5 -0
@@ -103,6 +103,8 @@ struct {__type (value, __u32); } m_hash SEC(".maps"); +__s64 bpf_map_sum_elem_count(struct bpf_map *map) __ksym; +static inline int check_hash (void ) {struct bpf_htab *hash = (struct bpf_htab *)&m_hash;
@@ -115,6 +117,8 @@ static inline int check_hash(void)VERIFY (hash->elem_size ==64 );VERIFY (hash->count.counter ==0 ); +VERIFY (bpf_map_sum_elem_count (map) ==0 ); +for (i =0 ; i <HALF_ENTRIES ; ++i) {const __u32 key = i;const __u32 val =1 ;
@@ -123,6 +127,7 @@ static inline int check_hash(void)return 0 ; }VERIFY (hash->count.counter ==HALF_ENTRIES ); +VERIFY (bpf_map_sum_elem_count (map) ==HALF_ENTRIES );return 1 ; }
Signature · 1 line
2.34.1