diff options
author | Hou Tao <houtao1@huawei.com> | 2025-01-08 04:07:22 +0300 |
---|---|---|
committer | Alexei Starovoitov <ast@kernel.org> | 2025-01-09 05:06:36 +0300 |
commit | 4b7e7cd1c105cc5881f4054805dfbb92aa24eb78 (patch) | |
tree | 901fdec55265a71ca9939db741f9834eb9a5face /kernel/bpf/range_tree.c | |
parent | 090d7f2e640b265335ac0a5a8e09a99f7f28f567 (diff) | |
download | linux-4b7e7cd1c105cc5881f4054805dfbb92aa24eb78.tar.xz |
bpf: Disable migration before calling ops->map_free()
The freeing of all map elements may invoke bpf_obj_free_fields() to free
the special fields in the map value. Since these special fields may be
allocated from bpf memory allocator, migrate_{disable|enable} pairs are
necessary for the freeing of these special fields.
To simplify reasoning about when migrate_disable() is needed for the
freeing of these special fields, let the caller to guarantee migration
is disabled before invoking bpf_obj_free_fields(). Therefore, disabling
migration before calling ops->map_free() to simplify the freeing of map
values or special fields allocated from bpf memory allocator.
After disabling migration in bpf_map_free(), there is no need for
additional migration_{disable|enable} pairs in these ->map_free()
callbacks. Remove these redundant invocations.
The migrate_{disable|enable} pairs in the underlying implementation of
bpf_obj_free_fields() will be removed by the following patch.
Signed-off-by: Hou Tao <houtao1@huawei.com>
Link: https://lore.kernel.org/r/20250108010728.207536-11-houtao@huaweicloud.com
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Diffstat (limited to 'kernel/bpf/range_tree.c')
-rw-r--r-- | kernel/bpf/range_tree.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/kernel/bpf/range_tree.c b/kernel/bpf/range_tree.c index 5bdf9aadca3a..37b80a23ae1a 100644 --- a/kernel/bpf/range_tree.c +++ b/kernel/bpf/range_tree.c @@ -259,9 +259,7 @@ void range_tree_destroy(struct range_tree *rt) while ((rn = range_it_iter_first(rt, 0, -1U))) { range_it_remove(rn, rt); - migrate_disable(); bpf_mem_free(&bpf_global_ma, rn); - migrate_enable(); } } |