Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bc6d5031 authored by Daniel Borkmann's avatar Daniel Borkmann Committed by David S. Miller
Browse files

bpf: do not test for PCPU_MIN_UNIT_SIZE before percpu allocations 



PCPU_MIN_UNIT_SIZE is an implementation detail of the percpu
allocator. Given we support __GFP_NOWARN now, lets just let
the allocation request fail naturally instead. The two call
sites from BPF mistakenly assumed __GFP_NOWARN would work, so
no changes needed to their actual __alloc_percpu_gfp() calls
which use the flag already.

Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
Acked-by: default avatarAlexei Starovoitov <ast@kernel.org>
Acked-by: default avatarJohn Fastabend <john.fastabend@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 82f8dd28

kernel/bpf/arraymap.c

+1 −1
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ static struct bpf_map *array_map_alloc(union bpf_attr *attr) 
	array_size += (u64) attr->max_entries * elem_size * num_possible_cpus();



	if (array_size >= U32_MAX - PAGE_SIZE ||

	    elem_size > PCPU_MIN_UNIT_SIZE || bpf_array_alloc_percpu(array)) {

	    bpf_array_alloc_percpu(array)) {

		bpf_map_area_free(array);

		return ERR_PTR(-ENOMEM);

	}

kernel/bpf/hashtab.c

+0 −4
Original line number Diff line number Diff line
@@ -317,10 +317,6 @@ static struct bpf_map *htab_map_alloc(union bpf_attr *attr) 
		 */

		goto free_htab;



	if (percpu && round_up(htab->map.value_size, 8) > PCPU_MIN_UNIT_SIZE)

		/* make sure the size for pcpu_alloc() is reasonable */

		goto free_htab;



	htab->elem_size = sizeof(struct htab_elem) +

			  round_up(htab->map.key_size, 8);

	if (percpu)