Skip to content

Commit 1d2dbe7

Browse files
Hou TaoAlexei Starovoitov
authored andcommitted
bpf: Remove migrate_{disable|enable} in bpf_obj_free_fields()
The callers of bpf_obj_free_fields() have already guaranteed that the migration is disabled, therefore, there is no need to invoke migrate_{disable,enable} pair in bpf_obj_free_fields()'s underly implementation. This patch removes unnecessary migrate_{disable|enable} pairs from bpf_obj_free_fields() and its callees: bpf_list_head_free() and bpf_rb_root_free(). Signed-off-by: Hou Tao <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Alexei Starovoitov <[email protected]>
1 parent 4b7e7cd commit 1d2dbe7

File tree

2 files changed

+0
-6
lines changed

2 files changed

+0
-6
lines changed

kernel/bpf/helpers.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2066,9 +2066,7 @@ void bpf_list_head_free(const struct btf_field *field, void *list_head,
20662066
/* The contained type can also have resources, including a
20672067
* bpf_list_head which needs to be freed.
20682068
*/
2069-
migrate_disable();
20702069
__bpf_obj_drop_impl(obj, field->graph_root.value_rec, false);
2071-
migrate_enable();
20722070
}
20732071
}
20742072

@@ -2105,9 +2103,7 @@ void bpf_rb_root_free(const struct btf_field *field, void *rb_root,
21052103
obj -= field->graph_root.node_offset;
21062104

21072105

2108-
migrate_disable();
21092106
__bpf_obj_drop_impl(obj, field->graph_root.value_rec, false);
2110-
migrate_enable();
21112107
}
21122108
}
21132109

kernel/bpf/syscall.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -796,11 +796,9 @@ void bpf_obj_free_fields(const struct btf_record *rec, void *obj)
796796
if (!btf_is_kernel(field->kptr.btf)) {
797797
pointee_struct_meta = btf_find_struct_meta(field->kptr.btf,
798798
field->kptr.btf_id);
799-
migrate_disable();
800799
__bpf_obj_drop_impl(xchgd_field, pointee_struct_meta ?
801800
pointee_struct_meta->record : NULL,
802801
fields[i].type == BPF_KPTR_PERCPU);
803-
migrate_enable();
804802
} else {
805803
field->kptr.dtor(xchgd_field);
806804
}

0 commit comments

Comments
 (0)