Commit 6d192c79 authored by Roman Gushchin's avatar Roman Gushchin Committed by Alexei Starovoitov
Browse files

bpf: Refine memcg-based memory accounting for arraymap maps 



Include percpu arrays and auxiliary data into the memcg-based memory
accounting.

Signed-off-by: default avatarRoman Gushchin <guro@fb.com>
Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
Link: https://lore.kernel.org/bpf/20201201215900.3569844-9-guro@fb.com
parent d5299b67

kernel/bpf/arraymap.c

+3 −3
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ static int bpf_array_alloc_percpu(struct bpf_array *array) 
	int i;



	for (i = 0; i < array->map.max_entries; i++) {

		ptr = __alloc_percpu_gfp(array->elem_size, 8,

		ptr = bpf_map_alloc_percpu(&array->map, array->elem_size, 8,

					   GFP_USER | __GFP_NOWARN);

		if (!ptr) {

			bpf_array_free_percpu(array);
@@ -1018,7 +1018,7 @@ static struct bpf_map *prog_array_map_alloc(union bpf_attr *attr) 
	struct bpf_array_aux *aux;

	struct bpf_map *map;



	aux = kzalloc(sizeof(*aux), GFP_KERNEL);

	aux = kzalloc(sizeof(*aux), GFP_KERNEL_ACCOUNT);

	if (!aux)

		return ERR_PTR(-ENOMEM);