Allocated objects, BPF linked lists
Subsystems (5)
Kumar Kartikeya Dwivedi
maintainerv8 cover Allocated objects, BPF linked lists
This series introduces user defined BPF objects of a type in program BTF. This allows BPF programs to allocate their own objects, build their own object hierarchies, and use the basic building blocks provided by BPF runtime to build their own data structures flexibly.
Then, we introduce the support for single ownership BPF linked lists, which can be put inside BPF maps, or allocated objects, and hold such allocated objects as elements. It works as an instrusive collection, which is done to allow making allocated objects part of multiple data structures at the same time in the future.
The eventual goal of this and future patches is to allow one to do some limited form of kernel style programming in BPF C, and allow programmers to build their own complex data structures flexibly out of basic building blocks.
The key difference will be that such programs are verified to be safe, preserve runtime integrity of the system, and are proven to be bug free as far as the invariants of BPF specific APIs are concerned.
One immediate use case that will be using the entire infrastructure this series is introducing will be managing percpu NMI safe linked lists inside BPF programs.
The other use case this will serve in the near future will be linking kernel structures like XDP frame and sk_buff directly into user data structures (rbtree, pifomap, etc.) for packet queueing. This will follow single ownership concept included in this series.
The user has complete control of the internal locking, and hence also the batching of operations for each critical section.
The features are:
- Allocated objects.
- bpf_obj_new, bpf_obj_drop to allocate and free them.
- Single ownership BPF linked lists.
- Support for them in BPF maps.
- Support for them in allocated objects.
- Global spin locks.
- Spin locks inside allocated objects.
Some other notable things:
- Completely static verification of locking.
- Kfunc argument handling has been completely reworked.
- Argument rewriting support for kfuncs.
- A new bpf_experimental.h header as a dumping ground for these APIs.
Any functionality exposed in this series is NOT part of UAPI. It is only available through use of kfuncs, and structs that can be added to map value may also change their size or name in the future. Hence, every feature in this series must be considered experimental.
Follow-ups:
-----------
* Support for kptrs (local and kernel) in local storage and percpu maps + kptr tests
* Fixes for helper access checks rebasing on top of this series
Next steps:
-----------
* NMI safe percpu single ownership linked lists (using local_t protection).
* Lockless linked lists.
* Allow RCU protected BPF allocated objects. This then allows RCU protected list lookups, since spinlock protection for readers does not scale.
* Introduce bpf_refcount for local kptrs, shared ownership.
* Introduce shared ownership linked lists.
* Documentation.
Changelog:
----------
v7 -> v8
v7: https://lore.kernel.org/bpf/[email protected]
* Fix early return in map_check_btf (Dan Carpenter)
* Fix two memory leak bugs in local storage maps, outer maps
* Address comments from Alexei and Dave
* More local kptr -> allocated object renaming
* Use krealloc with NULL instead kmalloc + krealloc
* Drop WARN_ON_ONCE for field_offs parsing
* Combine kfunc add + remove patches into one
* Drop STRONG suffix from KF_ARG_PTR_TO_KPTR
* Rename is_kfunc_arg_ret_buf_size to is_kfunc_arg_scalar_with_name
* Remove redundant check for reg->type and arg type in it
* Drop void * ret type check
* Remove code duplication in checks for NULL pointer with offset != 0
* Fix two bpf_list_node typos
* Improve log message for bpf_list_head operations
* Improve comments for active_lock struct
* Improve comments for Implementation details of process_spin_lock
* Add Dave's acks
v6 -> v7
v6: https://lore.kernel.org/bpf/[email protected]
* Fix uninitialized variable warning (Dan Carpenter, Kernel Test Robot)
* One more local_kptr renaming
v5 -> v6
v5: https://lore.kernel.org/bpf/[email protected]
* Replace (i && !off) check with next_off, include test (Andrii)
* Drop local kptrs naming (Andrii, Alexei)
* Drop reg->precise == EXACT patch (Andrii)
* Add comment about ptr member of struct active_lock (Andrii)
* Use btf__new_empty + btf__add_xxx APIs (Andrii)
* Address other misc nits from Andrii
v4 -> v5
v4: https://lore.kernel.org/bpf/[email protected]
* Add a lot more selftests (failure, success, runtime, BTF)
* Make sure series is bisect friendly
* Move list draining out of spin lock
* This exposed an issue where bpf_mem_free can now be called in map_free path without migrate_disable, also fixed that.
* Rename MEM_ALLOC -> MEM_RINGBUF, MEM_TYPE_LOCAL -> MEM_ALLOC (Alexei)
* Group lock identity into a struct active_lock { ptr, id } (Dave)
* Split set_release_on_unlock logic into separate patch (Alexei)
v3 -> v4
v3: https://lore.kernel.org/bpf/[email protected]
* Fix compiler error for !CONFIG_BPF_SYSCALL (Kernel Test Robot)
* Fix error due to BUILD_BUG_ON on 32-bit platforms (Kernel Test Robot)
v2 -> v3
v2: https://lore.kernel.org/bpf/[email protected]
* Add ack from Dave for patch 5
* Rename btf_type_fields -> btf_record, btf_type_fields_off -> btf_field_offs, rename functions similarly (Alexei)
* Remove 'kind' component from contains declaration tag (Alexei)
* Move bpf_list_head, bpf_list_node definitions to UAPI bpf.h (Alexei)
* Add note in commit log about modifying btf_struct_access API (Dave)
* Downgrade WARN_ON_ONCE to verbose(env, "...") and return -EFAULT (Dave)
* Add type_is_local_kptr wrapper to avoid noisy checks (Dave)
* Remove unused flags parameter from bpf_kptr_new (Alexei)
* Rename bpf_kptr_new -> bpf_obj_new, bpf_kptr_drop -> bpf_obj_drop (Alexei)
* Reword comment in ref_obj_id_set_release_on_unlock (Dave)
* Fix return type of ref_obj_id_set_release_on_unlock (Dave)
* Introduce is_bpf_list_api_kfunc to dedup checks (Dave)
* Disallow BPF_WRITE to untrusted local kptrs
* Add details about soundness of check_reg_allocation_locked logic
* List untrusted local kptrs for PROBE_MEM handling
v1 -> v2
v1: https://lore.kernel.org/bpf/[email protected]
* Rebase on bpf-next to resolve merge conflict in DENYLIST.s390x
* Fix a couple of mental lapses in bpf_list_head_free
RFC v1 -> v1
RFC v1: https://lore.kernel.org/bpf/[email protected]
* Mostly a complete rewrite of BTF parsing, refactor existing code (Kartikeya)
* Rebase kfunc rewrite for bpf-next, add support for more changes
* Cache type metadata in BTF to avoid recomputation inside verifier (Kartikeya)
* Remove __kernel tag, make things similar to map values, reserve bpf_ prefix
* bpf_kptr_new, bpf_kptr_drop
* Rename precision state enum values (Alexei)
* Drop explicit constructor/destructor support (Alexei)
* Rewrite code for constructing/destructing objects and offload to runtime
* Minimize duplication in bpf_map_value_off_desc handling (Alexei)
* Expose global memory allocator (Alexei)
* Address other nits from Alexei
* Split out local kptrs in maps, more kptrs in maps support into a follow up
Links:
------
* Dave's BPF RB-Tree RFC series
v1 (Discussion thread)
https://lore.kernel.org/bpf/[email protected] v2 (With support for static locks) https://lore.kernel.org/bpf/[email protected]
* BPF Linked Lists Discussion
https://lore.kernel.org/bpf/CAP01T74U30+yeBHEgmgzTJ-XYxZ0zj71kqCDJtTH9YQNfTK+Xw@mail.gmail.com
* BPF Memory Allocator from Alexei
https://lore.kernel.org/bpf/[email protected]
* BPF Memory Allocator UAPI Discussion
https://lore.kernel.org/bpf/[email protected]
Kumar Kartikeya Dwivedi (22):
bpf: Fix early return in map_check_btf
bpf: Do btf_record_free outside map_free callback
bpf: Do btf_record_free for outer maps
bpf: Populate field_offs for inner_map_meta
bpf: Introduce allocated objects support
bpf: Recognize lock and list fields in allocated objects
bpf: Verify ownership relationships for user BTF types
bpf: Allow locking bpf_spin_lock in allocated objects
bpf: Allow locking bpf_spin_lock global variables
bpf: Allow locking bpf_spin_lock in inner map values
bpf: Rewrite kfunc argument handling
bpf: Support constant scalar arguments for kfuncs
bpf: Introduce bpf_obj_new
bpf: Introduce bpf_obj_drop
bpf: Permit NULL checking pointer with non-zero fixed offset
bpf: Introduce single ownership BPF linked list API
bpf: Add 'release on unlock' logic for bpf_list_push_{front,back} selftests/bpf: Add __contains macro to bpf_experimental.h selftests/bpf: Update spinlock selftest
selftests/bpf: Add failure test cases for spin lock pairing selftests/bpf: Add BPF linked list API tests selftests/bpf: Add BTF sanity tests
Documentation/bpf/kfuncs.rst | 24 + include/linux/bpf.h | 51 +- include/linux/bpf_verifier.h | 25 +- include/linux/btf.h | 67 +- kernel/bpf/arraymap.c | 1 - kernel/bpf/btf.c | 653 ++++----- kernel/bpf/core.c | 16 + kernel/bpf/hashtab.c | 1 - kernel/bpf/helpers.c | 115 +- kernel/bpf/map_in_map.c | 52 +- kernel/bpf/syscall.c | 19 +- kernel/bpf/verifier.c | 1238 +++++++++++++++-- tools/testing/selftests/bpf/DENYLIST.s390x | 1 + .../testing/selftests/bpf/bpf_experimental.h | 68 + .../bpf/prog_tests/kfunc_dynptr_param.c | 2 +- .../selftests/bpf/prog_tests/linked_list.c | 740 ++++++++++ .../selftests/bpf/prog_tests/spin_lock.c | 136 ++ .../selftests/bpf/prog_tests/spinlock.c | 45 - .../testing/selftests/bpf/progs/linked_list.c | 370 +++++ .../testing/selftests/bpf/progs/linked_list.h | 56 + .../selftests/bpf/progs/linked_list_fail.c | 581 ++++++++ .../selftests/bpf/progs/test_spin_lock.c | 4 +- .../selftests/bpf/progs/test_spin_lock_fail.c | 204 +++ tools/testing/selftests/bpf/verifier/calls.c | 2 +- .../selftests/bpf/verifier/ref_tracking.c | 4 +- 25 files changed, 3907 insertions(+), 568 deletions(-) create mode 100644 tools/testing/selftests/bpf/bpf_experimental.h create mode 100644 tools/testing/selftests/bpf/prog_tests/linked_list.c create mode 100644 tools/testing/selftests/bpf/prog_tests/spin_lock.c delete mode 100644 tools/testing/selftests/bpf/prog_tests/spinlock.c create mode 100644 tools/testing/selftests/bpf/progs/linked_list.c create mode 100644 tools/testing/selftests/bpf/progs/linked_list.h create mode 100644 tools/testing/selftests/bpf/progs/linked_list_fail.c create mode 100644 tools/testing/selftests/bpf/progs/test_spin_lock_fail.c
base-commit: 383f1a8df8faba88a3bafaddc02f59421bad6829
Signature · 1 line
2.38.1
Kumar Kartikeya Dwivedi
maintainerPATCH v8 1/22 bpf: Fix early return in map_check_btf
Instead of returning directly with -EOPNOTSUPP for the timer case, we need to free the btf_record before returning to userspace.
--- kernel/bpf/syscall.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/bpf/syscall.c +1 -1
@@ -1010,7 +1010,7 @@ static int map_check_btf(struct bpf_map *map, const struct btf *btf,if (map->map_type !=BPF_MAP_TYPE_HASH && map->map_type !=BPF_MAP_TYPE_LRU_HASH && map->map_type !=BPF_MAP_TYPE_ARRAY ) { -return -EOPNOTSUPP ; + ret = -EOPNOTSUPP ; goto free_map_tab; }break ;
Signature · 1 line
2.38.1
Kumar Kartikeya Dwivedi
maintainerPATCH v8 2/22 bpf: Do btf_record_free outside map_free callback
In reply to Kumar Kartikeya DwivediSince the commit being fixed, we now miss freeing btf_record for local storage maps which will have a btf_record populated in case they have bpf_spin_lock element.
This was missed because I made the choice of offloading the job to free kptr_off_tab (now btf_record) to the map_free callback when adding support for kptrs.
Revisiting the reason for this decision, there is the possibility that the btf_record gets used inside map_free callback (e.g. in case of maps embedding kptrs) to iterate over them and free them, hence doing it before the map_free callback would be leaking special field memory, and do invalid memory access. The btf_record keeps module references which is critical to ensure the dtor call made for referenced kptr is safe to do.
If doing it after map_free callback, the map area is already freed, so we cannot access bpf_map structure anymore.
To fix this and prevent such lapses in future, move bpf_map_free_record out of the map_free callback, and do it after map_free by remembering the btf_record pointer. There is no need to access bpf_map structure in that case, and we can avoid missing this case when support for new map types is added for other special fields.
Since a btf_record and its btf_field_offs are used together, for consistency delay freeing of field_offs as well. While not a problem right now, a lot of code assumes that either both record and field_offs are set or none at once.
--- kernel/bpf/arraymap.c | 1 - kernel/bpf/hashtab.c | 1 - kernel/bpf/map_in_map.c | 1 - kernel/bpf/syscall.c | 9 +++++---- 4 files changed, 5 insertions(+), 7 deletions(-)
kernel/bpf/arraymap.c +0 -1
@@ -430,7 +430,6 @@ static void array_map_free(struct bpf_map *map)for (i =0 ; i < array->map.max_entries; i++)bpf_obj_free_fields (map->record,array_map_elem_ptr (array, i)); } -bpf_map_free_record (map); }if (array->map.map_type ==BPF_MAP_TYPE_PERCPU_ARRAY )
kernel/bpf/hashtab.c +0 -1
@@ -1511,7 +1511,6 @@ static void htab_map_free(struct bpf_map *map)prealloc_destroy (htab); } -bpf_map_free_record (map);free_percpu (htab->extra_elems);bpf_map_area_free (htab->buckets);bpf_mem_alloc_destroy (&htab->pcpu_ma);
kernel/bpf/map_in_map.c +0 -1
@@ -78,7 +78,6 @@ struct bpf_map *bpf_map_meta_alloc(int inner_map_ufd)void bpf_map_meta_free (struct bpf_map *map_meta) { -bpf_map_free_record (map_meta);btf_put (map_meta->btf);kfree (map_meta); }
kernel/bpf/syscall.c +5 -4
@@ -659,14 +659,15 @@ void bpf_obj_free_fields(const struct btf_record *rec, void *obj)static void bpf_map_free_deferred (struct work_struct *work) { struct bpf_map *map = container_of(work, struct bpf_map, work); +struct btf_field_offs *foffs = map->field_offs; +struct btf_record *rec = map->record;security_bpf_map_free (map); -kfree (map->field_offs);bpf_map_release_memcg (map); -/* implementation dependent freeing, map_free callback also does -* bpf_map_free_record, if needed. -*/ +/* implementation dependent freeing */ map->ops->map_free (map); +kfree (foffs); +btf_record_free (rec); }static void bpf_map_put_uref (struct bpf_map *map)
Signature · 1 line
2.38.1
Kumar Kartikeya Dwivedi
maintainerPATCH v8 3/22 bpf: Do btf_record_free for outer maps
In reply to Kumar Kartikeya DwivediFirst of all, whenever btf_record_dup fails, we must free inner_map_meta that was allocated before.
Secondly, outer maps are a bit different than normal maps, since they don't have anything to free in the map values when being destructed. The inner_map_meta that holds a duplicated btf_record (from the inner map fd being used to parameterize the outer map) only exists to serve checks during verification, which is why we never populate field_offs in inner_map_meta. Hence, in this case, simply take ownership of the duplicated btf_record and free it in bpf_map_meta_free.
This fixes both sources of leaks (in case of errors) during inner map creation.
--- kernel/bpf/map_in_map.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
kernel/bpf/map_in_map.c +9 -1
@@ -52,13 +52,20 @@ struct bpf_map *bpf_map_meta_alloc(int inner_map_ufd) inner_map_meta->max_entries = inner_map->max_entries; inner_map_meta->record =btf_record_dup (inner_map->record);if (IS_ERR (inner_map_meta->record)) { +struct bpf_map *err_ptr =ERR_CAST (inner_map_meta->record);/* btf_record_dup returns NULL or valid pointer in case of * invalid/empty/valid, but ERR_PTR in case of errors. During * equality NULL or IS_ERR is equivalent. */ +kfree (inner_map_meta);fdput (f); -return ERR_CAST (inner_map_meta->record); +return err_ptr; } +/* It is critical that inner_map btf is set to inner_map_meta btf, as +* the duplicated btf_record's list_head btf_field structs have +* value_rec members which point into the btf_record populated for the +* map btf. +*/ if (inner_map->btf) {btf_get (inner_map->btf); inner_map_meta->btf = inner_map->btf;
@@ -78,6 +85,7 @@ struct bpf_map *bpf_map_meta_alloc(int inner_map_ufd)void bpf_map_meta_free (struct bpf_map *map_meta) { +btf_record_free (map_meta->record);btf_put (map_meta->btf);kfree (map_meta); }
Signature · 1 line
2.38.1
Kumar Kartikeya Dwivedi
maintainerPATCH v8 4/22 bpf: Populate field_offs for inner_map_meta
In reply to Kumar Kartikeya DwivediFar too much code simply assumes that both btf_record and btf_field_offs are set to valid pointers together, or both are unset. They go together hand in hand as btf_record describes the special fields and btf_field_offs is compact representation for runtime copying/zeroing.
It is very difficult to make this clear in the code when the only exception to this universal invariant is inner_map_meta which is used as reg->map_ptr in the verifier. This is simply a bug waiting to happen, as in verifier context we cannot easily distinguish if PTR_TO_MAP_VALUE is coming from an inner map, and if we ever end up using field_offs for any reason in the future, we will silently ignore the special fields for inner map case (as NULL is not an error but unset field_offs).
Hence, simply copy field_offs from inner map together with btf_record.
While at it, refactor code to unwind properly on errors with gotos.
--- kernel/bpf/map_in_map.c | 46 ++++++++++++++++++++++++++++++----------- 1 file changed, 34 insertions(+), 12 deletions(-)
kernel/bpf/map_in_map.c +34 -12
@@ -12,6 +12,7 @@ struct bpf_map *bpf_map_meta_alloc(int inner_map_ufd)struct bpf_map *inner_map, *inner_map_meta;u32 inner_map_meta_size;struct fd f; +int ret; f =fdget (inner_map_ufd); inner_map =__bpf_map_get (f);
@@ -20,18 +21,18 @@ struct bpf_map *bpf_map_meta_alloc(int inner_map_ufd)/* Does not support >1 level map-in-map */ if (inner_map->inner_map_meta) { -fdput (f); -return ERR_PTR (-EINVAL ); + ret = -EINVAL ; + goto put; }if (!inner_map->ops->map_meta_equal) { -fdput (f); -return ERR_PTR (-ENOTSUPP ); + ret = -ENOTSUPP ; + goto put; }if (btf_record_has_field (inner_map->record,BPF_SPIN_LOCK )) { -fdput (f); -return ERR_PTR (-ENOTSUPP ); + ret = -ENOTSUPP ; + goto put; } inner_map_meta_size =sizeof (*inner_map_meta);
@@ -41,8 +42,8 @@ struct bpf_map *bpf_map_meta_alloc(int inner_map_ufd) inner_map_meta =kzalloc (inner_map_meta_size,GFP_USER );if (!inner_map_meta) { -fdput (f); -return ERR_PTR (-ENOMEM ); + ret = -ENOMEM ; + goto put; } inner_map_meta->map_type = inner_map->map_type;
@@ -50,17 +51,30 @@ 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->record =btf_record_dup (inner_map->record);if (IS_ERR (inner_map_meta->record)) { -struct bpf_map *err_ptr =ERR_CAST (inner_map_meta->record);/* btf_record_dup returns NULL or valid pointer in case of * invalid/empty/valid, but ERR_PTR in case of errors. During * equality NULL or IS_ERR is equivalent. */ -kfree (inner_map_meta); -fdput (f); -return err_ptr; + ret =PTR_ERR (inner_map_meta->record); + goto free; + } + +if (inner_map_meta->record) { +struct btf_field_offs *field_offs; +/* If btf_record is !IS_ERR_OR_NULL, then field_offs is always +* valid. +*/ + field_offs =kmemdup (inner_map->field_offs,sizeof (*inner_map->field_offs),GFP_KERNEL | __GFP_NOWARN); +if (!field_offs) { + ret = -ENOMEM ; + goto free_rec; + } + inner_map_meta->field_offs = field_offs; } +/* It is critical that inner_map btf is set to inner_map_meta btf, as * the duplicated btf_record's list_head btf_field structs have * value_rec members which point into the btf_record populated for the
@@ -81,10 +95,18 @@ struct bpf_map *bpf_map_meta_alloc(int inner_map_ufd)fdput (f);return inner_map_meta; +free_rec: +btf_record_free (inner_map_meta->record); +free: +kfree (inner_map_meta); +put: +fdput (f); +return ERR_PTR (ret); }void bpf_map_meta_free (struct bpf_map *map_meta) { +kfree (map_meta->field_offs);btf_record_free (map_meta->record);btf_put (map_meta->btf);kfree (map_meta);
Signature · 1 line
2.38.1
Kumar Kartikeya Dwivedi
maintainerPATCH v8 5/22 bpf: Introduce allocated objects support
In reply to Kumar Kartikeya DwivediIntroduce support for representing pointers to objects allocated by the BPF program, i.e. PTR_TO_BTF_ID that point to a type in program BTF. This is indicated by the presence of MEM_ALLOC type flag in reg->type to avoid having to check btf_is_kernel when trying to match argument types in helpers.
Whenever walking such types, any pointers being walked will always yield a SCALAR instead of pointer. In the future we might permit kptr inside such allocated objects (either kernel or program allocated), and it will then form a PTR_TO_BTF_ID of the respective type.
For now, such allocated objects will always be referenced in verifier context, hence ref_obj_id == 0 for them is a bug. It is allowed to write to such objects, as long fields that are special are not touched (support for which will be added in subsequent patches). Note that once such a pointer is marked PTR_UNTRUSTED, it is no longer allowed to write to it.
No PROBE_MEM handling is therefore done for loads into this type unless PTR_UNTRUSTED is part of the register type, since they can never be in an undefined state, and their lifetime will always be valid.
--- include/linux/bpf.h | 11 +++++++++++ kernel/bpf/btf.c | 5 +++++ kernel/bpf/verifier.c | 25 +++++++++++++++++++++++-- 3 files changed, 39 insertions(+), 2 deletions(-)
include/linux/bpf.h +11 -0
@@ -524,6 +524,11 @@ enum bpf_type_flag {/* Size is known at compile time. */ MEM_FIXED_SIZE =BIT (10 +BPF_BASE_TYPE_BITS ), +/* MEM is of an allocated object of type in program BTF. This is used to +* tag PTR_TO_BTF_ID allocated using bpf_obj_new. +*/ +MEM_ALLOC =BIT (11 +BPF_BASE_TYPE_BITS ), + __BPF_TYPE_FLAG_MAX, __BPF_TYPE_LAST_FLAG = __BPF_TYPE_FLAG_MAX - 1, };
@@ -2791,4 +2796,10 @@ struct bpf_key {bool has_ref; };#endif /* CONFIG_KEYS */ + +static inline bool type_is_alloc (u32 type) +{ +return type &MEM_ALLOC ; +} +#endif /* _LINUX_BPF_H */
kernel/bpf/btf.c +5 -0
@@ -6034,6 +6034,11 @@ int btf_struct_access(struct bpf_verifier_log *log,switch (err) {case WALK_PTR : +/* For local types, the destination register cannot +* become a pointer again. +*/ +if (type_is_alloc (reg->type)) +return SCALAR_VALUE ;/* If we found the pointer or scalar on t+off, * we're done. */
kernel/bpf/verifier.c +23 -2
@@ -4687,14 +4687,27 @@ static int check_ptr_to_btf_access(struct bpf_verifier_env *env,return -EACCES ; } -if (env->ops->btf_struct_access) { +if (env->ops->btf_struct_access && !type_is_alloc (reg->type)) { +if (!btf_is_kernel (reg->btf)) { +verbose (env,"verifier internal error: reg->btf must be kernel btf\n" ); +return -EFAULT ; + } ret = env->ops->btf_struct_access (&env->log, reg, off, size, atype, &btf_id, &flag); }else { -if (atype !=BPF_READ ) { +/* Writes are permitted with default btf_struct_access for +* program allocated objects (which always have ref_obj_id > 0), +* but not for untrusted PTR_TO_BTF_ID | MEM_ALLOC. +*/ +if (atype !=BPF_READ && reg->type != (PTR_TO_BTF_ID |MEM_ALLOC )) {verbose (env,"only read is supported\n" );return -EACCES ; } +if (type_is_alloc (reg->type) && !reg->ref_obj_id) { +verbose (env,"verifier internal error: ref_obj_id for allocated object must be non-zero\n" ); +return -EFAULT ; + } + ret =btf_struct_access (&env->log, reg, off, size, atype, &btf_id, &flag); }
@@ -5973,6 +5986,7 @@ int check_func_arg_reg_off(struct bpf_verifier_env *env,* fixed offset. */ case PTR_TO_BTF_ID : +case PTR_TO_BTF_ID |MEM_ALLOC :/* When referenced PTR_TO_BTF_ID is passed to release function, * it's fixed offset must be 0. In the other cases, fixed offset * can be non-zero.
@@ -13690,6 +13704,13 @@ static int convert_ctx_accesses(struct bpf_verifier_env *env)break ;case PTR_TO_BTF_ID :case PTR_TO_BTF_ID |PTR_UNTRUSTED : +/* PTR_TO_BTF_ID | MEM_ALLOC always has a valid lifetime, unlike +* PTR_TO_BTF_ID, and an active ref_obj_id, but the same cannot +* be said once it is marked PTR_UNTRUSTED, hence we must handle +* any faults for loads into such types. BPF_WRITE is disallowed +* for this case. +*/ +case PTR_TO_BTF_ID |MEM_ALLOC |PTR_UNTRUSTED :if (type ==BPF_READ ) { insn->code =BPF_LDX |BPF_PROBE_MEM |BPF_SIZE ((insn)->code);
Signature · 1 line
2.38.1
Kumar Kartikeya Dwivedi
maintainerPATCH v8 6/22 bpf: Recognize lock and list fields in allocated objects
In reply to Kumar Kartikeya DwivediAllow specifying bpf_spin_lock, bpf_list_head, bpf_list_node fields in a allocated object.
Also update btf_struct_access to reject direct access to these special fields.
A bpf_list_head allows implementing map-in-map style use cases, where an allocated object with bpf_list_head is linked into a list in a map value. This would require embedding a bpf_list_node, support for which is also included. The bpf_spin_lock is used to protect the bpf_list_head and other data.
While we strictly don't require to hold a bpf_spin_lock while touching the bpf_list_head in such objects, as when have access to it, we have complete ownership of the object, the locking constraint is still kept and may be conditionally lifted in the future.
Note that the specification of such types can be done just like map values, e.g.:
struct bar {
struct bpf_list_node node;
};struct foo {
struct bpf_spin_lock lock;
struct bpf_list_head head __contains(bar, node);
struct bpf_list_node node;
};struct map_value {
struct bpf_spin_lock lock;
struct bpf_list_head head __contains(foo, node);
};To recognize such types in user BTF, we build a btf_struct_metas array of metadata items corresponding to each BTF ID. This is done once during the btf_parse stage to avoid having to do it each time during the verification process's requirement to inspect the metadata.
Moreover, the computed metadata needs to be passed to some helpers in future patches which requires allocating them and storing them in the BTF that is pinned by the program itself, so that valid access can be assumed to such data during program runtime.
A key thing to note is that once a btf_struct_meta is available for a type, both the btf_record and btf_field_offs should be available. It is critical that btf_field_offs is available in case special fields are present, as we extensively rely on special fields being zeroed out in map values and allocated objects in later patches. The code ensures that by bailing out in case of errors and ensuring both are available together. If the record is not available, the special fields won't be recognized, so not having both is also fine (in terms of being a verification error and not a runtime bug).
--- include/linux/bpf.h | 7 ++ include/linux/btf.h | 35 ++++++++ kernel/bpf/btf.c | 197 +++++++++++++++++++++++++++++++++++++++---- kernel/bpf/syscall.c | 4 + 4 files changed, 225 insertions(+), 18 deletions(-)
include/linux/bpf.h +7 -0
@@ -176,6 +176,7 @@ enum btf_field_type {BPF_KPTR_REF = (1 <<3 ),BPF_KPTR =BPF_KPTR_UNREF |BPF_KPTR_REF ,BPF_LIST_HEAD = (1 <<4 ), + BPF_LIST_NODE = (1 << 5), }; struct btf_field_kptr {
@@ -276,6 +277,8 @@ static inline const char *btf_field_type_name(enum btf_field_type type)return "kptr" ;case BPF_LIST_HEAD :return "bpf_list_head" ; +case BPF_LIST_NODE : +return "bpf_list_node" ;default :WARN_ON_ONCE (1 );return "unknown" ;
@@ -294,6 +297,8 @@ static inline u32 btf_field_type_size(enum btf_field_type type)return sizeof (u64);case BPF_LIST_HEAD :return sizeof (struct bpf_list_head ); +case BPF_LIST_NODE : +return sizeof (struct bpf_list_node );default :WARN_ON_ONCE (1 );return 0 ;
@@ -312,6 +317,8 @@ static inline u32 btf_field_type_align(enum btf_field_type type)return __alignof__(u64 );case BPF_LIST_HEAD :return __alignof__(struct bpf_list_head ); +case BPF_LIST_NODE : +return __alignof__(struct bpf_list_node );default :WARN_ON_ONCE (1 );return 0 ;
include/linux/btf.h +35 -0
@@ -6,6 +6,8 @@#include <linux/types.h> #include <linux/bpfptr.h> +#include <linux/bsearch.h> +#include <linux/btf_ids.h> #include <uapi/linux/btf.h> #include <uapi/linux/bpf.h>
@@ -78,6 +80,17 @@ struct btf_id_dtor_kfunc {u32 kfunc_btf_id; }; +struct btf_struct_meta { +u32 btf_id; +struct btf_record *record; +struct btf_field_offs *field_offs; +}; + +struct btf_struct_metas { +u32 cnt; +struct btf_struct_meta types[]; +}; +typedef void (*btf_dtor_kfunc_t )(void *);extern const struct file_operations btf_fops;
@@ -408,6 +421,23 @@ static inline struct btf_param *btf_params(const struct btf_type *t)return (struct btf_param *)(t +1 ); } +static inline int btf_id_cmp_func (const void *a,const void *b) +{ +const int *pa = a, *pb = b; + +return *pa - *pb; +} + +static inline bool btf_id_set_contains (const struct btf_id_set *set,u32 id) +{ +return bsearch (&id, set->ids, set->cnt,sizeof (u32), btf_id_cmp_func) !=NULL ; +} + +static inline void *btf_id_set8_contains (const struct btf_id_set8 *set,u32 id) +{ +return bsearch (&id, set->pairs, set->cnt,sizeof (set->pairs[0 ]), btf_id_cmp_func); +} +#ifdef CONFIG_BPF_SYSCALL struct bpf_prog ;
@@ -423,6 +453,7 @@ int register_btf_kfunc_id_set(enum bpf_prog_type prog_type,s32 btf_find_dtor_kfunc (struct btf *btf,u32 btf_id);int register_btf_id_dtor_kfuncs (const struct btf_id_dtor_kfunc *dtors,u32 add_cnt,struct module *owner); +struct btf_struct_meta *btf_find_struct_meta (const struct btf *btf,u32 btf_id);#else static inline const struct btf_type *btf_type_by_id (const struct btf *btf,u32 type_id)
@@ -454,6 +485,10 @@ static inline int register_btf_id_dtor_kfuncs(const struct btf_id_dtor_kfunc *dt {return 0 ; } +static inline struct btf_struct_meta *btf_find_struct_meta (const struct btf *btf,u32 btf_id) +{ +return NULL ; +}#endif static inline bool btf_type_is_struct_ptr (struct btf *btf,const struct btf_type *t)
kernel/bpf/btf.c +179 -18
273 lines not on this page · raw message
kernel/bpf/syscall.c +4 -0
@@ -537,6 +537,7 @@ void btf_record_free(struct btf_record *rec)btf_put (rec->fields[i].kptr.btf);break ;case BPF_LIST_HEAD : +case BPF_LIST_NODE :/* Nothing to release for bpf_list_head */ break ;default :
@@ -582,6 +583,7 @@ struct btf_record *btf_record_dup(const struct btf_record *rec) }break ;case BPF_LIST_HEAD : +case BPF_LIST_NODE :/* Nothing to acquire for bpf_list_head */ break ;default :
@@ -648,6 +650,8 @@ void bpf_obj_free_fields(const struct btf_record *rec, void *obj)continue ;bpf_list_head_free (field, field_ptr, obj + rec->spin_lock_off);break ; +case BPF_LIST_NODE : +break ;default :WARN_ON_ONCE (1 );continue ;
Signature · 1 line
2.38.1
Kumar Kartikeya Dwivedi
maintainerPATCH v8 7/22 bpf: Verify ownership relationships for user BTF types
In reply to Kumar Kartikeya DwivediEnsure that there can be no ownership cycles among different types by way of having owning objects that can hold some other type as their element. For instance, a map value can only hold allocated objects, but these are allowed to have another bpf_list_head. To prevent unbounded recursion while freeing resources, elements of bpf_list_head in local kptrs can never have a bpf_list_head which are part of list in a map value. Later patches will verify this by having dedicated BTF selftests.
Also, to make runtime destruction easier, once btf_struct_metas is fully populated, we can stash the metadata of the value type directly in the metadata of the list_head fields, as that allows easier access to the value type's layout to destruct it at runtime from the btf_field entry of the list head itself.
--- include/linux/bpf.h | 1 + include/linux/btf.h | 1 + kernel/bpf/btf.c | 71 ++++++++++++++++++++++++++++++++++++++++++++ kernel/bpf/syscall.c | 4 +++ 4 files changed, 77 insertions(+)
include/linux/bpf.h +1 -0
@@ -190,6 +190,7 @@ struct btf_field_list_head {struct btf *btf;u32 value_btf_id;u32 node_offset; +struct btf_record *value_rec; };struct btf_field {
include/linux/btf.h +1 -0
@@ -178,6 +178,7 @@ int btf_find_spin_lock(const struct btf *btf, const struct btf_type *t);int btf_find_timer (const struct btf *btf,const struct btf_type *t);struct btf_record *btf_parse_fields (const struct btf *btf,const struct btf_type *t,u32 field_mask,u32 value_size); +int btf_check_and_fixup_fields (const struct btf *btf,struct btf_record *rec);struct btf_field_offs *btf_parse_field_offs (struct btf_record *rec);bool btf_type_is_void (const struct btf_type *t);s32 btf_find_by_name_kind (const struct btf *btf,const char *name,u8 kind);
kernel/bpf/btf.c +71 -0
83 lines not on this page · raw message
kernel/bpf/syscall.c +4 -0
@@ -1045,6 +1045,10 @@ static int map_check_btf(struct bpf_map *map, const struct btf *btf, } } + ret =btf_check_and_fixup_fields (btf, map->record); +if (ret <0 ) + goto free_map_tab; +if (map->ops->map_check_btf) { ret = map->ops->map_check_btf (map, btf, key_type, value_type);if (ret <0 )
Signature · 1 line
2.38.1
Kumar Kartikeya Dwivedi
maintainerPATCH v8 8/22 bpf: Allow locking bpf_spin_lock in allocated objects
In reply to Kumar Kartikeya DwivediAllow locking a bpf_spin_lock in an allocated object, in addition to already supported map value pointers. The handling is similar to that of map values, by just preserving the reg->id of PTR_TO_BTF_ID | MEM_ALLOC as well, and adjusting process_spin_lock to work with them and remember the id in verifier state.
Refactor the existing process_spin_lock to work with PTR_TO_BTF_ID | MEM_ALLOC in addition to PTR_TO_MAP_VALUE. We need to update the reg_may_point_to_spin_lock which is used in mark_ptr_or_null_reg to preserve reg->id, that will be used in env->cur_state->active_spin_lock to remember the currently held spin lock.
Also update the comment describing bpf_spin_lock implementation details to also talk about PTR_TO_BTF_ID | MEM_ALLOC type.
--- kernel/bpf/helpers.c | 2 + kernel/bpf/verifier.c | 89 +++++++++++++++++++++++++++++++------------ 2 files changed, 66 insertions(+), 25 deletions(-)
kernel/bpf/helpers.c +2 -0
@@ -336,6 +336,7 @@ const struct bpf_func_proto bpf_spin_lock_proto = { .gpl_only = false, .ret_type = RET_VOID, .arg1_type = ARG_PTR_TO_SPIN_LOCK, + .arg1_btf_id = BPF_PTR_POISON, };static inline void __bpf_spin_unlock_irqrestore (struct bpf_spin_lock *lock)
@@ -358,6 +359,7 @@ const struct bpf_func_proto bpf_spin_unlock_proto = { .gpl_only = false, .ret_type = RET_VOID, .arg1_type = ARG_PTR_TO_SPIN_LOCK, + .arg1_btf_id = BPF_PTR_POISON, }; void copy_map_value_locked(struct bpf_map *map, void *dst, void *src,
kernel/bpf/verifier.c +64 -25
157 lines not on this page · raw message
Signature · 1 line
2.38.1
Kumar Kartikeya Dwivedi
maintainerPATCH v8 9/22 bpf: Allow locking bpf_spin_lock global variables
In reply to Kumar Kartikeya DwivediGlobal variables reside in maps accessible using direct_value_addr callbacks, so giving each load instruction's rewrite a unique reg->id disallows us from holding locks which are global.
The reason for preserving reg->id as a unique value for registers that may point to spin lock is that two separate lookups are treated as two separate memory regions, and any possible aliasing is ignored for the purposes of spin lock correctness.
This is not great especially for the global variable case, which are served from maps that have max_entries == 1, i.e. they always lead to map values pointing into the same map value.
So refactor the active_spin_lock into a 'active_lock' structure which represents the lock identity, and instead of the reg->id, remember two fields, a pointer and the reg->id. The pointer will store reg->map_ptr or reg->btf. It's only necessary to distinguish for the id == 0 case of global variables, but always setting the pointer to a non-NULL value and using the pointer to check whether the lock is held simplifies code in the verifier.
This is generic enough to allow it for global variables, map lookups, and allocated objects at the same time.
Note that while whether a lock is held can be answered by just comparing active_lock.ptr to NULL, to determine whether the register is pointing to the same held lock requires comparing _both_ ptr and id.
Finally, as a result of this refactoring, pseudo load instructions are not given a unique reg->id, as they are doing lookup for the same map value (max_entries is never greater than 1).
Essentially, we consider that the tuple of (ptr, id) will always be unique for any kind of argument to bpf_spin_{lock,unlock}.
Note that this can be extended in the future to also remember offset used for locking, so that we can introduce multiple bpf_spin_lock fields in the same allocation.
--- include/linux/bpf_verifier.h | 16 +++++++++++++- kernel/bpf/verifier.c | 41 ++++++++++++++++++++++++------------ 2 files changed, 43 insertions(+), 14 deletions(-)
include/linux/bpf_verifier.h +15 -1
@@ -323,7 +323,21 @@ struct bpf_verifier_state {u32 branches;u32 insn_idx;u32 curframe; -u32 active_spin_lock; +/* For every reg representing a map value of allocated object pointer, +* we consider the tuple of (ptr, id) for them to be unique in verifier +* context and conside them to not alias each other for the purposes of +* tracking lock state. +*/ +struct { +/* This can either be reg->map_ptr or reg->btf. If ptr is NULL, +* there's no active lock held, and other fields have no +* meaning. If non-NULL, it indicates that a lock is held and +* id member has the reg->id of the register which can be >= 0. +*/ +void *ptr; +/* This will be reg->id */ +u32 id; + } active_lock;bool speculative;/* first and last insn idx of this verifier state */
kernel/bpf/verifier.c +28 -13
100 lines not on this page · raw message
Signature · 1 line
2.38.1
Kumar Kartikeya Dwivedi
maintainerPATCH v8 10/22 bpf: Allow locking bpf_spin_lock in inner map values
In reply to Kumar Kartikeya DwivediThere is no need to restrict users from locking bpf_spin_lock in map values of inner maps. Each inner map lookup gets a unique reg->id assigned to the returned PTR_TO_MAP_VALUE which will be preserved after the NULL check. Distinct lookups into different inner map get unique IDs, and distinct lookups into same inner map also get unique IDs.
Hence, lift the restriction by removing the check return -ENOTSUPP in map_in_map.c. Later commits will add comprehensive test cases to ensure that invalid cases are rejected.
--- kernel/bpf/map_in_map.c | 5 ----- 1 file changed, 5 deletions(-)
kernel/bpf/map_in_map.c +0 -5
@@ -30,11 +30,6 @@ struct bpf_map *bpf_map_meta_alloc(int inner_map_ufd) goto put; } -if (btf_record_has_field (inner_map->record,BPF_SPIN_LOCK )) { - ret = -ENOTSUPP ; - goto put; - } - inner_map_meta_size =sizeof (*inner_map_meta);/* In some cases verifier needs to access beyond just base map. */ if (inner_map->ops == &array_map_ops)
Signature · 1 line
2.38.1
Kumar Kartikeya Dwivedi
maintainerPATCH v8 11/22 bpf: Rewrite kfunc argument handling
In reply to Kumar Kartikeya DwivediAs we continue to add more features, argument types, kfunc flags, and different extensions to kfuncs, the code to verify the correctness of the kfunc prototype wrt the passed in registers has become ad-hoc and ugly to read. To make life easier, and make a very clear split between different stages of argument processing, move all the code into verifier.c and refactor into easier to read helpers and functions.
This also makes sharing code within the verifier easier with kfunc argument processing. This will be more and more useful in later patches as we are now moving to implement very core BPF helpers as kfuncs, to keep them experimental before baking into UAPI.
Remove all kfunc related bits now from btf_check_func_arg_match, as users have been converted away to refactored kfunc argument handling.
--- include/linux/bpf.h | 11 - include/linux/bpf_verifier.h | 2 - include/linux/btf.h | 31 +- kernel/bpf/btf.c | 380 +----------- kernel/bpf/verifier.c | 545 +++++++++++++++++- .../bpf/prog_tests/kfunc_dynptr_param.c | 2 +- tools/testing/selftests/bpf/verifier/calls.c | 2 +- .../selftests/bpf/verifier/ref_tracking.c | 4 +- 8 files changed, 573 insertions(+), 404 deletions(-)
include/linux/bpf.h +0 -11
@@ -2108,22 +2108,11 @@ int btf_distill_func_proto(struct bpf_verifier_log *log,const char *func_name, struct btf_func_model *m); -struct bpf_kfunc_arg_meta { -u64 r0_size; -bool r0_rdonly; -int ref_obj_id; -u32 flags; -}; -struct bpf_reg_state ;int btf_check_subprog_arg_match (struct bpf_verifier_env *env,int subprog,struct bpf_reg_state *regs);int btf_check_subprog_call (struct bpf_verifier_env *env,int subprog,struct bpf_reg_state *regs); -int btf_check_kfunc_arg_match (struct bpf_verifier_env *env, -const struct btf *btf,u32 func_id, -struct bpf_reg_state *regs, -struct bpf_kfunc_arg_meta *meta);int btf_prepare_func_args (struct bpf_verifier_env *env,int subprog,struct bpf_reg_state *reg); int btf_check_type_match(struct bpf_verifier_log *log, const struct bpf_prog *prog,
include/linux/bpf_verifier.h +0 -2
@@ -603,8 +603,6 @@ int check_ptr_off_reg(struct bpf_verifier_env *env,int check_func_arg_reg_off (struct bpf_verifier_env *env,const struct bpf_reg_state *reg,int regno,enum bpf_arg_type arg_type); -int check_kfunc_mem_size_reg (struct bpf_verifier_env *env,struct bpf_reg_state *reg, -u32 regno);int check_mem_reg (struct bpf_verifier_env *env,struct bpf_reg_state *reg,u32 regno,u32 mem_size); bool is_dynptr_reg_valid_init(struct bpf_verifier_env *env,
include/linux/btf.h +30 -1
@@ -338,6 +338,16 @@ static inline bool btf_type_is_struct(const struct btf_type *t)return kind ==BTF_KIND_STRUCT || kind ==BTF_KIND_UNION ; } +static inline bool __btf_type_is_struct (const struct btf_type *t) +{ +return BTF_INFO_KIND (t->info) ==BTF_KIND_STRUCT ; +} + +static inline bool btf_type_is_array (const struct btf_type *t) +{ +return BTF_INFO_KIND (t->info) ==BTF_KIND_ARRAY ; +} +static inline u16 btf_type_vlen (const struct btf_type *t) {return BTF_INFO_VLEN (t->info);
@@ -439,9 +449,10 @@ static inline void *btf_id_set8_contains(const struct btf_id_set8 *set, u32 id)return bsearch (&id, set->pairs, set->cnt,sizeof (set->pairs[0 ]), btf_id_cmp_func); } -#ifdef CONFIG_BPF_SYSCALL struct bpf_prog ; +struct bpf_verifier_log ; +#ifdef CONFIG_BPF_SYSCALL const struct btf_type *btf_type_by_id (const struct btf *btf,u32 type_id);const char *btf_name_by_offset (const struct btf *btf,u32 offset);struct btf *btf_parse_vmlinux (void );
@@ -455,6 +466,12 @@ s32 btf_find_dtor_kfunc(struct btf *btf, u32 btf_id);int register_btf_id_dtor_kfuncs (const struct btf_id_dtor_kfunc *dtors,u32 add_cnt,struct module *owner);struct btf_struct_meta *btf_find_struct_meta (const struct btf *btf,u32 btf_id); +const struct btf_member * +btf_get_prog_ctx_type (struct bpf_verifier_log *log,const struct btf *btf, +const struct btf_type *t,enum bpf_prog_type prog_type, +int arg); +bool btf_types_are_same (const struct btf *btf1,u32 id1, +const struct btf *btf2,u32 id2);#else static inline const struct btf_type *btf_type_by_id (const struct btf *btf,u32 type_id)
@@ -490,6 +507,18 @@ static inline struct btf_struct_meta *btf_find_struct_meta(const struct btf *btf {return NULL ; } +static inline const struct btf_member * +btf_get_prog_ctx_type (struct bpf_verifier_log *log,const struct btf *btf, +const struct btf_type *t,enum bpf_prog_type prog_type, +int arg) +{ +return NULL ; +} +static inline bool btf_types_are_same (const struct btf *btf1,u32 id1, +const struct btf *btf2,u32 id2) +{ +return false; +}#endif static inline bool btf_type_is_struct_ptr (struct btf *btf,const struct btf_type *t)
kernel/bpf/btf.c +11 -369
481 lines not on this page · raw message
kernel/bpf/verifier.c +528 -17
606 lines not on this page · raw message
tools/testing/selftests/bpf/prog_tests/kfunc_dynptr_param.c +1 -1
@@ -22,7 +22,7 @@ static struct { "arg#0 pointer type STRUCT bpf_dynptr_kern points to unsupported dynamic pointer type", 0}, {"not_valid_dynptr" , "arg#0 pointer type STRUCT bpf_dynptr_kern must be valid and initialized", 0}, - {"not_ptr_to_stack", "arg#0 pointer type STRUCT bpf_dynptr_kern not to stack", 0}, + {"not_ptr_to_stack", "arg#0 expected pointer to stack", 0}, {"dynptr_data_null", NULL, -EBADMSG}, };
tools/testing/selftests/bpf/verifier/calls.c +1 -1
@@ -109,7 +109,7 @@ }, .prog_type = BPF_PROG_TYPE_SCHED_CLS, .result = REJECT, - .errstr = "arg#0 pointer type STRUCT prog_test_ref_kfunc must point", + .errstr = "arg#0 expected pointer to btf or socket", .fixup_kfunc_btf_id = { { "bpf_kfunc_call_test_acquire", 3 }, { "bpf_kfunc_call_test_release", 5 },
tools/testing/selftests/bpf/verifier/ref_tracking.c +2 -2
@@ -142,7 +142,7 @@ .kfunc = "bpf", .expected_attach_type = BPF_LSM_MAC, .flags = BPF_F_SLEEPABLE, - .errstr = "arg#0 pointer type STRUCT bpf_key must point to scalar, or struct with scalar", + .errstr = "arg#0 expected pointer to btf or socket", .fixup_kfunc_btf_id = { { "bpf_lookup_user_key", 2 }, { "bpf_key_put", 4 },
@@ -163,7 +163,7 @@ .kfunc = "bpf", .expected_attach_type = BPF_LSM_MAC, .flags = BPF_F_SLEEPABLE, - .errstr = "arg#0 pointer type STRUCT bpf_key must point to scalar, or struct with scalar", + .errstr = "arg#0 expected pointer to btf or socket", .fixup_kfunc_btf_id = { { "bpf_lookup_system_key", 1 }, { "bpf_key_put", 3 },
Signature · 1 line
2.38.1
Kumar Kartikeya Dwivedi
maintainerPATCH v8 12/22 bpf: Support constant scalar arguments for kfuncs
In reply to Kumar Kartikeya DwivediAllow passing known constant scalars as arguments to kfuncs that do not represent a size parameter. We use mark_chain_precision for the constant scalar argument to mark it precise. This makes the search pruning optimization of verifier more conservative for such kfunc calls, and each non-distinct argument is considered unequivalent.
We will use this support to then expose a bpf_obj_new function where it takes the local type ID of a type in program BTF, and returns a PTR_TO_BTF_ID | MEM_ALLOC to the local type, and allows programs to allocate their own objects.
Each type ID resolves to a distinct type with a possibly distinct size, hence the type ID constant matters in terms of program safety and its precision needs to be checked between old and cur states inside regsafe. The use of mark_chain_precision enables this.
--- Documentation/bpf/kfuncs.rst | 24 +++++++++++++++ kernel/bpf/verifier.c | 57 +++++++++++++++++++++++++++--------- 2 files changed, 67 insertions(+), 14 deletions(-)
Documentation/bpf/kfuncs.rst +24 -0
@@ -72,6 +72,30 @@ argument as its size. By default, without __sz annotation, the size of the type of the pointer is used. Without __sz annotation, a kfunc cannot accept a void pointer. +2.2.2 __k Annotation +-------------------- + +This annotation is only understood for scalar arguments, where it indicates that +the verifier must check the scalar argument to be a known constant, which does +not indicate a size parameter, and the value of the constant is relevant to the +safety of the program. + +An example is given below:: + + void *bpf_obj_new(u32 local_type_id__k, ...) + { + ... + } + +Here, bpf_obj_new uses local_type_id argument to find out the size of that type +ID in program's BTF and return a sized pointer to it. Each type ID will have a +distinct size, hence it is crucial to treat each such call as distinct when +values don't match during verifier state pruning checks. + +Hence, whenever a constant scalar argument is accepted by a kfunc which is not a +size parameter, and the value of the constant matters for program safety, __k +suffix should be used. + .. _BPF_kfunc_nodef: 2.3 Using an existing kernel function
kernel/bpf/verifier.c +43 -14
86 lines not on this page · raw message
Signature · 1 line
2.38.1
Kumar Kartikeya Dwivedi
maintainerPATCH v8 13/22 bpf: Introduce bpf_obj_new
In reply to Kumar Kartikeya DwivediIntroduce type safe memory allocator bpf_obj_new for BPF programs. The kernel side kfunc is named bpf_obj_new_impl, as passing hidden arguments to kfuncs still requires having them in prototype, unlike BPF helpers which always take 5 arguments and have them checked using bpf_func_proto in verifier, ignoring unset argument types.
Introduce __ign suffix to ignore a specific kfunc argument during type checks, then use this to introduce support for passing type metadata to the bpf_obj_new_impl kfunc.
The user passes BTF ID of the type it wants to allocates in program BTF, the verifier then rewrites the first argument as the size of this type, after performing some sanity checks (to ensure it exists and it is a struct type).
The second argument is also fixed up and passed by the verifier. This is the btf_struct_meta for the type being allocated. It would be needed mostly for the offset array which is required for zero initializing special fields while leaving the rest of storage in unitialized state.
It would also be needed in the next patch to perform proper destruction of the object's special fields.
Under the hood, bpf_obj_new will call bpf_mem_alloc and bpf_mem_free, using the any context BPF memory allocator introduced recently. To this end, a global instance of the BPF memory allocator is initialized on boot to be used for this purpose. This 'bpf_global_ma' serves all allocations for bpf_obj_new. In the future, bpf_obj_new variants will allow specifying a custom allocator.
Note that now that bpf_obj_new can be used to allocate objects that can be linked to BPF linked list (when future linked list helpers are available), we need to also free the elements using bpf_mem_free. However, since the draining of elements is done outside the bpf_spin_lock, we need to do migrate_disable around the call since bpf_list_head_free can be called from map free path where migration is enabled. Otherwise, when called from BPF programs migration is already disabled.
A convenience macro is included in the bpf_experimental.h header to hide over the ugly details of the implementation, leading to user code looking similar to a language level extension which allocates and constructs fields of a user type.
struct bar {
struct bpf_list_node node;
};struct foo {
struct bpf_spin_lock lock;
struct bpf_list_head head __contains(bar, node);
};void prog(void) {
struct foo *f;
f = bpf_obj_new(typeof(*f));
if (!f)
return;
...
}A key piece of this story is still missing, i.e. the free function, which will come in the next patch.
--- include/linux/bpf.h | 21 ++-- include/linux/bpf_verifier.h | 2 + kernel/bpf/core.c | 16 +++ kernel/bpf/helpers.c | 47 ++++++-- kernel/bpf/verifier.c | 102 ++++++++++++++++-- .../testing/selftests/bpf/bpf_experimental.h | 25 +++++ 6 files changed, 190 insertions(+), 23 deletions(-) create mode 100644 tools/testing/selftests/bpf/bpf_experimental.h
include/linux/bpf.h +13 -8
@@ -54,6 +54,8 @@ struct cgroup;extern struct idr btf_idr;extern spinlock_t btf_idr_lock;extern struct kobject *btf_kobj; +extern struct bpf_mem_alloc bpf_global_ma; +extern bool bpf_global_ma_set;typedef u64 (*bpf_callback_t )(u64 ,u64 ,u64 ,u64 ,u64 ); typedef int (*bpf_iter_init_seq_priv_t)(void *private_data,
@@ -333,16 +335,19 @@ static inline bool btf_record_has_field(const struct btf_record *rec, enum btf_freturn rec->field_mask & type; } -static inline void check_and_init_map_value (struct bpf_map *map,void *dst) +static inline void bpf_obj_init (const struct btf_field_offs *foffs,void *obj) { -if (!IS_ERR_OR_NULL (map->record)) { -struct btf_field *fields = map->record->fields; -u32 cnt = map->record->cnt; -int i; +int i; -for (i =0 ; i < cnt; i++) -memset (dst + fields[i].offset,0 ,btf_field_type_size (fields[i].type)); - } +if (!foffs) +return ; +for (i =0 ; i < foffs->cnt; i++) +memset (obj + foffs->field_off[i],0 , foffs->field_sz[i]); +} + +static inline void check_and_init_map_value (struct bpf_map *map,void *dst) +{ +bpf_obj_init (map->field_offs, dst); }/* memcpy that is used with 8-byte aligned pointers, power-of-8 size and
include/linux/bpf_verifier.h +2 -0
@@ -433,6 +433,8 @@ struct bpf_insn_aux_data {*/ struct bpf_loop_inline_state loop_inline_state; }; +u64 obj_new_size;/* remember the size of type passed to bpf_obj_new to rewrite R1 */ +struct btf_struct_meta *kptr_struct_meta;u64 map_key_state;/* constant (32 bit) key tracking for maps */ int ctx_field_size;/* the ctx field size for load insn, maybe 0 */ u32 seen;/* this insn was processed by the verifier at env->pass_cnt */
kernel/bpf/core.c +16 -0
@@ -34,6 +34,7 @@#include <linux/log2.h> #include <linux/bpf_verifier.h> #include <linux/nodemask.h> +#include <linux/bpf_mem_alloc.h> #include <asm/barrier.h> #include <asm/unaligned.h>
@@ -60,6 +61,9 @@#define CTX regs[BPF_REG_CTX]#define IMM insn->imm +struct bpf_mem_alloc bpf_global_ma; +bool bpf_global_ma_set; +/* No hurry in this branch * * Exported for the bpf jit load helper.
@@ -2746,6 +2750,18 @@ int __weak bpf_arch_text_invalidate(void *dst, size_t len)return -ENOTSUPP ; } +#ifdef CONFIG_BPF_SYSCALL +static int __init bpf_global_ma_init (void ) +{ +int ret; + + ret =bpf_mem_alloc_init (&bpf_global_ma,0 , false); + bpf_global_ma_set = !ret; +return ret; +} +late_initcall (bpf_global_ma_init); +#endif +DEFINE_STATIC_KEY_FALSE (bpf_stats_enabled_key);EXPORT_SYMBOL (bpf_stats_enabled_key);
kernel/bpf/helpers.c +40 -7
71 lines not on this page · raw message
kernel/bpf/verifier.c +94 -8
160 lines not on this page · raw message
tools/testing/selftests/bpf/bpf_experimental.h new file +25 -0
@@ -0,0 +1,25 @@ +#ifndef __BPF_EXPERIMENTAL__ +#define __BPF_EXPERIMENTAL__ + +#include <vmlinux.h> +#include <bpf/bpf_tracing.h> +#include <bpf/bpf_helpers.h> +#include <bpf/bpf_core_read.h> + +/* Description +* Allocates an object of the type represented by 'local_type_id' in +* program BTF. User may use the bpf_core_type_id_local macro to pass the +* type ID of a struct in program BTF. +* +* The 'local_type_id' parameter must be a known constant. +* The 'meta' parameter is a hidden argument that is ignored. +* Returns +* A pointer to an object of the type corresponding to the passed in +* 'local_type_id', or NULL on failure. +*/ +extern void *bpf_obj_new_impl (__u64 local_type_id,void *meta) __ksym; + +/* Convenience macro to wrap over bpf_obj_new_impl */ +#define bpf_obj_new (type) ((type *)bpf_obj_new_impl(bpf_core_type_id_local(type), NULL)) + +#endif
Signature · 1 line
2.38.1
Kumar Kartikeya Dwivedi
maintainerPATCH v8 14/22 bpf: Introduce bpf_obj_drop
In reply to Kumar Kartikeya DwivediIntroduce bpf_obj_drop, which is the kfunc used to free allocated objects (allocated using bpf_obj_new). Pairing with bpf_obj_new, it implicitly destructs the fields part of object automatically without user intervention.
Just like the previous patch, btf_struct_meta that is needed to free up the special fields is passed as a hidden argument to the kfunc.
For the user, a convenience macro hides over the kernel side kfunc which is named bpf_obj_drop_impl.
Continuing the previous example:
void prog(void) {
struct foo *f;
f = bpf_obj_new(typeof(*f));
if (!f)
return;
bpf_obj_drop(f);
}--- kernel/bpf/helpers.c | 11 ++++ kernel/bpf/verifier.c | 66 +++++++++++++++---- .../testing/selftests/bpf/bpf_experimental.h | 13 ++++ 3 files changed, 79 insertions(+), 11 deletions(-)
kernel/bpf/helpers.c +11 -0
@@ -1770,6 +1770,16 @@ void *bpf_obj_new_impl(u64 local_type_id__k, void *meta__ign)return p; } +void bpf_obj_drop_impl (void *p__alloc,void *meta__ign) +{ +struct btf_struct_meta *meta = meta__ign; +void *p = p__alloc; + +if (meta) +bpf_obj_free_fields (meta->record, p); +bpf_mem_free (&bpf_global_ma, p); +} +__diag_pop ();BTF_SET8_START (generic_btf_ids)
@@ -1777,6 +1787,7 @@ BTF_SET8_START(generic_btf_ids) BTF_ID_FLAGS(func, crash_kexec, KF_DESTRUCTIVE)#endif BTF_ID_FLAGS(func, bpf_obj_new_impl, KF_ACQUIRE | KF_RET_NULL) +BTF_ID_FLAGS(func, bpf_obj_drop_impl, KF_RELEASE)BTF_SET8_END (generic_btf_ids) static const struct btf_kfunc_id_set generic_kfunc_set = {
kernel/bpf/verifier.c +55 -11
126 lines not on this page · raw message
tools/testing/selftests/bpf/bpf_experimental.h +13 -0
@@ -22,4 +22,17 @@ extern void *bpf_obj_new_impl(__u64 local_type_id, void *meta) __ksym;/* Convenience macro to wrap over bpf_obj_new_impl */ #define bpf_obj_new (type) ((type *)bpf_obj_new_impl(bpf_core_type_id_local(type), NULL)) +/* Description +* Free an allocated object. All fields of the object that require +* destruction will be destructed before the storage is freed. +* +* The 'meta' parameter is a hidden argument that is ignored. +* Returns +* Void. +*/ +extern void bpf_obj_drop_impl(void *kptr, void *meta) __ksym; + +/* Convenience macro to wrap over bpf_obj_drop_impl */ +#define bpf_obj_drop (kptr) bpf_obj_drop_impl(kptr, NULL) +#endif
Signature · 1 line
2.38.1
Kumar Kartikeya Dwivedi
maintainerPATCH v8 15/22 bpf: Permit NULL checking pointer with non-zero fixed offset
In reply to Kumar Kartikeya DwivediPointer increment on seeing PTR_MAYBE_NULL is already protected against, hence make an exception for PTR_TO_BTF_ID | MEM_ALLOC while still keeping the warning for other unintended cases that might creep in.
bpf_list_pop_{front,_back} helpers planned to be introduced in next commit will return a MEM_ALLOC register with incremented offset pointing to bpf_list_node field. The user is supposed to then obtain the pointer to the entry using container_of after NULL checking it. The current restrictions trigger a warning when doing the NULL checking. Revisiting the reason, it is meant as an assertion which seems to actually work and catch the bad case.
Hence, under no other circumstances can reg->off be non-zero for a register that has the PTR_MAYBE_NULL type flag set.
--- kernel/bpf/verifier.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-)
kernel/bpf/verifier.c +12 -9
@@ -10790,16 +10790,19 @@ static void mark_ptr_or_null_reg(struct bpf_func_state *state, {if (type_may_be_null (reg->type) && reg->id == id && !WARN_ON_ONCE (!reg->id)) { -if (WARN_ON_ONCE (reg->smin_value || reg->smax_value || - !tnum_equals_const (reg->var_off,0 ) || - reg->off)) { -/* Old offset (both fixed and variable parts) should -* have been known-zero, because we don't allow pointer -* arithmetic on pointers that might be NULL. If we -* see this happening, don't convert the register. -*/ +/* Old offset (both fixed and variable parts) should have been +* known-zero, because we don't allow pointer arithmetic on +* pointers that might be NULL. If we see this happening, don't +* convert the register. +* +* But in some cases, some helpers that return local kptrs +* advance offset for the returned pointer. In those cases, it +* is fine to expect to see reg->off. +*/ +if (WARN_ON_ONCE (reg->smin_value || reg->smax_value || !tnum_equals_const (reg->var_off,0 ))) +return ; +if (reg->type != (PTR_TO_BTF_ID |MEM_ALLOC |PTR_MAYBE_NULL ) &&WARN_ON_ONCE (reg->off))return ; - }if (is_null) { reg->type =SCALAR_VALUE ;/* We don't need id and ref_obj_id from this point
Signature · 1 line
2.38.1
Kumar Kartikeya Dwivedi
maintainerPATCH v8 16/22 bpf: Introduce single ownership BPF linked list API
In reply to Kumar Kartikeya DwivediAdd a linked list API for use in BPF programs, where it expects protection from the bpf_spin_lock in the same allocation as the bpf_list_head. For now, only one bpf_spin_lock can be present hence that is assumed to be the one protecting the bpf_list_head.
The following functions are added to kick things off:
// Add node to beginning of list
void bpf_list_push_front(struct bpf_list_head *head, struct bpf_list_node *node);
// Add node to end of list
void bpf_list_push_back(struct bpf_list_head *head, struct bpf_list_node *node);
// Remove node at beginning of list and return it
struct bpf_list_node *bpf_list_pop_front(struct bpf_list_head *head);
// Remove node at end of list and return it
struct bpf_list_node *bpf_list_pop_back(struct bpf_list_head *head);
The lock protecting the bpf_list_head needs to be taken for all operations. The verifier ensures that the lock that needs to be taken is always held, and only the correct lock is taken for these operations. These checks are made statically by relying on the reg->id preserved for registers pointing into regions having both bpf_spin_lock and the objects protected by it. The comment over check_reg_allocation_locked in this change describes the logic in detail.
Note that bpf_list_push_front and bpf_list_push_back are meant to consume the object containing the node in the 1st argument, however that specific mechanism is intended to not release the ref_obj_id directly until the bpf_spin_unlock is called. In this commit, nothing is done, but the next commit will be introducing logic to handle this case, so it has been left as is for now.
bpf_list_pop_front and bpf_list_pop_back delete the first or last item of the list respectively, and return pointer to the element at the list_node offset. The user can then use container_of style macro to get the actual entry type. The verifier however statically knows the actual type, so the safety properties are still preserved.
With these additions, programs can now manage their own linked lists and store their objects in them.
--- kernel/bpf/helpers.c | 55 +++- kernel/bpf/verifier.c | 294 +++++++++++++++++- .../testing/selftests/bpf/bpf_experimental.h | 28 ++ 3 files changed, 368 insertions(+), 9 deletions(-)
kernel/bpf/helpers.c +54 -1
@@ -1780,6 +1780,50 @@ void bpf_obj_drop_impl(void *p__alloc, void *meta__ign)bpf_mem_free (&bpf_global_ma, p); } +static void __bpf_list_add (struct bpf_list_node *node,struct bpf_list_head *head,bool tail) +{ +struct list_head *n = (void *)node, *h = (void *)head; + +if (unlikely (!h->next)) +INIT_LIST_HEAD (h); +if (unlikely (!n->next)) +INIT_LIST_HEAD (n); + tail ?list_add_tail (n, h) :list_add (n, h); +} + +void bpf_list_push_front (struct bpf_list_head *head,struct bpf_list_node *node) +{ +return __bpf_list_add (node, head, false); +} + +void bpf_list_push_back (struct bpf_list_head *head,struct bpf_list_node *node) +{ +return __bpf_list_add (node, head, true); +} + +static struct bpf_list_node *__bpf_list_del (struct bpf_list_head *head,bool tail) +{ +struct list_head *n, *h = (void *)head; + +if (unlikely (!h->next)) +INIT_LIST_HEAD (h); +if (list_empty (h)) +return NULL ; + n = tail ? h->prev : h->next; +list_del_init (n); +return (struct bpf_list_node *)n; +} + +struct bpf_list_node *bpf_list_pop_front (struct bpf_list_head *head) +{ +return __bpf_list_del (head, false); +} + +struct bpf_list_node *bpf_list_pop_back (struct bpf_list_head *head) +{ +return __bpf_list_del (head, true); +} +__diag_pop ();BTF_SET8_START (generic_btf_ids)
@@ -1788,6 +1832,10 @@ BTF_ID_FLAGS(func, crash_kexec, KF_DESTRUCTIVE)#endif BTF_ID_FLAGS(func, bpf_obj_new_impl, KF_ACQUIRE | KF_RET_NULL) BTF_ID_FLAGS(func, bpf_obj_drop_impl, KF_RELEASE) +BTF_ID_FLAGS(func, bpf_list_push_front) +BTF_ID_FLAGS(func, bpf_list_push_back) +BTF_ID_FLAGS(func, bpf_list_pop_front, KF_ACQUIRE | KF_RET_NULL) +BTF_ID_FLAGS(func, bpf_list_pop_back, KF_ACQUIRE | KF_RET_NULL)BTF_SET8_END (generic_btf_ids) static const struct btf_kfunc_id_set generic_kfunc_set = {
@@ -1797,7 +1845,12 @@ static const struct btf_kfunc_id_set generic_kfunc_set = {static int __init kfunc_init (void ) { -return register_btf_kfunc_id_set (BPF_PROG_TYPE_TRACING , &generic_kfunc_set); +int ret; + + ret =register_btf_kfunc_id_set (BPF_PROG_TYPE_TRACING , &generic_kfunc_set); +if (ret) +return ret; +return register_btf_kfunc_id_set (BPF_PROG_TYPE_SCHED_CLS , &generic_kfunc_set); }late_initcall (kfunc_init);
kernel/bpf/verifier.c +286 -8
375 lines not on this page · raw message
tools/testing/selftests/bpf/bpf_experimental.h +28 -0
@@ -35,4 +35,32 @@ extern void bpf_obj_drop_impl(void *kptr, void *meta) __ksym;/* Convenience macro to wrap over bpf_obj_drop_impl */ #define bpf_obj_drop (kptr) bpf_obj_drop_impl(kptr, NULL) +/* Description +* Add a new entry to the beginning of the BPF linked list. +* Returns +* Void. +*/ +extern void bpf_list_push_front(struct bpf_list_head *head, struct bpf_list_node *node) __ksym; + +/* Description +* Add a new entry to the end of the BPF linked list. +* Returns +* Void. +*/ +extern void bpf_list_push_back(struct bpf_list_head *head, struct bpf_list_node *node) __ksym; + +/* Description +* Remove the entry at the beginning of the BPF linked list. +* Returns +* Pointer to bpf_list_node of deleted entry, or NULL if list is empty. +*/ +extern struct bpf_list_node *bpf_list_pop_front (struct bpf_list_head *head) __ksym; + +/* Description +* Remove the entry at the end of the BPF linked list. +* Returns +* Pointer to bpf_list_node of deleted entry, or NULL if list is empty. +*/ +extern struct bpf_list_node *bpf_list_pop_back (struct bpf_list_head *head) __ksym; +#endif
Signature · 1 line
2.38.1
Kumar Kartikeya Dwivedi
maintainerPATCH v8 17/22 bpf: Add 'release on unlock' logic for bpf_list_push_{front,back}
In reply to Kumar Kartikeya DwivediThis commit implements the delayed release logic for bpf_list_push_front and bpf_list_push_back.
Once a node has been added to the list, it's pointer changes to PTR_UNTRUSTED. However, it is only released once the lock protecting the list is unlocked. For such PTR_TO_BTF_ID | MEM_ALLOC with PTR_UNTRUSTED set but an active ref_obj_id, it is still permitted to read them as long as the lock is held. Writing to them is not allowed.
This allows having read access to push items we no longer own until we release the lock guarding the list, allowing a little more flexibility when working with these APIs.
Note that enabling write support has fairly tricky interactions with what happens inside the critical section. Just as an example, currently, bpf_obj_drop is not permitted, but if it were, being able to write to the PTR_UNTRUSTED pointer while the object gets released back to the memory allocator would violate safety properties we wish to guarantee (i.e. not crashing the kernel). The memory could be reused for a different type in the BPF program or even in the kernel as it gets eventually kfree'd.
Not enabling bpf_obj_drop inside the critical section would appear to prevent all of the above, but that is more of an artifical limitation right now. Since the write support is tangled with how we handle potential aliasing of nodes inside the critical section that may or may not be part of the list anymore, it has been deferred to a future patch.
--- include/linux/bpf_verifier.h | 5 ++++ kernel/bpf/verifier.c | 58 +++++++++++++++++++++++++++++++++++- 2 files changed, 62 insertions(+), 1 deletion(-)
include/linux/bpf_verifier.h +5 -0
@@ -223,6 +223,11 @@ struct bpf_reference_state {* exiting a callback function. */ int callback_ref; +/* Mark the reference state to release the registers sharing the same id +* on bpf_spin_unlock (for nodes that we will lose ownership to but are +* safe to access inside the critical section). +*/ +bool release_on_unlock; };/* state of the program:
kernel/bpf/verifier.c +57 -1
83 lines not on this page · raw message
Signature · 1 line
2.38.1
Kumar Kartikeya Dwivedi
maintainerPATCH v8 18/22 selftests/bpf: Add __contains macro to bpf_experimental.h
In reply to Kumar Kartikeya DwivediAdd user facing __contains macro which provides a convenient wrapper over the verbose kernel specific BTF declaration tag required to annotate BPF list head structs in user types.
--- tools/testing/selftests/bpf/bpf_experimental.h | 2 ++ 1 file changed, 2 insertions(+)
tools/testing/selftests/bpf/bpf_experimental.h +2 -0
@@ -6,6 +6,8 @@#include <bpf/bpf_helpers.h> #include <bpf/bpf_core_read.h> +#define __contains (name, node) __attribute__((btf_decl_tag("contains:" #name ":" #node))) +/* Description * Allocates an object of the type represented by 'local_type_id' in * program BTF. User may use the bpf_core_type_id_local macro to pass the
Signature · 1 line
2.38.1
Kumar Kartikeya Dwivedi
maintainerPATCH v8 19/22 selftests/bpf: Update spinlock selftest
In reply to Kumar Kartikeya DwivediMake updates in preparation for adding more test cases to this selftest:
- Convert from CHECK_ to ASSERT macros.
- Use BPF skeleton
- Fix typo sping -> spin
- Rename spinlock.c -> spin_lock.c
--- .../selftests/bpf/prog_tests/spin_lock.c | 49 +++++++++++++++++++ .../selftests/bpf/prog_tests/spinlock.c | 45 ----------------- .../selftests/bpf/progs/test_spin_lock.c | 4 +- 3 files changed, 51 insertions(+), 47 deletions(-) create mode 100644 tools/testing/selftests/bpf/prog_tests/spin_lock.c delete mode 100644 tools/testing/selftests/bpf/prog_tests/spinlock.c
tools/testing/selftests/bpf/prog_tests/spin_lock.c new file +49 -0
@@ -0,0 +1,49 @@ +// SPDX-License-Identifier: GPL-2.0 +#include <test_progs.h> +#include <network_helpers.h> + +#include "test_spin_lock.skel.h" + +static void *spin_lock_thread (void *arg) +{ +int err, prog_fd = *(u32 *) arg; +LIBBPF_OPTS (bpf_test_run_opts, topts, + .data_in = &pkt_v4, + .data_size_in = sizeof(pkt_v4), + .repeat = 10000, + ); + + err =bpf_prog_test_run_opts (prog_fd, &topts); +ASSERT_OK (err,"test_run" ); +ASSERT_OK (topts.retval,"test_run retval" ); +pthread_exit (arg); +} + +void test_spinlock (void ) +{ +struct test_spin_lock *skel; +pthread_t thread_id[4 ]; +int prog_fd, i; +void *ret; + + skel =test_spin_lock__open_and_load (); +if (!ASSERT_OK_PTR (skel,"test_spin_lock__open_and_load" )) +return ; + prog_fd =bpf_program__fd (skel->progs.bpf_spin_lock_test); +for (i =0 ; i <4 ; i++) { +int err; + + err =pthread_create (&thread_id[i],NULL , &spin_lock_thread, &prog_fd); +if (!ASSERT_OK (err,"pthread_create" )) + goto end; + } + +for (i =0 ; i <4 ; i++) { +if (!ASSERT_OK (pthread_join (thread_id[i], &ret),"pthread_join" )) + goto end; +if (!ASSERT_EQ (ret, &prog_fd,"ret == prog_fd" )) + goto end; + } +end: +test_spin_lock__destroy (skel); +}
tools/testing/selftests/bpf/prog_tests/spinlock.c deleted +0 -45
45 lines not on this page · raw message
tools/testing/selftests/bpf/progs/test_spin_lock.c +2 -2
@@ -45,8 +45,8 @@ struct {#define CREDIT_PER_NS (delta, rate) (((delta) * rate) >> 20) -SEC("tc") -int bpf_sping_lock_test (struct __sk_buff *skb) +SEC("cgroup_skb/ingress") +int bpf_spin_lock_test (struct __sk_buff *skb) {volatile int credit =0 , max_credit =100 , pkt_len =64 ;struct hmap_elem zero = {}, *val;
Signature · 1 line
2.38.1
Kumar Kartikeya Dwivedi
maintainerPATCH v8 20/22 selftests/bpf: Add failure test cases for spin lock pairing
In reply to Kumar Kartikeya DwivediFirst, ensure that whenever a bpf_spin_lock is present in an allocation, the reg->id is preserved. This won't be true for global variables however, since they have a single map value per map, hence the verifier harcodes it to 0 (so that multiple pseudo ldimm64 insns can yield the same lock object per map at a given offset).
Next, add test cases for all possible combinations (kptr, global, map value, inner map value). Since we lifted restriction on locking in inner maps, also add test cases for them. Currently, each lookup into an inner map gets a fresh reg->id, so even if the reg->map_ptr is same, they will be treated as separate allocations and the incorrect unlock pairing will be rejected.
--- .../selftests/bpf/prog_tests/spin_lock.c | 89 +++++++- .../selftests/bpf/progs/test_spin_lock_fail.c | 204 ++++++++++++++++++ 2 files changed, 292 insertions(+), 1 deletion(-) create mode 100644 tools/testing/selftests/bpf/progs/test_spin_lock_fail.c
tools/testing/selftests/bpf/prog_tests/spin_lock.c +88 -1
@@ -3,6 +3,79 @@#include <network_helpers.h> #include "test_spin_lock.skel.h" +#include "test_spin_lock_fail.skel.h" + +static char log_buf[1024 *1024 ]; + +static struct { +const char *prog_name; +const char *err_msg; +} spin_lock_fail_tests[] = { + {"lock_id_kptr_preserve" , +"5: (bf) r1 = r0 ; R0_w=ptr_foo(id=2,ref_obj_id=2,off=0,imm=0) " +"R1_w=ptr_foo(id=2,ref_obj_id=2,off=0,imm=0) refs=2\n6: (85) call bpf_this_cpu_ptr#154\n" +"R1 type=ptr_ expected=percpu_ptr_" }, + {"lock_id_global_zero" , +"; R1_w=map_value(off=0,ks=4,vs=4,imm=0)\n2: (85) call bpf_this_cpu_ptr#154\n" +"R1 type=map_value expected=percpu_ptr_" }, + {"lock_id_mapval_preserve" , +"8: (bf) r1 = r0 ; R0_w=map_value(id=1,off=0,ks=4,vs=8,imm=0) " +"R1_w=map_value(id=1,off=0,ks=4,vs=8,imm=0)\n9: (85) call bpf_this_cpu_ptr#154\n" +"R1 type=map_value expected=percpu_ptr_" }, + {"lock_id_innermapval_preserve" , +"13: (bf) r1 = r0 ; R0=map_value(id=2,off=0,ks=4,vs=8,imm=0) " +"R1_w=map_value(id=2,off=0,ks=4,vs=8,imm=0)\n14: (85) call bpf_this_cpu_ptr#154\n" +"R1 type=map_value expected=percpu_ptr_" }, + {"lock_id_mismatch_kptr_kptr" ,"bpf_spin_unlock of different lock" }, + {"lock_id_mismatch_kptr_global" ,"bpf_spin_unlock of different lock" }, + {"lock_id_mismatch_kptr_mapval" ,"bpf_spin_unlock of different lock" }, + {"lock_id_mismatch_kptr_innermapval" ,"bpf_spin_unlock of different lock" }, + {"lock_id_mismatch_global_global" ,"bpf_spin_unlock of different lock" }, + {"lock_id_mismatch_global_kptr" ,"bpf_spin_unlock of different lock" }, + {"lock_id_mismatch_global_mapval" ,"bpf_spin_unlock of different lock" }, + {"lock_id_mismatch_global_innermapval" ,"bpf_spin_unlock of different lock" }, + {"lock_id_mismatch_mapval_mapval" ,"bpf_spin_unlock of different lock" }, + {"lock_id_mismatch_mapval_kptr" ,"bpf_spin_unlock of different lock" }, + {"lock_id_mismatch_mapval_global" ,"bpf_spin_unlock of different lock" }, + {"lock_id_mismatch_mapval_innermapval" ,"bpf_spin_unlock of different lock" }, + {"lock_id_mismatch_innermapval_innermapval1" ,"bpf_spin_unlock of different lock" }, + {"lock_id_mismatch_innermapval_innermapval2" ,"bpf_spin_unlock of different lock" }, + {"lock_id_mismatch_innermapval_kptr" ,"bpf_spin_unlock of different lock" }, + {"lock_id_mismatch_innermapval_global" ,"bpf_spin_unlock of different lock" }, + {"lock_id_mismatch_innermapval_mapval" ,"bpf_spin_unlock of different lock" }, +}; + +static void test_spin_lock_fail_prog (const char *prog_name,const char *err_msg) +{ + LIBBPF_OPTS(bpf_object_open_opts, opts, .kernel_log_buf = log_buf, + .kernel_log_size = sizeof(log_buf), + .kernel_log_level = 1); +struct test_spin_lock_fail *skel; +struct bpf_program *prog; +int ret; + + skel =test_spin_lock_fail__open_opts (&opts); +if (!ASSERT_OK_PTR (skel,"test_spin_lock_fail__open_opts" )) +return ; + + prog =bpf_object__find_program_by_name (skel->obj, prog_name); +if (!ASSERT_OK_PTR (prog,"bpf_object__find_program_by_name" )) + goto end; + +bpf_program__set_autoload (prog, true); + + ret =test_spin_lock_fail__load (skel); +if (!ASSERT_ERR (ret,"test_spin_lock_fail__load must fail" )) + goto end; + +if (!ASSERT_OK_PTR (strstr (log_buf, err_msg),"expected error message" )) { +fprintf (stderr,"Expected: %s\n" , err_msg); +fprintf (stderr,"Verifier: %s\n" , log_buf); + } + +end: +test_spin_lock_fail__destroy (skel); +}static void *spin_lock_thread (void *arg) {
@@ -19,7 +92,7 @@ static void *spin_lock_thread(void *arg)pthread_exit (arg); } -void test_spinlock (void ) +void test_spin_lock_success (void ) {struct test_spin_lock *skel;pthread_t thread_id[4 ];
@@ -47,3 +120,17 @@ void test_spinlock(void) end:test_spin_lock__destroy (skel); } + +void test_spin_lock (void ) +{ +int i; + +test_spin_lock_success (); + +for (i =0 ; i <ARRAY_SIZE (spin_lock_fail_tests); i++) { +if (!test__start_subtest (spin_lock_fail_tests[i].prog_name)) +continue ; +test_spin_lock_fail_prog (spin_lock_fail_tests[i].prog_name, + spin_lock_fail_tests[i].err_msg); + } +}
tools/testing/selftests/bpf/progs/test_spin_lock_fail.c new file +204 -0
204 lines not on this page · raw message
Signature · 1 line
2.38.1
Kumar Kartikeya Dwivedi
maintainerPATCH v8 21/22 selftests/bpf: Add BPF linked list API tests
In reply to Kumar Kartikeya DwivediInclude various tests covering the success and failure cases. Also, run the success cases at runtime to verify correctness of linked list manipulation routines, in addition to ensuring successful verification.
--- tools/testing/selftests/bpf/DENYLIST.s390x | 1 + .../selftests/bpf/prog_tests/linked_list.c | 255 ++++++++ .../testing/selftests/bpf/progs/linked_list.c | 370 +++++++++++ .../testing/selftests/bpf/progs/linked_list.h | 56 ++ .../selftests/bpf/progs/linked_list_fail.c | 581 ++++++++++++++++++ 5 files changed, 1263 insertions(+) create mode 100644 tools/testing/selftests/bpf/prog_tests/linked_list.c create mode 100644 tools/testing/selftests/bpf/progs/linked_list.c create mode 100644 tools/testing/selftests/bpf/progs/linked_list.h create mode 100644 tools/testing/selftests/bpf/progs/linked_list_fail.c
tools/testing/selftests/bpf/DENYLIST.s390x +1 -0
@@ -33,6 +33,7 @@ ksyms_module # test_ksyms_module__open_and_load unex ksyms_module_libbpf # JIT does not support calling kernel function (kfunc) ksyms_module_lskel # test_ksyms_module_lskel__open_and_load unexpected error: -9 (?) libbpf_get_fd_by_id_opts # failed to attach: ERROR: strerror_r(-524)=22 (trampoline) +linked_list # JIT does not support calling kernel function (kfunc) lookup_key # JIT does not support calling kernel function (kfunc) lru_bug # prog 'printk': failed to auto-attach: -524 map_kptr # failed to open_and_load program: -524 (trampoline)
tools/testing/selftests/bpf/prog_tests/linked_list.c new file +255 -0
255 lines not on this page · raw message
tools/testing/selftests/bpf/progs/linked_list.c new file +370 -0
370 lines not on this page · raw message
tools/testing/selftests/bpf/progs/linked_list.h new file +56 -0
56 lines not on this page · raw message
tools/testing/selftests/bpf/progs/linked_list_fail.c new file +581 -0
581 lines not on this page · raw message
Signature · 1 line
2.38.1
Kumar Kartikeya Dwivedi
maintainerPATCH v8 22/22 selftests/bpf: Add BTF sanity tests
In reply to Kumar Kartikeya DwivediPreparing the metadata for bpf_list_head involves a complicated parsing step and type resolution for the contained value. Ensure that corner cases are tested against and invalid specifications in source are duly rejected. Also include tests for incorrect ownership relationships in the BTF.
--- .../selftests/bpf/prog_tests/linked_list.c | 485 ++++++++++++++++++ 1 file changed, 485 insertions(+)
tools/testing/selftests/bpf/prog_tests/linked_list.c +485 -0
@@ -1,4 +1,7 @@// SPDX-License-Identifier: GPL-2.0 +#include <bpf/btf.h> +#include <test_btf.h> +#include <linux/btf.h> #include <test_progs.h> #include <network_helpers.h>
@@ -235,6 +238,487 @@ static void test_linked_list_success(int mode, bool leave_in_map)linked_list__destroy (skel); } +#define SPIN_LOCK 2 +#define LIST_HEAD 3 +#define LIST_NODE 4 + +static struct btf *init_btf (void ) +{ +int id, lid, hid, nid; +struct btf *btf; + + btf =btf__new_empty (); +if (!ASSERT_OK_PTR (btf,"btf__new_empty" )) +return NULL ; + id =btf__add_int (btf,"int" ,4 ,BTF_INT_SIGNED ); +if (!ASSERT_EQ (id,1 ,"btf__add_int" )) + goto end; + lid =btf__add_struct (btf,"bpf_spin_lock" ,4 ); +if (!ASSERT_EQ (lid,SPIN_LOCK ,"btf__add_struct bpf_spin_lock" )) + goto end; + hid =btf__add_struct (btf,"bpf_list_head" ,16 ); +if (!ASSERT_EQ (hid,LIST_HEAD ,"btf__add_struct bpf_list_head" )) + goto end; + nid =btf__add_struct (btf,"bpf_list_node" ,16 ); +if (!ASSERT_EQ (nid,LIST_NODE ,"btf__add_struct bpf_list_node" )) + goto end; +return btf; +end: +btf__free (btf); +return NULL ; +} + +static void test_btf (void ) +{ +struct btf *btf =NULL ; +int id, err; + +while (test__start_subtest ("btf: too many locks" )) { + btf =init_btf (); +if (!ASSERT_OK_PTR (btf,"init_btf" )) +break ; + id =btf__add_struct (btf,"foo" ,24 ); +if (!ASSERT_EQ (id,5 ,"btf__add_struct foo" )) +break ; + err =btf__add_field (btf,"a" ,SPIN_LOCK ,0 ,0 ); +if (!ASSERT_OK (err,"btf__add_struct foo::a" )) +break ; + err =btf__add_field (btf,"b" ,SPIN_LOCK ,32 ,0 ); +if (!ASSERT_OK (err,"btf__add_struct foo::a" )) +break ; + err =btf__add_field (btf,"c" ,LIST_HEAD ,64 ,0 ); +if (!ASSERT_OK (err,"btf__add_struct foo::a" )) +break ; + + err =btf__load_into_kernel (btf); +ASSERT_EQ (err, -E2BIG ,"check btf" ); +btf__free (btf); +break ; + } + +while (test__start_subtest ("btf: missing lock" )) { + btf =init_btf (); +if (!ASSERT_OK_PTR (btf,"init_btf" )) +break ; + id =btf__add_struct (btf,"foo" ,16 ); +if (!ASSERT_EQ (id,5 ,"btf__add_struct foo" )) +break ; + err =btf__add_field (btf,"a" ,LIST_HEAD ,0 ,0 ); +if (!ASSERT_OK (err,"btf__add_struct foo::a" )) +break ; + id =btf__add_decl_tag (btf,"contains:baz:a" ,5 ,0 ); +if (!ASSERT_EQ (id,6 ,"btf__add_decl_tag contains:baz:a" )) +break ; + id =btf__add_struct (btf,"baz" ,16 ); +if (!ASSERT_EQ (id,7 ,"btf__add_struct baz" )) +break ; + err =btf__add_field (btf,"a" ,LIST_NODE ,0 ,0 ); +if (!ASSERT_OK (err,"btf__add_field baz::a" )) +break ; + + err =btf__load_into_kernel (btf); +ASSERT_EQ (err, -EINVAL ,"check btf" ); +btf__free (btf); +break ; + } + +while (test__start_subtest ("btf: bad offset" )) { + btf =init_btf (); +if (!ASSERT_OK_PTR (btf,"init_btf" )) +break ; + id =btf__add_struct (btf,"foo" ,36 ); +if (!ASSERT_EQ (id,5 ,"btf__add_struct foo" )) +break ; + err =btf__add_field (btf,"a" ,LIST_HEAD ,0 ,0 ); +if (!ASSERT_OK (err,"btf__add_field foo::a" )) +break ; + err =btf__add_field (btf,"b" ,LIST_NODE ,0 ,0 ); +if (!ASSERT_OK (err,"btf__add_field foo::b" )) +break ; + err =btf__add_field (btf,"c" ,SPIN_LOCK ,0 ,0 ); +if (!ASSERT_OK (err,"btf__add_field foo::c" )) +break ; + id =btf__add_decl_tag (btf,"contains:foo:b" ,5 ,0 ); +if (!ASSERT_EQ (id,6 ,"btf__add_decl_tag contains:foo:b" )) +break ; + + err =btf__load_into_kernel (btf); +ASSERT_EQ (err, -EEXIST ,"check btf" ); +btf__free (btf); +break ; + } + +while (test__start_subtest ("btf: missing contains:" )) { + btf =init_btf (); +if (!ASSERT_OK_PTR (btf,"init_btf" )) +break ; + id =btf__add_struct (btf,"foo" ,24 ); +if (!ASSERT_EQ (id,5 ,"btf__add_struct foo" )) +break ; + err =btf__add_field (btf,"a" ,SPIN_LOCK ,0 ,0 ); +if (!ASSERT_OK (err,"btf__add_field foo::a" )) +break ; + err =btf__add_field (btf,"b" ,LIST_HEAD ,64 ,0 ); +if (!ASSERT_OK (err,"btf__add_field foo::b" )) +break ; + + err =btf__load_into_kernel (btf); +ASSERT_EQ (err, -EINVAL ,"check btf" ); +btf__free (btf); +break ; + } + +while (test__start_subtest ("btf: missing struct" )) { + btf =init_btf (); +if (!ASSERT_OK_PTR (btf,"init_btf" )) +break ; + id =btf__add_struct (btf,"foo" ,24 ); +if (!ASSERT_EQ (id,5 ,"btf__add_struct foo" )) +break ; + err =btf__add_field (btf,"a" ,SPIN_LOCK ,0 ,0 ); +if (!ASSERT_OK (err,"btf__add_field foo::a" )) +break ; + err =btf__add_field (btf,"b" ,LIST_HEAD ,64 ,0 ); +if (!ASSERT_OK (err,"btf__add_field foo::b" )) +break ; + id =btf__add_decl_tag (btf,"contains:bar:bar" ,5 ,1 ); +if (!ASSERT_EQ (id,6 ,"btf__add_decl_tag contains:bar:bar" )) +break ; + + err =btf__load_into_kernel (btf); +ASSERT_EQ (err, -ENOENT ,"check btf" ); +btf__free (btf); +break ; + } + +while (test__start_subtest ("btf: missing node" )) { + btf =init_btf (); +if (!ASSERT_OK_PTR (btf,"init_btf" )) +break ; + id =btf__add_struct (btf,"foo" ,24 ); +if (!ASSERT_EQ (id,5 ,"btf__add_struct foo" )) +break ; + err =btf__add_field (btf,"a" ,SPIN_LOCK ,0 ,0 ); +if (!ASSERT_OK (err,"btf__add_field foo::a" )) +break ; + err =btf__add_field (btf,"b" ,LIST_HEAD ,64 ,0 ); +if (!ASSERT_OK (err,"btf__add_field foo::b" )) +break ; + id =btf__add_decl_tag (btf,"contains:foo:c" ,5 ,1 ); +if (!ASSERT_EQ (id,6 ,"btf__add_decl_tag contains:foo:c" )) +break ; + + err =btf__load_into_kernel (btf); +btf__free (btf); +ASSERT_EQ (err, -ENOENT ,"check btf" ); +break ; + } + +while (test__start_subtest ("btf: node incorrect type" )) { + btf =init_btf (); +if (!ASSERT_OK_PTR (btf,"init_btf" )) +break ; + id =btf__add_struct (btf,"foo" ,20 ); +if (!ASSERT_EQ (id,5 ,"btf__add_struct foo" )) +break ; + err =btf__add_field (btf,"a" ,LIST_HEAD ,0 ,0 ); +if (!ASSERT_OK (err,"btf__add_field foo::a" )) +break ; + err =btf__add_field (btf,"b" ,SPIN_LOCK ,128 ,0 ); +if (!ASSERT_OK (err,"btf__add_field foo::b" )) +break ; + id =btf__add_decl_tag (btf,"contains:bar:a" ,5 ,0 ); +if (!ASSERT_EQ (id,6 ,"btf__add_decl_tag contains:bar:a" )) +break ; + id =btf__add_struct (btf,"bar" ,4 ); +if (!ASSERT_EQ (id,7 ,"btf__add_struct bar" )) +break ; + err =btf__add_field (btf,"a" ,SPIN_LOCK ,0 ,0 ); +if (!ASSERT_OK (err,"btf__add_field bar::a" )) +break ; + + err =btf__load_into_kernel (btf); +ASSERT_EQ (err, -EINVAL ,"check btf" ); +btf__free (btf); +break ; + } + +while (test__start_subtest ("btf: multiple bpf_list_node with name b" )) { + btf =init_btf (); +if (!ASSERT_OK_PTR (btf,"init_btf" )) +break ; + id =btf__add_struct (btf,"foo" ,52 ); +if (!ASSERT_EQ (id,5 ,"btf__add_struct foo" )) +break ; + err =btf__add_field (btf,"a" ,LIST_HEAD ,0 ,0 ); +if (!ASSERT_OK (err,"btf__add_field foo::a" )) +break ; + err =btf__add_field (btf,"b" ,LIST_NODE ,128 ,0 ); +if (!ASSERT_OK (err,"btf__add_field foo::b" )) +break ; + err =btf__add_field (btf,"b" ,LIST_NODE ,256 ,0 ); +if (!ASSERT_OK (err,"btf__add_field foo::c" )) +break ; + err =btf__add_field (btf,"d" ,SPIN_LOCK ,384 ,0 ); +if (!ASSERT_OK (err,"btf__add_field foo::d" )) +break ; + id =btf__add_decl_tag (btf,"contains:foo:b" ,5 ,0 ); +if (!ASSERT_EQ (id,6 ,"btf__add_decl_tag contains:foo:b" )) +break ; + + err =btf__load_into_kernel (btf); +ASSERT_EQ (err, -EINVAL ,"check btf" ); +btf__free (btf); +break ; + } + +while (test__start_subtest ("btf: owning | owned AA cycle" )) { + btf =init_btf (); +if (!ASSERT_OK_PTR (btf,"init_btf" )) +break ; + id =btf__add_struct (btf,"foo" ,36 ); +if (!ASSERT_EQ (id,5 ,"btf__add_struct foo" )) +break ; + err =btf__add_field (btf,"a" ,LIST_HEAD ,0 ,0 ); +if (!ASSERT_OK (err,"btf__add_field foo::a" )) +break ; + err =btf__add_field (btf,"b" ,LIST_NODE ,128 ,0 ); +if (!ASSERT_OK (err,"btf__add_field foo::b" )) +break ; + err =btf__add_field (btf,"c" ,SPIN_LOCK ,256 ,0 ); +if (!ASSERT_OK (err,"btf__add_field foo::c" )) +break ; + id =btf__add_decl_tag (btf,"contains:foo:b" ,5 ,0 ); +if (!ASSERT_EQ (id,6 ,"btf__add_decl_tag contains:foo:b" )) +break ; + + err =btf__load_into_kernel (btf); +ASSERT_EQ (err, -ELOOP ,"check btf" ); +btf__free (btf); +break ; + } + +while (test__start_subtest ("btf: owning | owned ABA cycle" )) { + btf =init_btf (); +if (!ASSERT_OK_PTR (btf,"init_btf" )) +break ; + id =btf__add_struct (btf,"foo" ,36 ); +if (!ASSERT_EQ (id,5 ,"btf__add_struct foo" )) +break ; + err =btf__add_field (btf,"a" ,LIST_HEAD ,0 ,0 ); +if (!ASSERT_OK (err,"btf__add_field foo::a" )) +break ; + err =btf__add_field (btf,"b" ,LIST_NODE ,128 ,0 ); +if (!ASSERT_OK (err,"btf__add_field foo::b" )) +break ; + err =btf__add_field (btf,"c" ,SPIN_LOCK ,256 ,0 ); +if (!ASSERT_OK (err,"btf__add_field foo::c" )) +break ; + id =btf__add_decl_tag (btf,"contains:bar:b" ,5 ,0 ); +if (!ASSERT_EQ (id,6 ,"btf__add_decl_tag contains:bar:b" )) +break ; + id =btf__add_struct (btf,"bar" ,36 ); +if (!ASSERT_EQ (id,7 ,"btf__add_struct bar" )) +break ; + err =btf__add_field (btf,"a" ,LIST_HEAD ,0 ,0 ); +if (!ASSERT_OK (err,"btf__add_field bar::a" )) +break ; + err =btf__add_field (btf,"b" ,LIST_NODE ,128 ,0 ); +if (!ASSERT_OK (err,"btf__add_field bar::b" )) +break ; + err =btf__add_field (btf,"c" ,SPIN_LOCK ,256 ,0 ); +if (!ASSERT_OK (err,"btf__add_field bar::c" )) +break ; + id =btf__add_decl_tag (btf,"contains:foo:b" ,7 ,0 ); +if (!ASSERT_EQ (id,8 ,"btf__add_decl_tag contains:foo:b" )) +break ; + + err =btf__load_into_kernel (btf); +ASSERT_EQ (err, -ELOOP ,"check btf" ); +btf__free (btf); +break ; + } + +while (test__start_subtest ("btf: owning -> owned" )) { + btf =init_btf (); +if (!ASSERT_OK_PTR (btf,"init_btf" )) +break ; + id =btf__add_struct (btf,"foo" ,20 ); +if (!ASSERT_EQ (id,5 ,"btf__add_struct foo" )) +break ; + err =btf__add_field (btf,"a" ,LIST_HEAD ,0 ,0 ); +if (!ASSERT_OK (err,"btf__add_field foo::a" )) +break ; + err =btf__add_field (btf,"b" ,SPIN_LOCK ,128 ,0 ); +if (!ASSERT_OK (err,"btf__add_field foo::b" )) +break ; + id =btf__add_decl_tag (btf,"contains:bar:a" ,5 ,0 ); +if (!ASSERT_EQ (id,6 ,"btf__add_decl_tag contains:bar:a" )) +break ; + id =btf__add_struct (btf,"bar" ,16 ); +if (!ASSERT_EQ (id,7 ,"btf__add_struct bar" )) +break ; + err =btf__add_field (btf,"a" ,LIST_NODE ,0 ,0 ); +if (!ASSERT_OK (err,"btf__add_field bar::a" )) +break ; + + err =btf__load_into_kernel (btf); +ASSERT_EQ (err,0 ,"check btf" ); +btf__free (btf); +break ; + } + +while (test__start_subtest ("btf: owning -> owning | owned -> owned" )) { + btf =init_btf (); +if (!ASSERT_OK_PTR (btf,"init_btf" )) +break ; + id =btf__add_struct (btf,"foo" ,20 ); +if (!ASSERT_EQ (id,5 ,"btf__add_struct foo" )) +break ; + err =btf__add_field (btf,"a" ,LIST_HEAD ,0 ,0 ); +if (!ASSERT_OK (err,"btf__add_field foo::a" )) +break ; + err =btf__add_field (btf,"b" ,SPIN_LOCK ,128 ,0 ); +if (!ASSERT_OK (err,"btf__add_field foo::b" )) +break ; + id =btf__add_decl_tag (btf,"contains:bar:b" ,5 ,0 ); +if (!ASSERT_EQ (id,6 ,"btf__add_decl_tag contains:bar:b" )) +break ; + id =btf__add_struct (btf,"bar" ,36 ); +if (!ASSERT_EQ (id,7 ,"btf__add_struct bar" )) +break ; + err =btf__add_field (btf,"a" ,LIST_HEAD ,0 ,0 ); +if (!ASSERT_OK (err,"btf__add_field bar::a" )) +break ; + err =btf__add_field (btf,"b" ,LIST_NODE ,128 ,0 ); +if (!ASSERT_OK (err,"btf__add_field bar::b" )) +break ; + err =btf__add_field (btf,"c" ,SPIN_LOCK ,256 ,0 ); +if (!ASSERT_OK (err,"btf__add_field bar::c" )) +break ; + id =btf__add_decl_tag (btf,"contains:baz:a" ,7 ,0 ); +if (!ASSERT_EQ (id,8 ,"btf__add_decl_tag contains:baz:a" )) +break ; + id =btf__add_struct (btf,"baz" ,16 ); +if (!ASSERT_EQ (id,9 ,"btf__add_struct baz" )) +break ; + err =btf__add_field (btf,"a" ,LIST_NODE ,0 ,0 ); +if (!ASSERT_OK (err,"btf__add_field baz:a" )) +break ; + + err =btf__load_into_kernel (btf); +ASSERT_EQ (err,0 ,"check btf" ); +btf__free (btf); +break ; + } + +while (test__start_subtest ("btf: owning | owned -> owning | owned -> owned" )) { + btf =init_btf (); +if (!ASSERT_OK_PTR (btf,"init_btf" )) +break ; + id =btf__add_struct (btf,"foo" ,36 ); +if (!ASSERT_EQ (id,5 ,"btf__add_struct foo" )) +break ; + err =btf__add_field (btf,"a" ,LIST_HEAD ,0 ,0 ); +if (!ASSERT_OK (err,"btf__add_field foo::a" )) +break ; + err =btf__add_field (btf,"b" ,LIST_NODE ,128 ,0 ); +if (!ASSERT_OK (err,"btf__add_field foo::b" )) +break ; + err =btf__add_field (btf,"c" ,SPIN_LOCK ,256 ,0 ); +if (!ASSERT_OK (err,"btf__add_field foo::c" )) +break ; + id =btf__add_decl_tag (btf,"contains:bar:b" ,5 ,0 ); +if (!ASSERT_EQ (id,6 ,"btf__add_decl_tag contains:bar:b" )) +break ; + id =btf__add_struct (btf,"bar" ,36 ); +if (!ASSERT_EQ (id,7 ,"btf__add_struct bar" )) +break ; + err =btf__add_field (btf,"a" ,LIST_HEAD ,0 ,0 ); +if (!ASSERT_OK (err,"btf__add_field bar:a" )) +break ; + err =btf__add_field (btf,"b" ,LIST_NODE ,128 ,0 ); +if (!ASSERT_OK (err,"btf__add_field bar:b" )) +break ; + err =btf__add_field (btf,"c" ,SPIN_LOCK ,256 ,0 ); +if (!ASSERT_OK (err,"btf__add_field bar:c" )) +break ; + id =btf__add_decl_tag (btf,"contains:baz:a" ,7 ,0 ); +if (!ASSERT_EQ (id,8 ,"btf__add_decl_tag contains:baz:a" )) +break ; + id =btf__add_struct (btf,"baz" ,16 ); +if (!ASSERT_EQ (id,9 ,"btf__add_struct baz" )) +break ; + err =btf__add_field (btf,"a" ,LIST_NODE ,0 ,0 ); +if (!ASSERT_OK (err,"btf__add_field baz:a" )) +break ; + + err =btf__load_into_kernel (btf); +ASSERT_EQ (err, -ELOOP ,"check btf" ); +btf__free (btf); +break ; + } + +while (test__start_subtest ("btf: owning -> owning | owned -> owning | owned -> owned" )) { + btf =init_btf (); +if (!ASSERT_OK_PTR (btf,"init_btf" )) +break ; + id =btf__add_struct (btf,"foo" ,20 ); +if (!ASSERT_EQ (id,5 ,"btf__add_struct foo" )) +break ; + err =btf__add_field (btf,"a" ,LIST_HEAD ,0 ,0 ); +if (!ASSERT_OK (err,"btf__add_field foo::a" )) +break ; + err =btf__add_field (btf,"b" ,SPIN_LOCK ,128 ,0 ); +if (!ASSERT_OK (err,"btf__add_field foo::b" )) +break ; + id =btf__add_decl_tag (btf,"contains:bar:b" ,5 ,0 ); +if (!ASSERT_EQ (id,6 ,"btf__add_decl_tag contains:bar:b" )) +break ; + id =btf__add_struct (btf,"bar" ,36 ); +if (!ASSERT_EQ (id,7 ,"btf__add_struct bar" )) +break ; + err =btf__add_field (btf,"a" ,LIST_HEAD ,0 ,0 ); +if (!ASSERT_OK (err,"btf__add_field bar::a" )) +break ; + err =btf__add_field (btf,"b" ,LIST_NODE ,128 ,0 ); +if (!ASSERT_OK (err,"btf__add_field bar::b" )) +break ; + err =btf__add_field (btf,"c" ,SPIN_LOCK ,256 ,0 ); +if (!ASSERT_OK (err,"btf__add_field bar::c" )) +break ; + id =btf__add_decl_tag (btf,"contains:baz:b" ,7 ,0 ); +if (!ASSERT_EQ (id,8 ,"btf__add_decl_tag" )) +break ; + id =btf__add_struct (btf,"baz" ,36 ); +if (!ASSERT_EQ (id,9 ,"btf__add_struct baz" )) +break ; + err =btf__add_field (btf,"a" ,LIST_HEAD ,0 ,0 ); +if (!ASSERT_OK (err,"btf__add_field bar::a" )) +break ; + err =btf__add_field (btf,"b" ,LIST_NODE ,128 ,0 ); +if (!ASSERT_OK (err,"btf__add_field bar::b" )) +break ; + err =btf__add_field (btf,"c" ,SPIN_LOCK ,256 ,0 ); +if (!ASSERT_OK (err,"btf__add_field bar::c" )) +break ; + id =btf__add_decl_tag (btf,"contains:bam:a" ,9 ,0 ); +if (!ASSERT_EQ (id,10 ,"btf__add_decl_tag contains:bam:a" )) +break ; + id =btf__add_struct (btf,"bam" ,16 ); +if (!ASSERT_EQ (id,11 ,"btf__add_struct bam" )) +break ; + err =btf__add_field (btf,"a" ,LIST_NODE ,0 ,0 ); +if (!ASSERT_OK (err,"btf__add_field bam::a" )) +break ; + + err =btf__load_into_kernel (btf); +ASSERT_EQ (err, -ELOOP ,"check btf" ); +btf__free (btf); +break ; + } +} +void test_linked_list (void ) {int i;
@@ -245,6 +729,7 @@ void test_linked_list(void)test_linked_list_fail_prog (linked_list_fail_tests[i].prog_name, linked_list_fail_tests[i].err_msg); } +test_btf ();test_linked_list_success (PUSH_POP , false);test_linked_list_success (PUSH_POP , true);test_linked_list_success (PUSH_POP_MULT , false);
Signature · 1 line
2.38.1