diff mbox series

[04/20] mm/memcontrol: remove CONFIG_SLAB #ifdef guards

Message ID	20231113191340.17482-26-vbabka@suse.cz
State	New
Headers	Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) client-ip=23.128.96.32; From: Vlastimil Babka <vbabka@suse.cz> To: David Rientjes <rientjes@google.com>, Christoph Lameter <cl@linux.com>, Pekka Enberg <penberg@kernel.org>, Joonsoo Kim <iamjoonsoo.kim@lge.com> Cc: Andrew Morton <akpm@linux-foundation.org>, Hyeonggon Yoo <42.hyeyoo@gmail.com>, Roman Gushchin <roman.gushchin@linux.dev>, linux-mm@kvack.org, linux-kernel@vger.kernel.org, patches@lists.linux.dev, Andrey Ryabinin <ryabinin.a.a@gmail.com>, Alexander Potapenko <glider@google.com>, Andrey Konovalov <andreyknvl@gmail.com>, Dmitry Vyukov <dvyukov@google.com>, Vincenzo Frascino <vincenzo.frascino@arm.com>, Marco Elver <elver@google.com>, Johannes Weiner <hannes@cmpxchg.org>, Michal Hocko <mhocko@kernel.org>, Shakeel Butt <shakeelb@google.com>, Muchun Song <muchun.song@linux.dev>, Kees Cook <keescook@chromium.org>, kasan-dev@googlegroups.com, cgroups@vger.kernel.org, Vlastimil Babka <vbabka@suse.cz> Subject: [PATCH 04/20] mm/memcontrol: remove CONFIG_SLAB #ifdef guards Date: Mon, 13 Nov 2023 20:13:45 +0100 Message-ID: <20231113191340.17482-26-vbabka@suse.cz> In-Reply-To: <20231113191340.17482-22-vbabka@suse.cz> References: <20231113191340.17482-22-vbabka@suse.cz> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	remove the SLAB allocator \| [00/20] remove the SLAB allocator [01/20] mm/slab: remove CONFIG_SLAB from all Kconfig and Makefile [02/20] KASAN: remove code paths guarded by CONFIG_SLAB [03/20] KFENCE: cleanup kfence_guarded_alloc() after CONFIG_SLAB removal [04/20] mm/memcontrol: remove CONFIG_SLAB #ifdef guards [05/20] cpu/hotplug: remove CPUHP_SLAB_PREPARE hooks [06/20] mm/slab: remove CONFIG_SLAB code from slab common code [07/20] mm/mempool/dmapool: remove CONFIG_DEBUG_SLAB ifdefs [08/20] mm/slab: remove mm/slab.c and slab_def.h [09/20] mm/slab: move struct kmem_cache_cpu declaration to slub.c [10/20] mm/slab: move the rest of slub_def.h to mm/slab.h [11/20] mm/slab: consolidate includes in the internal mm/slab.h [12/20] mm/slab: move pre/post-alloc hooks from slab.h to slub.c [13/20] mm/slab: move memcg related functions from slab.h to slub.c [14/20] mm/slab: move struct kmem_cache_node from slab.h to slub.c [15/20] mm/slab: move kfree() from slab_common.c to slub.c [16/20] mm/slab: move kmalloc_slab() to mm/slab.h [17/20] mm/slab: move kmalloc() functions from slab_common.c to slub.c [18/20] mm/slub: remove slab_alloc() and __kmem_cache_alloc_lru() wrappers [19/20] mm/slub: optimize alloc fastpath code layout [20/20] mm/slub: optimize free fast path code layout

Commit Message

Vlastimil Babka Nov. 13, 2023, 7:13 p.m. UTC

  With SLAB removed, these are never true anymore so we can clean up.

Signed-off-by: Vlastimil Babka <vbabka@suse.cz>
---
 mm/memcontrol.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

Comments

Kees Cook Nov. 14, 2023, 4:14 a.m. UTC | #1

On Mon, Nov 13, 2023 at 08:13:45PM +0100, Vlastimil Babka wrote:
> With SLAB removed, these are never true anymore so we can clean up.
> 
> Signed-off-by: Vlastimil Babka <vbabka@suse.cz>

Reviewed-by: Kees Cook <keescook@chromium.org>

Michal Hocko Nov. 14, 2023, 11:14 a.m. UTC | #2

On Mon 13-11-23 20:13:45, Vlastimil Babka wrote:
> With SLAB removed, these are never true anymore so we can clean up.
> 
> Signed-off-by: Vlastimil Babka <vbabka@suse.cz>

Acked-by: Michal Hocko <mhocko@suse.com>

> ---
>  mm/memcontrol.c | 5 ++---
>  1 file changed, 2 insertions(+), 3 deletions(-)
> 
> diff --git a/mm/memcontrol.c b/mm/memcontrol.c
> index 774bd6e21e27..947fb50eba31 100644
> --- a/mm/memcontrol.c
> +++ b/mm/memcontrol.c
> @@ -5149,7 +5149,7 @@ static ssize_t memcg_write_event_control(struct kernfs_open_file *of,
>  	return ret;
>  }
>  
> -#if defined(CONFIG_MEMCG_KMEM) && (defined(CONFIG_SLAB) || defined(CONFIG_SLUB_DEBUG))
> +#if defined(CONFIG_MEMCG_KMEM) && defined(CONFIG_SLUB_DEBUG)
>  static int mem_cgroup_slab_show(struct seq_file *m, void *p)
>  {
>  	/*
> @@ -5258,8 +5258,7 @@ static struct cftype mem_cgroup_legacy_files[] = {
>  		.write = mem_cgroup_reset,
>  		.read_u64 = mem_cgroup_read_u64,
>  	},
> -#if defined(CONFIG_MEMCG_KMEM) && \
> -	(defined(CONFIG_SLAB) || defined(CONFIG_SLUB_DEBUG))
> +#if defined(CONFIG_MEMCG_KMEM) && defined(CONFIG_SLUB_DEBUG)
>  	{
>  		.name = "kmem.slabinfo",
>  		.seq_show = mem_cgroup_slab_show,
> -- 
> 2.42.1

diff mbox series

Patch

diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index 774bd6e21e27..947fb50eba31 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -5149,7 +5149,7 @@  static ssize_t memcg_write_event_control(struct kernfs_open_file *of,
 	return ret;
 }
 
-#if defined(CONFIG_MEMCG_KMEM) && (defined(CONFIG_SLAB) || defined(CONFIG_SLUB_DEBUG))
+#if defined(CONFIG_MEMCG_KMEM) && defined(CONFIG_SLUB_DEBUG)
 static int mem_cgroup_slab_show(struct seq_file *m, void *p)
 {
 	/*
@@ -5258,8 +5258,7 @@  static struct cftype mem_cgroup_legacy_files[] = {
 		.write = mem_cgroup_reset,
 		.read_u64 = mem_cgroup_read_u64,
 	},
-#if defined(CONFIG_MEMCG_KMEM) && \
-	(defined(CONFIG_SLAB) || defined(CONFIG_SLUB_DEBUG))
+#if defined(CONFIG_MEMCG_KMEM) && defined(CONFIG_SLUB_DEBUG)
 	{
 		.name = "kmem.slabinfo",
 		.seq_show = mem_cgroup_slab_show,