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 30/34] bpf: eliminate rlimit-based memory accounting for xskmap maps
    Date
    Do not use rlimit-based memory accounting for xskmap 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>
    ---
    net/xdp/xskmap.c | 12 ++----------
    1 file changed, 2 insertions(+), 10 deletions(-)

    diff --git a/net/xdp/xskmap.c b/net/xdp/xskmap.c
    index 5d11d60d7b0f..7dc110b40ba0 100644
    --- a/net/xdp/xskmap.c
    +++ b/net/xdp/xskmap.c
    @@ -74,9 +74,8 @@ static void xsk_map_sock_delete(struct xdp_sock *xs,

    static struct bpf_map *xsk_map_alloc(union bpf_attr *attr)
    {
    - struct bpf_map_memory mem;
    - int err, numa_node;
    struct xsk_map *m;
    + int numa_node;
    u64 size;

    if (!capable(CAP_NET_ADMIN))
    @@ -90,18 +89,11 @@ static struct bpf_map *xsk_map_alloc(union bpf_attr *attr)
    numa_node = bpf_map_attr_numa_node(attr);
    size = struct_size(m, xsk_map, attr->max_entries);

    - err = bpf_map_charge_init(&mem, size);
    - if (err < 0)
    - return ERR_PTR(err);
    -
    m = bpf_map_area_alloc(size, numa_node);
    - if (!m) {
    - bpf_map_charge_finish(&mem);
    + if (!m)
    return ERR_PTR(-ENOMEM);
    - }

    bpf_map_init_from_attr(&m->map, attr);
    - bpf_map_charge_move(&m->map.memory, &mem);
    spin_lock_init(&m->lock);

    return &m->map;
    --
    2.26.2
    \
     
     \ /
      Last update: 2020-11-17 04:10    [W:3.066 / U:0.252 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site