net: tcp_memcontrol: simplify the per-memcg limit access

tcp_memcontrol replicates the global sysctl_mem limit array per cgroup,
but it only ever sets these entries to the value of the memory_allocated
page_counter limit.  Use the latter directly.

Signed-off-by: Johannes Weiner <hannes@cmpxchg.org>
Reviewed-by: Vladimir Davydov <vdavydov@virtuozzo.com>
Acked-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 5 insertions, 3 deletions

diff --git a/include/net/sock.h b/include/net/sock.h
index 1f15937ec208..8b1f8e5d3a48 100644
--- a/include/net/sock.h
+++ b/include/net/sock.h
@@ -1162,10 +1162,12 @@ static inline void sk_enter_memory_pressure(struct sock *sk)
 
 static inline long sk_prot_mem_limits(const struct sock *sk, int index)
 {
-        long *prot = sk->sk_prot->sysctl_mem;
+        long limit = sk->sk_prot->sysctl_mem[index];
+
         if (mem_cgroup_sockets_enabled && sk->sk_cgrp)
-                prot = sk->sk_cgrp->sysctl_mem;
-        return prot[index];
+                limit = min_t(long, limit, sk->sk_cgrp->memory_allocated.limit);
+
+        return limit;
 }
 
 static inline void memcg_memory_allocated_add(struct cg_proto *prot,