[PATCH bpf-next 23/35] bpf: eliminate rlimit-based memory accounting for sock_map maps

[Roman Gushchin]

Do not use rlimit-based memory accounting for sock_map maps.
It has been replaced with the memcg-based memory accounting.

Signed-off-by: Roman Gushchin <g...@fb.com>
---
 net/core/sock_map.c | 21 ++++++---------------
 1 file changed, 6 insertions(+), 15 deletions(-)

diff --git a/net/core/sock_map.c b/net/core/sock_map.c
index bc797adca44c..066aff088d20 100644
--- a/net/core/sock_map.c
+++ b/net/core/sock_map.c
@@ -26,8 +26,6 @@ struct bpf_stab {
 static struct bpf_map *sock_map_alloc(union bpf_attr *attr)
 {
        struct bpf_stab *stab;
-       u64 cost;
-       int err;
 
        if (!capable(CAP_NET_ADMIN))
                return ERR_PTR(-EPERM);
@@ -45,22 +43,15 @@ static struct bpf_map *sock_map_alloc(union bpf_attr *attr)
        bpf_map_init_from_attr(&stab->map, attr);
        raw_spin_lock_init(&stab->lock);
 
-       /* Make sure page count doesn't overflow. */
-       cost = (u64) stab->map.max_entries * sizeof(struct sock *);
-       err = bpf_map_charge_init(&stab->map.memory, cost);
-       if (err)
-               goto free_stab;
-
        stab->sks = bpf_map_area_alloc(stab->map.max_entries *
                                       sizeof(struct sock *),
                                       stab->map.numa_node);
-       if (stab->sks)
-               return &stab->map;
-       err = -ENOMEM;
-       bpf_map_charge_finish(&stab->map.memory);
-free_stab:
-       kfree(stab);
-       return ERR_PTR(err);
+       if (!stab->sks) {
+               kfree(stab);
+               return ERR_PTR(-ENOMEM);
+       }
+
+       return &stab->map;
 }
 
 int sock_map_get_from_fd(const union bpf_attr *attr, struct bpf_prog *prog)
-- 
2.26.2