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 20/34] bpf: eliminate rlimit-based memory accounting for cpumap maps
    Date
    Do not use rlimit-based memory accounting for cpumap maps.
    It has been replaced with the memcg-based memory accounting.

    Signed-off-by: Roman Gushchin <guro@fb.com>
    Acked-by: Song Liu <songliubraving@fb.com>
    ---
    kernel/bpf/cpumap.c | 16 +---------------
    1 file changed, 1 insertion(+), 15 deletions(-)

    diff --git a/kernel/bpf/cpumap.c b/kernel/bpf/cpumap.c
    index 563f96cc8a9d..7103d89a7d41 100644
    --- a/kernel/bpf/cpumap.c
    +++ b/kernel/bpf/cpumap.c
    @@ -84,8 +84,6 @@ static struct bpf_map *cpu_map_alloc(union bpf_attr *attr)
    u32 value_size = attr->value_size;
    struct bpf_cpu_map *cmap;
    int err = -ENOMEM;
    - u64 cost;
    - int ret;

    if (!bpf_capable())
    return ERR_PTR(-EPERM);
    @@ -109,26 +107,14 @@ static struct bpf_map *cpu_map_alloc(union bpf_attr *attr)
    goto free_cmap;
    }

    - /* make sure page count doesn't overflow */
    - cost = (u64) cmap->map.max_entries * sizeof(struct bpf_cpu_map_entry *);
    -
    - /* Notice returns -EPERM on if map size is larger than memlock limit */
    - ret = bpf_map_charge_init(&cmap->map.memory, cost);
    - if (ret) {
    - err = ret;
    - goto free_cmap;
    - }
    -
    /* Alloc array for possible remote "destination" CPUs */
    cmap->cpu_map = bpf_map_area_alloc(cmap->map.max_entries *
    sizeof(struct bpf_cpu_map_entry *),
    cmap->map.numa_node);
    if (!cmap->cpu_map)
    - goto free_charge;
    + goto free_cmap;

    return &cmap->map;
    -free_charge:
    - bpf_map_charge_finish(&cmap->map.memory);
    free_cmap:
    kfree(cmap);
    return ERR_PTR(err);
    --
    2.26.2
    \
     
     \ /
      Last update: 2020-11-17 03:59    [W:2.344 / U:0.140 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site