[PATCH bpf-next v7 10/34] bpf: memcg-based memory accounting for cgroup storage maps

[Roman Gushchin]

Account memory used by cgroup storage maps including metadata
structures.

Account the percpu memory for the percpu flavor of cgroup storage.

Signed-off-by: Roman Gushchin <g...@fb.com>
---
 kernel/bpf/local_storage.c | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/kernel/bpf/local_storage.c b/kernel/bpf/local_storage.c
index 571bb351ed3b..aae17d29538e 100644
--- a/kernel/bpf/local_storage.c
+++ b/kernel/bpf/local_storage.c
@@ -164,10 +164,10 @@ static int cgroup_storage_update_elem(struct bpf_map 
*map, void *key,
                return 0;
        }
 
-       new = kmalloc_node(sizeof(struct bpf_storage_buffer) +
-                          map->value_size,
-                          __GFP_ZERO | GFP_ATOMIC | __GFP_NOWARN,
-                          map->numa_node);
+       new = bpf_map_kmalloc_node(map, sizeof(struct bpf_storage_buffer) +
+                                  map->value_size, __GFP_ZERO | GFP_ATOMIC |
+                                  __GFP_NOWARN | __GFP_ACCOUNT,
+                                  map->numa_node);
        if (!new)
                return -ENOMEM;
 
@@ -313,7 +313,7 @@ static struct bpf_map *cgroup_storage_map_alloc(union 
bpf_attr *attr)
                return ERR_PTR(ret);
 
        map = kmalloc_node(sizeof(struct bpf_cgroup_storage_map),
-                          __GFP_ZERO | GFP_USER, numa_node);
+                          __GFP_ZERO | GFP_USER | __GFP_ACCOUNT, numa_node);
        if (!map) {
                bpf_map_charge_finish(&mem);
                return ERR_PTR(-ENOMEM);
@@ -496,9 +496,9 @@ static size_t bpf_cgroup_storage_calculate_size(struct 
bpf_map *map, u32 *pages)
 struct bpf_cgroup_storage *bpf_cgroup_storage_alloc(struct bpf_prog *prog,
                                        enum bpf_cgroup_storage_type stype)
 {
+       const gfp_t gfp = __GFP_ZERO | GFP_USER | __GFP_ACCOUNT;
        struct bpf_cgroup_storage *storage;
        struct bpf_map *map;
-       gfp_t flags;
        size_t size;
        u32 pages;
 
@@ -511,20 +511,18 @@ struct bpf_cgroup_storage 
*bpf_cgroup_storage_alloc(struct bpf_prog *prog,
        if (bpf_map_charge_memlock(map, pages))
                return ERR_PTR(-EPERM);
 
-       storage = kmalloc_node(sizeof(struct bpf_cgroup_storage),
-                              __GFP_ZERO | GFP_USER, map->numa_node);
+       storage = kmalloc_node(sizeof(struct bpf_cgroup_storage), gfp,
+                              map->numa_node);
        if (!storage)
                goto enomem;
 
-       flags = __GFP_ZERO | GFP_USER;
-
        if (stype == BPF_CGROUP_STORAGE_SHARED) {
-               storage->buf = kmalloc_node(size, flags, map->numa_node);
+               storage->buf = kmalloc_node(size, gfp, map->numa_node);
                if (!storage->buf)
                        goto enomem;
                check_and_init_map_lock(map, storage->buf->data);
        } else {
-               storage->percpu_buf = __alloc_percpu_gfp(size, 8, flags);
+               storage->percpu_buf = __alloc_percpu_gfp(size, 8, gfp);
                if (!storage->percpu_buf)
                        goto enomem;
        }
-- 
2.26.2