[PATCH bpf-next v2 04/35] bpf: refine memcg-based memory accounting for cpumap maps

[Roman Gushchin]

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

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

diff --git a/kernel/bpf/cpumap.c b/kernel/bpf/cpumap.c
index f1c46529929b..74ae9fcbe82e 100644
--- a/kernel/bpf/cpumap.c
+++ b/kernel/bpf/cpumap.c
@@ -99,7 +99,7 @@ static struct bpf_map *cpu_map_alloc(union bpf_attr *attr)
            attr->map_flags & ~BPF_F_NUMA_NODE)
                return ERR_PTR(-EINVAL);
 
-       cmap = kzalloc(sizeof(*cmap), GFP_USER);
+       cmap = kzalloc(sizeof(*cmap), GFP_USER | __GFP_ACCOUNT);
        if (!cmap)
                return ERR_PTR(-ENOMEM);
 
@@ -418,7 +418,7 @@ static struct bpf_cpu_map_entry *
 __cpu_map_entry_alloc(struct bpf_cpumap_val *value, u32 cpu, int map_id)
 {
        int numa, err, i, fd = value->bpf_prog.fd;
-       gfp_t gfp = GFP_KERNEL | __GFP_NOWARN;
+       gfp_t gfp = GFP_KERNEL_ACCOUNT | __GFP_NOWARN;
        struct bpf_cpu_map_entry *rcpu;
        struct xdp_bulk_queue *bq;
 
-- 
2.26.2