From: Hou Tao Date: Sat, 15 Mar 2025 15:09:30 +0000 (+0800) Subject: bpf: Check map->record at the beginning of check_and_free_fields() X-Git-Tag: v6.15-rc1~98^2~5 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bb2243f4328bc2e4aa4d8566a5a0a7f9ce947570;p=thirdparty%2Fkernel%2Fstable.git bpf: Check map->record at the beginning of check_and_free_fields() When there are no special fields in the map value, there is no need to invoke bpf_obj_free_fields(). Therefore, checking the validity of map->record in advance. After the change, the benchmark result of the per-cpu update case in map_perf_test increased by 40% under a 16-CPU VM. Signed-off-by: Hou Tao Acked-by: Kumar Kartikeya Dwivedi Link: https://lore.kernel.org/r/20250315150930.1511727-1-houtao@huaweicloud.com Signed-off-by: Alexei Starovoitov --- diff --git a/kernel/bpf/hashtab.c b/kernel/bpf/hashtab.c index c308300fc72f6..877298133fdae 100644 --- a/kernel/bpf/hashtab.c +++ b/kernel/bpf/hashtab.c @@ -787,6 +787,9 @@ static int htab_lru_map_gen_lookup(struct bpf_map *map, static void check_and_free_fields(struct bpf_htab *htab, struct htab_elem *elem) { + if (IS_ERR_OR_NULL(htab->map.record)) + return; + if (htab_is_percpu(htab)) { void __percpu *pptr = htab_elem_get_ptr(elem, htab->map.key_size); int cpu;