Commit 376be5ff authored by Glauber Costa's avatar Glauber Costa Committed by David S. Miller
Browse files

net: fix socket memcg build with !CONFIG_NET 



There is still a build bug with the sock memcg code, that triggers
with !CONFIG_NET, that survived my series of randconfig builds.

Signed-off-by: default avatarGlauber Costa <glommer@parallels.com>
Reported-by: default avatarRandy Dunlap <rdunlap@xenotime.net>
CC: Hiroyouki Kamezawa <kamezawa.hiroyu@jp.fujitsu.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1a3bc369

include/net/sock.h

+1 −1
Original line number Diff line number Diff line
@@ -922,7 +922,7 @@ inline void sk_refcnt_debug_release(const struct sock *sk) 
#define sk_refcnt_debug_release(sk) do { } while (0)

#endif /* SOCK_REFCNT_DEBUG */



#ifdef CONFIG_CGROUP_MEM_RES_CTLR_KMEM

#if defined(CONFIG_CGROUP_MEM_RES_CTLR_KMEM) && defined(CONFIG_NET)

extern struct jump_label_key memcg_socket_limit_enabled;

static inline struct cg_proto *parent_cg_proto(struct proto *proto,

					       struct cg_proto *cg_proto)

mm/memcontrol.c

+2 −2
Original line number Diff line number Diff line
@@ -379,7 +379,7 @@ static void mem_cgroup_put(struct mem_cgroup *memcg); 
static bool mem_cgroup_is_root(struct mem_cgroup *memcg);

void sock_update_memcg(struct sock *sk)

{

	if (static_branch(&memcg_socket_limit_enabled)) {

	if (mem_cgroup_sockets_enabled) {

		struct mem_cgroup *memcg;



		BUG_ON(!sk->sk_prot->proto_cgroup);
@@ -411,7 +411,7 @@ EXPORT_SYMBOL(sock_update_memcg); 


void sock_release_memcg(struct sock *sk)

{

	if (static_branch(&memcg_socket_limit_enabled) && sk->sk_cgrp) {

	if (mem_cgroup_sockets_enabled && sk->sk_cgrp) {

		struct mem_cgroup *memcg;

		WARN_ON(!sk->sk_cgrp->memcg);

		memcg = sk->sk_cgrp->memcg;

CRA Git | Maintained and supported by SUSTech CRA and CCSE