[PATCH] mm: remove useless lines in enable_cpucache()

[PATCH] mm: remove useless lines in enable_cpucache()

[Shi Lei]

These lines are useless, so remove them.

Signed-off-by: Shi Lei <shi_lei@massclouds.com>
---
 mm/slab.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/mm/slab.c b/mm/slab.c
index 4d826394ffcb..01775fe0e002 100644
--- a/mm/slab.c
+++ b/mm/slab.c
@@ -3900,8 +3900,6 @@ static int enable_cpucache(struct kmem_cache *cachep, gfp_t gfp)
 	if (err)
 		goto end;
 
-	if (limit && shared && batchcount)
-		goto skip_setup;
 	/*
 	 * The head array serves three purposes:
 	 * - create a LIFO ordering, i.e. return objects that are cache-warm
@@ -3944,7 +3942,6 @@ static int enable_cpucache(struct kmem_cache *cachep, gfp_t gfp)
 		limit = 32;
 #endif
 	batchcount = (limit + 1) / 2;
-skip_setup:
 	err = do_tune_cpucache(cachep, limit, batchcount, shared, gfp);
 end:
 	if (err)
-- 
2.25.1

Re: [PATCH] mm: remove useless lines in enable_cpucache()

[Vlastimil Babka]

On 9/30/21 05:48, Shi Lei wrote:
> These lines are useless, so remove them.

I would clarify that they are useless after commit 10befea91b61 ("mm:
memcg/slab: use a single set of kmem_caches for all allocations")



> Signed-off-by: Shi Lei <shi_lei@massclouds.com>

Reviewed-by: Vlastimil Babka <vbabka@suse.cz>

> ---
>  mm/slab.c | 3 ---
>  1 file changed, 3 deletions(-)
> 
> diff --git a/mm/slab.c b/mm/slab.c
> index 4d826394ffcb..01775fe0e002 100644
> --- a/mm/slab.c
> +++ b/mm/slab.c
> @@ -3900,8 +3900,6 @@ static int enable_cpucache(struct kmem_cache *cachep, gfp_t gfp)
>  	if (err)
>  		goto end;
>  
> -	if (limit && shared && batchcount)
> -		goto skip_setup;
>  	/*
>  	 * The head array serves three purposes:
>  	 * - create a LIFO ordering, i.e. return objects that are cache-warm
> @@ -3944,7 +3942,6 @@ static int enable_cpucache(struct kmem_cache *cachep, gfp_t gfp)
>  		limit = 32;
>  #endif
>  	batchcount = (limit + 1) / 2;
> -skip_setup:
>  	err = do_tune_cpucache(cachep, limit, batchcount, shared, gfp);
>  end:
>  	if (err)
> 

Re: [PATCH] mm: remove useless lines in enable_cpucache()

[David Rientjes]

On Thu, 30 Sep 2021, Shi Lei wrote:

> These lines are useless, so remove them.
> 
> Signed-off-by: Shi Lei <shi_lei@massclouds.com>

Acked-by: David Rientjes <rientjes@google.com>