net-memcg: Pass struct sock to mem_cgroup_sk_under_memory_pressure().

We will store a flag in the lowest bit of sk->sk_memcg.

Then, we cannot pass the raw pointer to mem_cgroup_under_socket_pressure().

Let's pass struct sock to it and rename the function to match other
functions starting with mem_cgroup_sk_.

Note that the helper is moved to sock.h to use mem_cgroup_from_sk().

Signed-off-by: Kuniyuki Iwashima <kuniyu@google.com>
Reviewed-by: Eric Dumazet <edumazet@google.com>
Acked-by: Roman Gushchin <roman.gushchin@linux.dev>
Acked-by: Shakeel Butt <shakeel.butt@linux.dev>
Link: https://patch.msgid.link/20250815201712.1745332-10-kuniyu@google.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h
index 0837d3de3a68f7dbdae1e3dc2357531d2a186214..fb27e3d2fdac1aff558977d948b78dabd9bacfb0 100644 (file)
--- a/include/linux/memcontrol.h
+++ b/include/linux/memcontrol.h
@@ -1642,19 +1642,6 @@ static inline u64 mem_cgroup_get_socket_pressure(struct mem_cgroup *memcg)
 }
 #endif
 
-static inline bool mem_cgroup_under_socket_pressure(struct mem_cgroup *memcg)
-{
-#ifdef CONFIG_MEMCG_V1
-       if (!cgroup_subsys_on_dfl(memory_cgrp_subsys))
-               return !!memcg->tcpmem_pressure;
-#endif /* CONFIG_MEMCG_V1 */
-       do {
-               if (time_before64(get_jiffies_64(), mem_cgroup_get_socket_pressure(memcg)))
-                       return true;
-       } while ((memcg = parent_mem_cgroup(memcg)));
-       return false;
-}
-
 int alloc_shrinker_info(struct mem_cgroup *memcg);
 void free_shrinker_info(struct mem_cgroup *memcg);
 void set_shrinker_bit(struct mem_cgroup *memcg, int nid, int shrinker_id);
@@ -1686,11 +1673,6 @@ static inline void mem_cgroup_sk_uncharge(const struct sock *sk,
 {
 }
 
-static inline bool mem_cgroup_under_socket_pressure(struct mem_cgroup *memcg)
-{
-       return false;
-}
-
 static inline void set_shrinker_bit(struct mem_cgroup *memcg,
                                    int nid, int shrinker_id)
 {

diff --git a/include/net/proto_memory.h b/include/net/proto_memory.h
index 859e63de81c49e7f4ffc43e6575d7e3a15ca2455..8e91a8fa31b52aa5c69b66930f1877eefecfa1ce 100644 (file)
--- a/include/net/proto_memory.h
+++ b/include/net/proto_memory.h
@@ -32,7 +32,7 @@ static inline bool sk_under_memory_pressure(const struct sock *sk)
                return false;
 
        if (mem_cgroup_sk_enabled(sk) &&
-           mem_cgroup_under_socket_pressure(sk->sk_memcg))
+           mem_cgroup_sk_under_memory_pressure(sk))
                return true;
 
        return !!READ_ONCE(*sk->sk_prot->memory_pressure);

diff --git a/include/net/sock.h b/include/net/sock.h
index 3efdf680401dde1c576f9beec1758fc87fcc4ae8..3bc4d566f7d0088f415e6f95d780d0adcfe6736f 100644 (file)
--- a/include/net/sock.h
+++ b/include/net/sock.h
@@ -2604,6 +2604,23 @@ static inline bool mem_cgroup_sk_enabled(const struct sock *sk)
 {
        return mem_cgroup_sockets_enabled && mem_cgroup_from_sk(sk);
 }
+
+static inline bool mem_cgroup_sk_under_memory_pressure(const struct sock *sk)
+{
+       struct mem_cgroup *memcg = mem_cgroup_from_sk(sk);
+
+#ifdef CONFIG_MEMCG_V1
+       if (!cgroup_subsys_on_dfl(memory_cgrp_subsys))
+               return !!memcg->tcpmem_pressure;
+#endif /* CONFIG_MEMCG_V1 */
+
+       do {
+               if (time_before64(get_jiffies_64(), mem_cgroup_get_socket_pressure(memcg)))
+                       return true;
+       } while ((memcg = parent_mem_cgroup(memcg)));
+
+       return false;
+}
 #else
 static inline struct mem_cgroup *mem_cgroup_from_sk(const struct sock *sk)
 {
@@ -2614,6 +2631,11 @@ static inline bool mem_cgroup_sk_enabled(const struct sock *sk)
 {
        return false;
 }
+
+static inline bool mem_cgroup_sk_under_memory_pressure(const struct sock *sk)
+{
+       return false;
+}
 #endif
 
 static inline long sock_rcvtimeo(const struct sock *sk, bool noblock)

diff --git a/include/net/tcp.h b/include/net/tcp.h
index 9f01b6be64446ce77864ec287f49beb94ff09444..2936b8175950faa777f81f3c6b7230bcc375d772 100644 (file)
--- a/include/net/tcp.h
+++ b/include/net/tcp.h
@@ -276,7 +276,7 @@ extern unsigned long tcp_memory_pressure;
 static inline bool tcp_under_memory_pressure(const struct sock *sk)
 {
        if (mem_cgroup_sk_enabled(sk) &&
-           mem_cgroup_under_socket_pressure(sk->sk_memcg))
+           mem_cgroup_sk_under_memory_pressure(sk))
                return true;
 
        return READ_ONCE(tcp_memory_pressure);