lkml.org 
[lkml]   [2020]   [Nov]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v6 09/34] bpf: refine memcg-based memory accounting for cpumap maps
    Date
    Include metadata and percpu data into the memcg-based memory accounting.

    Signed-off-by: Roman Gushchin <guro@fb.com>
    Acked-by: Song Liu <songliubraving@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 c61a23b564aa..563f96cc8a9d 100644
    --- a/kernel/bpf/cpumap.c
    +++ b/kernel/bpf/cpumap.c
    @@ -97,7 +97,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);

    @@ -415,7 +415,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
    \
     
     \ /
      Last update: 2020-11-17 03:59    [W:9.175 / U:0.860 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site