diff options
| author |   Roman Gushchin <guro@fb.com> | 2020-12-01 13:58:34 -0800 |
|---|---|---|
| committer |   Alexei Starovoitov <ast@kernel.org> | 2020-12-02 18:32:45 -0800 |
| commit | 6d192c7938b7e53a6bb55b90b86bd02ea0153731 (patch) | |
| tree | abd9631f0149e5943b89022c15dd399ffd35746f /kernel/bpf/arraymap.c | |
| parent | bpf: Memcg-based memory accounting for bpf maps (diff) | |
| download | linux-dev-6d192c7938b7e53a6bb55b90b86bd02ea0153731.tar.xz linux-dev-6d192c7938b7e53a6bb55b90b86bd02ea0153731.zip | |
bpf: Refine memcg-based memory accounting for arraymap maps
Include percpu arrays and auxiliary data into the memcg-based memory
accounting.
Signed-off-by: Roman Gushchin <guro@fb.com>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Link: https://lore.kernel.org/bpf/20201201215900.3569844-9-guro@fb.com
Diffstat (limited to 'kernel/bpf/arraymap.c')
| -rw-r--r-- | kernel/bpf/arraymap.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/bpf/arraymap.c b/kernel/bpf/arraymap.c index c6c81eceb68f..d837e0603c89 100644 --- a/kernel/bpf/arraymap.c +++ b/kernel/bpf/arraymap.c @@ -34,8 +34,8 @@ 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, - GFP_USER | __GFP_NOWARN); + ptr = bpf_map_alloc_percpu(&array->map, array->elem_size, 8, + GFP_USER | __GFP_NOWARN); if (!ptr) { bpf_array_free_percpu(array); return -ENOMEM; @@ -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); |