Thread (88 messages) flat view 88 messages, 5 authors, 2020-07-30

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

From: Song Liu <song@kernel.org>
Date: 2020-07-27 22:48:39
Also in: bpf, lkml

On Mon, Jul 27, 2020 at 12:23 PM Roman Gushchin [off-list ref] wrote:
Include metadata and percpu data into the memcg-based memory accounting.

Signed-off-by: Roman Gushchin <redacted>
Acked-by: Song Liu <redacted>
quoted hunk ↗ jump to hunk
---
 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
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help