[PATCH v6 15/34] bpf: memcg-based memory accounting for bpf local storage maps

[Roman Gushchin]

Account memory used by bpf local storage maps:
per-socket and per-inode storages.

Signed-off-by: Roman Gushchin <g...@fb.com>
Acked-by: Song Liu <songliubrav...@fb.com>
---
 kernel/bpf/bpf_local_storage.c | 7 ++++---
 net/core/bpf_sk_storage.c      | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/kernel/bpf/bpf_local_storage.c b/kernel/bpf/bpf_local_storage.c
index 5d3a7af9ba9b..fd4f9ac1d042 100644
--- a/kernel/bpf/bpf_local_storage.c
+++ b/kernel/bpf/bpf_local_storage.c
@@ -67,7 +67,8 @@ bpf_selem_alloc(struct bpf_local_storage_map *smap, void 
*owner,
        if (charge_mem && mem_charge(smap, owner, smap->elem_size))
                return NULL;
 
-       selem = kzalloc(smap->elem_size, GFP_ATOMIC | __GFP_NOWARN);
+       selem = kzalloc(smap->elem_size, GFP_ATOMIC | __GFP_NOWARN |
+                       __GFP_ACCOUNT);
        if (selem) {
                if (value)
                        memcpy(SDATA(selem)->data, value, smap->map.value_size);
@@ -546,7 +547,7 @@ struct bpf_local_storage_map 
*bpf_local_storage_map_alloc(union bpf_attr *attr)
        u64 cost;
        int ret;
 
-       smap = kzalloc(sizeof(*smap), GFP_USER | __GFP_NOWARN);
+       smap = kzalloc(sizeof(*smap), GFP_USER | __GFP_NOWARN | __GFP_ACCOUNT);
        if (!smap)
                return ERR_PTR(-ENOMEM);
        bpf_map_init_from_attr(&smap->map, attr);
@@ -564,7 +565,7 @@ struct bpf_local_storage_map 
*bpf_local_storage_map_alloc(union bpf_attr *attr)
        }
 
        smap->buckets = kvcalloc(sizeof(*smap->buckets), nbuckets,
-                                GFP_USER | __GFP_NOWARN);
+                                GFP_USER | __GFP_NOWARN | __GFP_ACCOUNT);
        if (!smap->buckets) {
                bpf_map_charge_finish(&smap->map.memory);
                kfree(smap);
diff --git a/net/core/bpf_sk_storage.c b/net/core/bpf_sk_storage.c
index a32037daa933..3d80dee3a4aa 100644
--- a/net/core/bpf_sk_storage.c
+++ b/net/core/bpf_sk_storage.c
@@ -524,7 +524,7 @@ bpf_sk_storage_diag_alloc(const struct nlattr *nla_stgs)
        }
 
        diag = kzalloc(sizeof(*diag) + sizeof(diag->maps[0]) * nr_maps,
-                      GFP_KERNEL);
+                      GFP_KERNEL_ACCOUNT);
        if (!diag)
                return ERR_PTR(-ENOMEM);
 
-- 
2.26.2