diff for duplicates of <20151130215007.GA31903@cmpxchg.org> diff --git a/a/1.txt b/N1/1.txt index 44edd30..161e825 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -8,140 +8,3 @@ Good point. There is another struct static_key in there as well. How about the following on top of this series? --- -From b784aa0323628d43272e13a67ead2a2ce0e93ea6 Mon Sep 17 00:00:00 2001 -From: Johannes Weiner <hannes@cmpxchg.org> -Date: Mon, 30 Nov 2015 16:41:38 -0500 -Subject: [PATCH] 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. - -Reported-by: Jason Baron <jbaron@akamai.com> -Signed-off-by: Johannes Weiner <hannes@cmpxchg.org> ---- - include/linux/memcontrol.h | 8 ++++---- - mm/memcontrol.c | 12 ++++++------ - net/ipv4/tcp_memcontrol.c | 4 ++-- - 3 files changed, 12 insertions(+), 12 deletions(-) - -diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h -index a8df46c..9a19590 100644 ---- a/include/linux/memcontrol.h -+++ b/include/linux/memcontrol.h -@@ -704,8 +704,8 @@ static inline void mem_cgroup_wb_stats(struct bdi_writeback *wb, - - #ifdef CONFIG_INET - struct sock; --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) - void sock_update_memcg(struct sock *sk); - void sock_release_memcg(struct sock *sk); - bool mem_cgroup_charge_skmem(struct mem_cgroup *memcg, unsigned int nr_pages); -@@ -727,7 +727,7 @@ static inline bool mem_cgroup_under_socket_pressure(struct mem_cgroup *memcg) - #endif /* CONFIG_INET */ - - #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) -diff --git a/mm/memcontrol.c b/mm/memcontrol.c -index a0da91f..5fe45d68 100644 ---- a/mm/memcontrol.c -+++ b/mm/memcontrol.c -@@ -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 */ -@@ -2883,7 +2883,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 -@@ -3622,7 +3622,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); -@@ -4258,7 +4258,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 - - /* -@@ -4302,7 +4302,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); - } -@@ -5494,7 +5494,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) -diff --git a/net/ipv4/tcp_memcontrol.c b/net/ipv4/tcp_memcontrol.c -index 9a22e2d..18bc7f7 100644 ---- a/net/ipv4/tcp_memcontrol.c -+++ b/net/ipv4/tcp_memcontrol.c -@@ -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; - } - --- -2.6.2 - --- -To unsubscribe, send a message with 'unsubscribe linux-mm' in -the body to majordomo@kvack.org. For more info on Linux MM, -see: http://www.linux-mm.org/ . -Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a> diff --git a/a/content_digest b/N1/content_digest index a5ace6b..761921f 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -28,143 +28,6 @@ "Good point. There is another struct static_key in there as well. How\n" "about the following on top of this series?\n" "\n" - "---\n" - "From b784aa0323628d43272e13a67ead2a2ce0e93ea6 Mon Sep 17 00:00:00 2001\n" - "From: Johannes Weiner <hannes@cmpxchg.org>\n" - "Date: Mon, 30 Nov 2015 16:41:38 -0500\n" - "Subject: [PATCH] mm: memcontrol: switch to the updated jump-label API\n" - "\n" - "According to <linux/jump_label.h> the direct use of struct static_key\n" - "is deprecated. Update the socket and slab accounting code accordingly.\n" - "\n" - "Reported-by: Jason Baron <jbaron@akamai.com>\n" - "Signed-off-by: Johannes Weiner <hannes@cmpxchg.org>\n" - "---\n" - " include/linux/memcontrol.h | 8 ++++----\n" - " mm/memcontrol.c | 12 ++++++------\n" - " net/ipv4/tcp_memcontrol.c | 4 ++--\n" - " 3 files changed, 12 insertions(+), 12 deletions(-)\n" - "\n" - "diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h\n" - "index a8df46c..9a19590 100644\n" - "--- a/include/linux/memcontrol.h\n" - "+++ b/include/linux/memcontrol.h\n" - "@@ -704,8 +704,8 @@ static inline void mem_cgroup_wb_stats(struct bdi_writeback *wb,\n" - " \n" - " #ifdef CONFIG_INET\n" - " struct sock;\n" - "-extern struct static_key memcg_sockets_enabled_key;\n" - "-#define mem_cgroup_sockets_enabled static_key_false(&memcg_sockets_enabled_key)\n" - "+extern struct static_key_false memcg_sockets_enabled_key;\n" - "+#define mem_cgroup_sockets_enabled static_branch_unlikely(&memcg_sockets_enabled_key)\n" - " void sock_update_memcg(struct sock *sk);\n" - " void sock_release_memcg(struct sock *sk);\n" - " bool mem_cgroup_charge_skmem(struct mem_cgroup *memcg, unsigned int nr_pages);\n" - "@@ -727,7 +727,7 @@ static inline bool mem_cgroup_under_socket_pressure(struct mem_cgroup *memcg)\n" - " #endif /* CONFIG_INET */\n" - " \n" - " #ifdef CONFIG_MEMCG_KMEM\n" - "-extern struct static_key memcg_kmem_enabled_key;\n" - "+extern struct static_key_false memcg_kmem_enabled_key;\n" - " \n" - " extern int memcg_nr_cache_ids;\n" - " void memcg_get_cache_ids(void);\n" - "@@ -743,7 +743,7 @@ void memcg_put_cache_ids(void);\n" - " \n" - " static inline bool memcg_kmem_enabled(void)\n" - " {\n" - "-\treturn static_key_false(&memcg_kmem_enabled_key);\n" - "+\treturn static_branch_unlikely(&memcg_kmem_enabled_key);\n" - " }\n" - " \n" - " static inline bool memcg_kmem_is_active(struct mem_cgroup *memcg)\n" - "diff --git a/mm/memcontrol.c b/mm/memcontrol.c\n" - "index a0da91f..5fe45d68 100644\n" - "--- a/mm/memcontrol.c\n" - "+++ b/mm/memcontrol.c\n" - "@@ -346,7 +346,7 @@ void memcg_put_cache_ids(void)\n" - " * conditional to this static branch, we'll have to allow modules that does\n" - " * kmem_cache_alloc and the such to see this symbol as well\n" - " */\n" - "-struct static_key memcg_kmem_enabled_key;\n" - "+DEFINE_STATIC_KEY_FALSE(memcg_kmem_enabled_key);\n" - " EXPORT_SYMBOL(memcg_kmem_enabled_key);\n" - " \n" - " #endif /* CONFIG_MEMCG_KMEM */\n" - "@@ -2883,7 +2883,7 @@ static int memcg_activate_kmem(struct mem_cgroup *memcg,\n" - " \terr = page_counter_limit(&memcg->kmem, nr_pages);\n" - " \tVM_BUG_ON(err);\n" - " \n" - "-\tstatic_key_slow_inc(&memcg_kmem_enabled_key);\n" - "+\tstatic_branch_inc(&memcg_kmem_enabled_key);\n" - " \t/*\n" - " \t * A memory cgroup is considered kmem-active as soon as it gets\n" - " \t * kmemcg_id. Setting the id after enabling static branching will\n" - "@@ -3622,7 +3622,7 @@ static void memcg_destroy_kmem(struct mem_cgroup *memcg)\n" - " {\n" - " \tif (memcg->kmem_acct_activated) {\n" - " \t\tmemcg_destroy_kmem_caches(memcg);\n" - "-\t\tstatic_key_slow_dec(&memcg_kmem_enabled_key);\n" - "+\t\tstatic_branch_dec(&memcg_kmem_enabled_key);\n" - " \t\tWARN_ON(page_counter_read(&memcg->kmem));\n" - " \t}\n" - " \ttcp_destroy_cgroup(memcg);\n" - "@@ -4258,7 +4258,7 @@ mem_cgroup_css_online(struct cgroup_subsys_state *css)\n" - " \n" - " #ifdef CONFIG_INET\n" - " \tif (cgroup_subsys_on_dfl(memory_cgrp_subsys) && !cgroup_memory_nosocket)\n" - "-\t\tstatic_key_slow_inc(&memcg_sockets_enabled_key);\n" - "+\t\tstatic_branch_inc(&memcg_sockets_enabled_key);\n" - " #endif\n" - " \n" - " \t/*\n" - "@@ -4302,7 +4302,7 @@ static void mem_cgroup_css_free(struct cgroup_subsys_state *css)\n" - " \tmemcg_destroy_kmem(memcg);\n" - " #ifdef CONFIG_INET\n" - " \tif (cgroup_subsys_on_dfl(memory_cgrp_subsys) && !cgroup_memory_nosocket)\n" - "-\t\tstatic_key_slow_dec(&memcg_sockets_enabled_key);\n" - "+\t\tstatic_branch_dec(&memcg_sockets_enabled_key);\n" - " #endif\n" - " \t__mem_cgroup_free(memcg);\n" - " }\n" - "@@ -5494,7 +5494,7 @@ void mem_cgroup_replace_page(struct page *oldpage, struct page *newpage)\n" - " \n" - " #ifdef CONFIG_INET\n" - " \n" - "-struct static_key memcg_sockets_enabled_key;\n" - "+DEFINE_STATIC_KEY_FALSE(memcg_sockets_enabled_key);\n" - " EXPORT_SYMBOL(memcg_sockets_enabled_key);\n" - " \n" - " void sock_update_memcg(struct sock *sk)\n" - "diff --git a/net/ipv4/tcp_memcontrol.c b/net/ipv4/tcp_memcontrol.c\n" - "index 9a22e2d..18bc7f7 100644\n" - "--- a/net/ipv4/tcp_memcontrol.c\n" - "+++ b/net/ipv4/tcp_memcontrol.c\n" - "@@ -34,7 +34,7 @@ void tcp_destroy_cgroup(struct mem_cgroup *memcg)\n" - " \t\treturn;\n" - " \n" - " \tif (memcg->tcp_mem.active)\n" - "-\t\tstatic_key_slow_dec(&memcg_sockets_enabled_key);\n" - "+\t\tstatic_branch_dec(&memcg_sockets_enabled_key);\n" - " }\n" - " \n" - " static int tcp_update_limit(struct mem_cgroup *memcg, unsigned long nr_pages)\n" - "@@ -65,7 +65,7 @@ static int tcp_update_limit(struct mem_cgroup *memcg, unsigned long nr_pages)\n" - " \t\t * because when this value change, the code to process it is not\n" - " \t\t * patched in yet.\n" - " \t\t */\n" - "-\t\tstatic_key_slow_inc(&memcg_sockets_enabled_key);\n" - "+\t\tstatic_branch_inc(&memcg_sockets_enabled_key);\n" - " \t\tmemcg->tcp_mem.active = true;\n" - " \t}\n" - " \n" - "-- \n" - "2.6.2\n" - "\n" - "--\n" - "To unsubscribe, send a message with 'unsubscribe linux-mm' in\n" - "the body to majordomo@kvack.org. For more info on Linux MM,\n" - "see: http://www.linux-mm.org/ .\n" - "Don't email: <a href=mailto:\"dont@kvack.org\"> email@kvack.org </a>" + --- -0879c116d9d6b86cc5920f1bea90911f1587ff98171498e52e74a88281e5314d +b0b5da81d2ec7afe47d01aeaca6bc1ffb79c8fdb9f5ab191e351e00716bb211a
diff --git a/a/1.txt b/N2/1.txt index 44edd30..2226d05 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -8,7 +8,7 @@ Good point. There is another struct static_key in there as well. How about the following on top of this series? --- -From b784aa0323628d43272e13a67ead2a2ce0e93ea6 Mon Sep 17 00:00:00 2001 +>From b784aa0323628d43272e13a67ead2a2ce0e93ea6 Mon Sep 17 00:00:00 2001 From: Johannes Weiner <hannes@cmpxchg.org> Date: Mon, 30 Nov 2015 16:41:38 -0500 Subject: [PATCH] mm: memcontrol: switch to the updated jump-label API @@ -139,9 +139,3 @@ index 9a22e2d..18bc7f7 100644 -- 2.6.2 - --- -To unsubscribe, send a message with 'unsubscribe linux-mm' in -the body to majordomo@kvack.org. For more info on Linux MM, -see: http://www.linux-mm.org/ . -Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a> diff --git a/a/content_digest b/N2/content_digest index a5ace6b..3f33fb4 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -29,7 +29,7 @@ "about the following on top of this series?\n" "\n" "---\n" - "From b784aa0323628d43272e13a67ead2a2ce0e93ea6 Mon Sep 17 00:00:00 2001\n" + ">From b784aa0323628d43272e13a67ead2a2ce0e93ea6 Mon Sep 17 00:00:00 2001\n" "From: Johannes Weiner <hannes@cmpxchg.org>\n" "Date: Mon, 30 Nov 2015 16:41:38 -0500\n" "Subject: [PATCH] mm: memcontrol: switch to the updated jump-label API\n" @@ -159,12 +159,6 @@ " \t}\n" " \n" "-- \n" - "2.6.2\n" - "\n" - "--\n" - "To unsubscribe, send a message with 'unsubscribe linux-mm' in\n" - "the body to majordomo@kvack.org. For more info on Linux MM,\n" - "see: http://www.linux-mm.org/ .\n" - "Don't email: <a href=mailto:\"dont@kvack.org\"> email@kvack.org </a>" + 2.6.2 -0879c116d9d6b86cc5920f1bea90911f1587ff98171498e52e74a88281e5314d +62ccd41d841f5dff13266215db03a19b227fae4fd7e9ef21a6c874cded0afc94
diff --git a/a/1.txt b/N3/1.txt index 44edd30..dc8b3e4 100644 --- a/a/1.txt +++ b/N3/1.txt @@ -8,7 +8,7 @@ Good point. There is another struct static_key in there as well. How about the following on top of this series? --- -From b784aa0323628d43272e13a67ead2a2ce0e93ea6 Mon Sep 17 00:00:00 2001 +>From b784aa0323628d43272e13a67ead2a2ce0e93ea6 Mon Sep 17 00:00:00 2001 From: Johannes Weiner <hannes@cmpxchg.org> Date: Mon, 30 Nov 2015 16:41:38 -0500 Subject: [PATCH] mm: memcontrol: switch to the updated jump-label API diff --git a/a/content_digest b/N3/content_digest index a5ace6b..4067462 100644 --- a/a/content_digest +++ b/N3/content_digest @@ -29,7 +29,7 @@ "about the following on top of this series?\n" "\n" "---\n" - "From b784aa0323628d43272e13a67ead2a2ce0e93ea6 Mon Sep 17 00:00:00 2001\n" + ">From b784aa0323628d43272e13a67ead2a2ce0e93ea6 Mon Sep 17 00:00:00 2001\n" "From: Johannes Weiner <hannes@cmpxchg.org>\n" "Date: Mon, 30 Nov 2015 16:41:38 -0500\n" "Subject: [PATCH] mm: memcontrol: switch to the updated jump-label API\n" @@ -167,4 +167,4 @@ "see: http://www.linux-mm.org/ .\n" "Don't email: <a href=mailto:\"dont@kvack.org\"> email@kvack.org </a>" -0879c116d9d6b86cc5920f1bea90911f1587ff98171498e52e74a88281e5314d +80b33baf580a3b3e35ec29d913ce00d5f5fb130f6d22ec83a9b2c2001c84528a
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.