Received-SPF: pass (google.com: domain of linux-kernel+bounces-116704-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) client-ip=147.75.48.161;
Message-ID: <a3413438-ca3a-4248-8b00-c59ce3808474@suse.cz>
Date: Mon, 25 Mar 2024 09:37:21 +0100
Precedence: bulk
MIME-Version: 1.0
User-Agent: Mozilla Thunderbird
Subject: Re: [PATCH v2 -next] mm/slub: remove dummy slabinfo functions
To: Xiu Jianfeng <xiujianfeng@huaweicloud.com>, cl@linux.com,
 penberg@kernel.org, rientjes@google.com, iamjoonsoo.kim@lge.com,
 akpm@linux-foundation.org, roman.gushchin@linux.dev, 42.hyeyoo@gmail.com
Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, xiujianfeng@huawei.com
References: <20240321131733.268615-1-xiujianfeng@huaweicloud.com>
Content-Language: en-US
From: Vlastimil Babka <vbabka@suse.cz>
In-Reply-To: <20240321131733.268615-1-xiujianfeng@huaweicloud.com>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit

On 3/21/24 2:17 PM, Xiu Jianfeng wrote:
> From: Xiu Jianfeng <xiujianfeng@huawei.com>
> 
> The SLAB implementation has been removed since 6.8, so there is no
> other version of slabinfo_show_stats() and slabinfo_write(), then we
> can remove these two dummy functions.
> 
> Signed-off-by: Xiu Jianfeng <xiujianfeng@huawei.com>

Thanks, added to slab/for-6.10/cleanup

> ---
> v2: correct removed version
> ---
>  mm/slab.h        |  3 ---
>  mm/slab_common.c |  2 --
>  mm/slub.c        | 10 ----------
>  3 files changed, 15 deletions(-)
> 
> diff --git a/mm/slab.h b/mm/slab.h
> index d2bc9b191222..78e205b46e19 100644
> --- a/mm/slab.h
> +++ b/mm/slab.h
> @@ -496,9 +496,6 @@ struct slabinfo {
>  };
>  
>  void get_slabinfo(struct kmem_cache *s, struct slabinfo *sinfo);
> -void slabinfo_show_stats(struct seq_file *m, struct kmem_cache *s);
> -ssize_t slabinfo_write(struct file *file, const char __user *buffer,
> -		       size_t count, loff_t *ppos);
>  
>  #ifdef CONFIG_SLUB_DEBUG
>  #ifdef CONFIG_SLUB_DEBUG_ON
> diff --git a/mm/slab_common.c b/mm/slab_common.c
> index f5234672f03c..67c03d6bd26c 100644
> --- a/mm/slab_common.c
> +++ b/mm/slab_common.c
> @@ -1078,7 +1078,6 @@ static void cache_show(struct kmem_cache *s, struct seq_file *m)
>  		   sinfo.limit, sinfo.batchcount, sinfo.shared);
>  	seq_printf(m, " : slabdata %6lu %6lu %6lu",
>  		   sinfo.active_slabs, sinfo.num_slabs, sinfo.shared_avail);
> -	slabinfo_show_stats(m, s);
>  	seq_putc(m, '\n');
>  }
>  
> @@ -1155,7 +1154,6 @@ static const struct proc_ops slabinfo_proc_ops = {
>  	.proc_flags	= PROC_ENTRY_PERMANENT,
>  	.proc_open	= slabinfo_open,
>  	.proc_read	= seq_read,
> -	.proc_write	= slabinfo_write,
>  	.proc_lseek	= seq_lseek,
>  	.proc_release	= seq_release,
>  };
> diff --git a/mm/slub.c b/mm/slub.c
> index 1bb2a93cf7b6..cc7e68fbdbba 100644
> --- a/mm/slub.c
> +++ b/mm/slub.c
> @@ -7099,14 +7099,4 @@ void get_slabinfo(struct kmem_cache *s, struct slabinfo *sinfo)
>  	sinfo->objects_per_slab = oo_objects(s->oo);
>  	sinfo->cache_order = oo_order(s->oo);
>  }
> -
> -void slabinfo_show_stats(struct seq_file *m, struct kmem_cache *s)
> -{
> -}
> -
> -ssize_t slabinfo_write(struct file *file, const char __user *buffer,
> -		       size_t count, loff_t *ppos)
> -{
> -	return -EIO;
> -}
>  #endif /* CONFIG_SLUB_DEBUG */