5 files changed, 32 insertions, 49 deletions

diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h
index d0c724f53691..85c437b0cbc0 100644
--- a/include/linux/memcontrol.h
+++ b/include/linux/memcontrol.h
@@ -694,17 +694,8 @@ static inline void mem_cgroup_wb_stats(struct bdi_writeback *wb,
 #endif  /* CONFIG_CGROUP_WRITEBACK */
 
 struct sock;
-#if defined(CONFIG_INET) && defined(CONFIG_MEMCG_KMEM)
 void sock_update_memcg(struct sock *sk);
 void sock_release_memcg(struct sock *sk);
-#else
-static inline void sock_update_memcg(struct sock *sk)
-{
-}
-static inline void sock_release_memcg(struct sock *sk)
-{
-}
-#endif /* CONFIG_INET && CONFIG_MEMCG_KMEM */
 
 #ifdef CONFIG_MEMCG_KMEM
 extern struct static_key memcg_kmem_enabled_key;
diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index 44ed2dee8f0c..d9344dad207e 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -293,46 +293,40 @@ static inline struct mem_cgroup *mem_cgroup_from_id(unsigned short id)
 
 void sock_update_memcg(struct sock *sk)
 {
-        if (mem_cgroup_sockets_enabled) {
-                struct mem_cgroup *memcg;
-                struct cg_proto *cg_proto;
+        struct mem_cgroup *memcg;
+        struct cg_proto *cg_proto;
 
-                BUG_ON(!sk->sk_prot->proto_cgroup);
+        BUG_ON(!sk->sk_prot->proto_cgroup);
 
-                /* Socket cloning can throw us here with sk_cgrp already
-                 * filled. It won't however, necessarily happen from
-                 * process context. So the test for root memcg given
-                 * the current task's memcg won't help us in this case.
-                 *
-                 * Respecting the original socket's memcg is a better
-                 * decision in this case.
-                 */
-                if (sk->sk_cgrp) {
-                        BUG_ON(mem_cgroup_is_root(sk->sk_cgrp->memcg));
-                        css_get(&sk->sk_cgrp->memcg->css);
-                        return;
-                }
+        /* Socket cloning can throw us here with sk_cgrp already
+         * filled. It won't however, necessarily happen from
+         * process context. So the test for root memcg given
+         * the current task's memcg won't help us in this case.
+         *
+         * Respecting the original socket's memcg is a better
+         * decision in this case.
+         */
+        if (sk->sk_cgrp) {
+                BUG_ON(mem_cgroup_is_root(sk->sk_cgrp->memcg));
+                css_get(&sk->sk_cgrp->memcg->css);
+                return;
+        }
 
-                rcu_read_lock();
-                memcg = mem_cgroup_from_task(current);
-                cg_proto = sk->sk_prot->proto_cgroup(memcg);
-                if (cg_proto && cg_proto->active &&
-                    css_tryget_online(&memcg->css)) {
-                        sk->sk_cgrp = cg_proto;
-                }
-                rcu_read_unlock();
+        rcu_read_lock();
+        memcg = mem_cgroup_from_task(current);
+        cg_proto = sk->sk_prot->proto_cgroup(memcg);
+        if (cg_proto && cg_proto->active &&
+            css_tryget_online(&memcg->css)) {
+                sk->sk_cgrp = cg_proto;
         }
+        rcu_read_unlock();
 }
 EXPORT_SYMBOL(sock_update_memcg);
 
 void sock_release_memcg(struct sock *sk)
 {
-        if (mem_cgroup_sockets_enabled && sk->sk_cgrp) {
-                struct mem_cgroup *memcg;
-                WARN_ON(!sk->sk_cgrp->memcg);
-                memcg = sk->sk_cgrp->memcg;
-                css_put(&sk->sk_cgrp->memcg->css);
-        }
+        WARN_ON(!sk->sk_cgrp->memcg);
+        css_put(&sk->sk_cgrp->memcg->css);
 }
 
 struct cg_proto *tcp_proto_cgroup(struct mem_cgroup *memcg)
diff --git a/net/core/sock.c b/net/core/sock.c
index 51270238e269..6c5dab01105b 100644
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -1507,12 +1507,6 @@ void sk_free(struct sock *sk)
 }
 EXPORT_SYMBOL(sk_free);
 
-static void sk_update_clone(const struct sock *sk, struct sock *newsk)
-{
-        if (mem_cgroup_sockets_enabled && sk->sk_cgrp)
-                sock_update_memcg(newsk);
-}
-
 /**
  *      sk_clone_lock - clone a socket, and lock its clone
  *      @sk: the socket to clone
@@ -1607,7 +1601,8 @@ struct sock *sk_clone_lock(const struct sock *sk, const gfp_t priority)
                 sk_set_socket(newsk, NULL);
                 newsk->sk_wq = NULL;
 
-                sk_update_clone(sk, newsk);
+                if (mem_cgroup_sockets_enabled && sk->sk_cgrp)
+                        sock_update_memcg(newsk);
 
                 if (newsk->sk_prot->sockets_allocated)
                         sk_sockets_allocated_inc(newsk);
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
index 7bb1b091efd1..fd17eec93525 100644
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
@@ -422,7 +422,8 @@ void tcp_init_sock(struct sock *sk)
         sk->sk_rcvbuf = sysctl_tcp_rmem[1];
 
         local_bh_disable();
-        sock_update_memcg(sk);
+        if (mem_cgroup_sockets_enabled)
+                sock_update_memcg(sk);
         sk_sockets_allocated_inc(sk);
         local_bh_enable();
 }
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
index 65947c1f4733..eb39e02899e5 100644
--- a/net/ipv4/tcp_ipv4.c
+++ b/net/ipv4/tcp_ipv4.c
@@ -1818,7 +1818,9 @@ void tcp_v4_destroy_sock(struct sock *sk)
         tcp_saved_syn_free(tp);
 
         sk_sockets_allocated_dec(sk);
-        sock_release_memcg(sk);
+
+        if (mem_cgroup_sockets_enabled && sk->sk_cgrp)
+                sock_release_memcg(sk);
 }
 EXPORT_SYMBOL(tcp_v4_destroy_sock);