From 62d9bd33aac388c34e7fd3b411e0d40084d07f4b Mon Sep 17 00:00:00 2001 From: Alexei Starovoitov Date: Wed, 16 Jun 2021 09:40:32 -0700 Subject: [PATCH bpf-next 2/2] bpf: Don't iterate all map elements anymore. Signed-off-by: Alexei Starovoitov --- kernel/bpf/arraymap.c | 7 ------- kernel/bpf/hashtab.c | 11 ----------- 2 files changed, 18 deletions(-) diff --git a/kernel/bpf/arraymap.c b/kernel/bpf/arraymap.c index 5c84ab7f8872..d82a6de65273 100644 --- a/kernel/bpf/arraymap.c +++ b/kernel/bpf/arraymap.c @@ -385,17 +385,10 @@ static void *array_map_vmalloc_addr(struct bpf_array *array) static void array_map_free(struct bpf_map *map) { struct bpf_array *array = container_of(map, struct bpf_array, map); - int i; if (array->map.map_type == BPF_MAP_TYPE_PERCPU_ARRAY) bpf_array_free_percpu(array); - if (unlikely(map_value_has_timer(map))) - for (i = 0; i < array->map.max_entries; i++) - bpf_timer_cancel_and_free(array->value + - array->elem_size * i + - map->timer_off); - if (array->map.map_flags & BPF_F_MMAPABLE) bpf_map_area_free(array_map_vmalloc_addr(array)); else diff --git a/kernel/bpf/hashtab.c b/kernel/bpf/hashtab.c index c885492d0a76..5e2736c46185 100644 --- a/kernel/bpf/hashtab.c +++ b/kernel/bpf/hashtab.c @@ -244,17 +244,6 @@ static void htab_free_elems(struct bpf_htab *htab) cond_resched(); } free_elems: - if (unlikely(map_value_has_timer(&htab->map))) - for (i = 0; i < htab->map.max_entries; i++) { - struct htab_elem *elem; - - elem = get_htab_elem(htab, i); - bpf_timer_cancel_and_free(elem->key + - round_up(htab->map.key_size, 8) + - htab->map.timer_off); - cond_resched(); - } - bpf_map_area_free(htab->elems); } -- 2.30.2