Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ef12947c authored by Johannes Weiner's avatar Johannes Weiner Committed by Linus Torvalds
Browse files

mm: memcontrol: switch to the updated jump-label API 



According to <linux/jump_label.h> the direct use of struct static_key is
deprecated.  Update the socket and slab accounting code accordingly.

Signed-off-by: default avatarJohannes Weiner <hannes@cmpxchg.org>
Acked-by: default avatarDavid S. Miller <davem@davemloft.net>
Reported-by: default avatarJason Baron <jbaron@akamai.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 8e8ae645

include/linux/memcontrol.h

+4 −4
Original line number Diff line number Diff line
@@ -704,8 +704,8 @@ void sock_release_memcg(struct sock *sk); 
bool mem_cgroup_charge_skmem(struct mem_cgroup *memcg, unsigned int nr_pages);

void mem_cgroup_uncharge_skmem(struct mem_cgroup *memcg, unsigned int nr_pages);

#if defined(CONFIG_MEMCG) && defined(CONFIG_INET)

extern struct static_key memcg_sockets_enabled_key;

#define mem_cgroup_sockets_enabled static_key_false(&memcg_sockets_enabled_key)

extern struct static_key_false memcg_sockets_enabled_key;

#define mem_cgroup_sockets_enabled static_branch_unlikely(&memcg_sockets_enabled_key)

static inline bool mem_cgroup_under_socket_pressure(struct mem_cgroup *memcg)

{

#ifdef CONFIG_MEMCG_KMEM
@@ -727,7 +727,7 @@ static inline bool mem_cgroup_under_socket_pressure(struct mem_cgroup *memcg) 
#endif



#ifdef CONFIG_MEMCG_KMEM

extern struct static_key memcg_kmem_enabled_key;

extern struct static_key_false memcg_kmem_enabled_key;



extern int memcg_nr_cache_ids;

void memcg_get_cache_ids(void);
@@ -743,7 +743,7 @@ void memcg_put_cache_ids(void); 


static inline bool memcg_kmem_enabled(void)

{

	return static_key_false(&memcg_kmem_enabled_key);

	return static_branch_unlikely(&memcg_kmem_enabled_key);

}



static inline bool memcg_kmem_is_active(struct mem_cgroup *memcg)

mm/memcontrol.c

+6 −6
Original line number Diff line number Diff line
@@ -346,7 +346,7 @@ void memcg_put_cache_ids(void) 
 * conditional to this static branch, we'll have to allow modules that does

 * kmem_cache_alloc and the such to see this symbol as well

 */

struct static_key memcg_kmem_enabled_key;

DEFINE_STATIC_KEY_FALSE(memcg_kmem_enabled_key);

EXPORT_SYMBOL(memcg_kmem_enabled_key);



#endif /* CONFIG_MEMCG_KMEM */
@@ -2907,7 +2907,7 @@ static int memcg_activate_kmem(struct mem_cgroup *memcg, 
	err = page_counter_limit(&memcg->kmem, nr_pages);

	VM_BUG_ON(err);



	static_key_slow_inc(&memcg_kmem_enabled_key);

	static_branch_inc(&memcg_kmem_enabled_key);

	/*

	 * A memory cgroup is considered kmem-active as soon as it gets

	 * kmemcg_id. Setting the id after enabling static branching will
@@ -3646,7 +3646,7 @@ static void memcg_destroy_kmem(struct mem_cgroup *memcg) 
{

	if (memcg->kmem_acct_activated) {

		memcg_destroy_kmem_caches(memcg);

		static_key_slow_dec(&memcg_kmem_enabled_key);

		static_branch_dec(&memcg_kmem_enabled_key);

		WARN_ON(page_counter_read(&memcg->kmem));

	}

	tcp_destroy_cgroup(memcg);
@@ -4282,7 +4282,7 @@ mem_cgroup_css_online(struct cgroup_subsys_state *css) 


#ifdef CONFIG_INET

	if (cgroup_subsys_on_dfl(memory_cgrp_subsys) && !cgroup_memory_nosocket)

		static_key_slow_inc(&memcg_sockets_enabled_key);

		static_branch_inc(&memcg_sockets_enabled_key);

#endif



	/*
@@ -4333,7 +4333,7 @@ static void mem_cgroup_css_free(struct cgroup_subsys_state *css) 
	memcg_destroy_kmem(memcg);

#ifdef CONFIG_INET

	if (cgroup_subsys_on_dfl(memory_cgrp_subsys) && !cgroup_memory_nosocket)

		static_key_slow_dec(&memcg_sockets_enabled_key);

		static_branch_dec(&memcg_sockets_enabled_key);

#endif

	__mem_cgroup_free(memcg);

}
@@ -5557,7 +5557,7 @@ void mem_cgroup_replace_page(struct page *oldpage, struct page *newpage) 


#ifdef CONFIG_INET



struct static_key memcg_sockets_enabled_key;

DEFINE_STATIC_KEY_FALSE(memcg_sockets_enabled_key);

EXPORT_SYMBOL(memcg_sockets_enabled_key);



void sock_update_memcg(struct sock *sk)

net/ipv4/tcp_memcontrol.c

+2 −2
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ void tcp_destroy_cgroup(struct mem_cgroup *memcg) 
		return;



	if (memcg->tcp_mem.active)

		static_key_slow_dec(&memcg_sockets_enabled_key);

		static_branch_dec(&memcg_sockets_enabled_key);

}



static int tcp_update_limit(struct mem_cgroup *memcg, unsigned long nr_pages)
@@ -65,7 +65,7 @@ static int tcp_update_limit(struct mem_cgroup *memcg, unsigned long nr_pages) 
		 * because when this value change, the code to process it is not

		 * patched in yet.

		 */

		static_key_slow_inc(&memcg_sockets_enabled_key);

		static_branch_inc(&memcg_sockets_enabled_key);

		memcg->tcp_mem.active = true;

	}