diff mbox series

vfs: remove SLAB_MEM_SPREAD flag usage

Message ID 20240224135315.830477-1-chengming.zhou@linux.dev
State New
Headers
Series vfs: remove SLAB_MEM_SPREAD flag usage |

Commit Message

Chengming Zhou Feb. 24, 2024, 1:53 p.m. UTC 
  From: Chengming Zhou <zhouchengming@bytedance.com>

The SLAB_MEM_SPREAD flag is already a no-op as of 6.8-rc1, remove
its usage so we can delete it from slab. No functional change.

Signed-off-by: Chengming Zhou <zhouchengming@bytedance.com>
---
 fs/buffer.c  | 2 +-
 fs/dcache.c  | 2 +-
 fs/inode.c   | 2 +-
 fs/mbcache.c | 3 +--
 4 files changed, 4 insertions(+), 5 deletions(-)

Comments

Chengming Zhou Feb. 26, 2024, 8:58 a.m. UTC | #1 
On 2024/2/24 21:53, chengming.zhou@linux.dev wrote:
> From: Chengming Zhou <zhouchengming@bytedance.com>
> 
> The SLAB_MEM_SPREAD flag is already a no-op as of 6.8-rc1, remove
> its usage so we can delete it from slab. No functional change.

Update changelog to make it clearer:

The SLAB_MEM_SPREAD flag used to be implemented in SLAB, which was
removed as of v6.8-rc1, so it became a dead flag since the commit
16a1d968358a ("mm/slab: remove mm/slab.c and slab_def.h"). And the
series[1] went on to mark it obsolete explicitly to avoid confusion
for users. Here we can just remove all its users, which has no any
functional change.

[1] https://lore.kernel.org/all/20240223-slab-cleanup-flags-v2-1-02f1753e8303@suse.cz/

Thanks!

> 
> Signed-off-by: Chengming Zhou <zhouchengming@bytedance.com>
> ---
>  fs/buffer.c  | 2 +-
>  fs/dcache.c  | 2 +-
>  fs/inode.c   | 2 +-
>  fs/mbcache.c | 3 +--
>  4 files changed, 4 insertions(+), 5 deletions(-)
> 
> diff --git a/fs/buffer.c b/fs/buffer.c
> index b55dea034a5d..9a54077de87d 100644
> --- a/fs/buffer.c
> +++ b/fs/buffer.c
> @@ -3122,7 +3122,7 @@ void __init buffer_init(void)
>  	int ret;
>  
>  	bh_cachep = KMEM_CACHE(buffer_head,
> -				SLAB_RECLAIM_ACCOUNT|SLAB_PANIC|SLAB_MEM_SPREAD);
> +				SLAB_RECLAIM_ACCOUNT|SLAB_PANIC);
>  	/*
>  	 * Limit the bh occupancy to 10% of ZONE_NORMAL
>  	 */
> diff --git a/fs/dcache.c b/fs/dcache.c
> index 6ebccba33336..71a8e943a0fa 100644
> --- a/fs/dcache.c
> +++ b/fs/dcache.c
> @@ -3139,7 +3139,7 @@ static void __init dcache_init(void)
>  	 * of the dcache.
>  	 */
>  	dentry_cache = KMEM_CACHE_USERCOPY(dentry,
> -		SLAB_RECLAIM_ACCOUNT|SLAB_PANIC|SLAB_MEM_SPREAD|SLAB_ACCOUNT,
> +		SLAB_RECLAIM_ACCOUNT|SLAB_PANIC|SLAB_ACCOUNT,
>  		d_iname);
>  
>  	/* Hash may have been set up in dcache_init_early */
> diff --git a/fs/inode.c b/fs/inode.c
> index 6d0d54230363..d2e8e3884b36 100644
> --- a/fs/inode.c
> +++ b/fs/inode.c
> @@ -2286,7 +2286,7 @@ void __init inode_init(void)
>  					 sizeof(struct inode),
>  					 0,
>  					 (SLAB_RECLAIM_ACCOUNT|SLAB_PANIC|
> -					 SLAB_MEM_SPREAD|SLAB_ACCOUNT),
> +					 SLAB_ACCOUNT),
>  					 init_once);
>  
>  	/* Hash may have been set up in inode_init_early */
> diff --git a/fs/mbcache.c b/fs/mbcache.c
> index fe2624e17253..e60a840999aa 100644
> --- a/fs/mbcache.c
> +++ b/fs/mbcache.c
> @@ -426,8 +426,7 @@ EXPORT_SYMBOL(mb_cache_destroy);
>  
>  static int __init mbcache_init(void)
>  {
> -	mb_entry_cache = KMEM_CACHE(mb_cache_entry,
> -					 SLAB_RECLAIM_ACCOUNT | SLAB_MEM_SPREAD);
> +	mb_entry_cache = KMEM_CACHE(mb_cache_entry, SLAB_RECLAIM_ACCOUNT);
>  	if (!mb_entry_cache)
>  		return -ENOMEM;
>  	return 0;
Christian Brauner Feb. 27, 2024, 9:04 a.m. UTC | #2 
On Sat, 24 Feb 2024 13:53:15 +0000, chengming.zhou@linux.dev wrote:
> The SLAB_MEM_SPREAD flag is already a no-op as of 6.8-rc1, remove
> its usage so we can delete it from slab. No functional change.
> 
> 

Commit message was updated to link to SLAB_MEM_SPREAD removal.

---

Applied to the vfs.misc branch of the vfs/vfs.git tree.
Patches in the vfs.misc branch should appear in linux-next soon.

Please report any outstanding bugs that were missed during review in a
new review to the original patch series allowing us to drop it.

It's encouraged to provide Acked-bys and Reviewed-bys even though the
patch has now been applied. If possible patch trailers will be updated.

Note that commit hashes shown below are subject to change due to rebase,
trailer updates or similar. If in doubt, please check the listed branch.

tree:   https://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git
branch: vfs.misc

[1/1] vfs: remove SLAB_MEM_SPREAD flag usage
      https://git.kernel.org/vfs/vfs/c/2b711faa0ee2
diff mbox series

Patch

diff --git a/fs/buffer.c b/fs/buffer.c
index b55dea034a5d..9a54077de87d 100644
--- a/fs/buffer.c
+++ b/fs/buffer.c
@@ -3122,7 +3122,7 @@  void __init buffer_init(void)
 	int ret;
 
 	bh_cachep = KMEM_CACHE(buffer_head,
-				SLAB_RECLAIM_ACCOUNT|SLAB_PANIC|SLAB_MEM_SPREAD);
+				SLAB_RECLAIM_ACCOUNT|SLAB_PANIC);
 	/*
 	 * Limit the bh occupancy to 10% of ZONE_NORMAL
 	 */
diff --git a/fs/dcache.c b/fs/dcache.c
index 6ebccba33336..71a8e943a0fa 100644
--- a/fs/dcache.c
+++ b/fs/dcache.c
@@ -3139,7 +3139,7 @@  static void __init dcache_init(void)
 	 * of the dcache.
 	 */
 	dentry_cache = KMEM_CACHE_USERCOPY(dentry,
-		SLAB_RECLAIM_ACCOUNT|SLAB_PANIC|SLAB_MEM_SPREAD|SLAB_ACCOUNT,
+		SLAB_RECLAIM_ACCOUNT|SLAB_PANIC|SLAB_ACCOUNT,
 		d_iname);
 
 	/* Hash may have been set up in dcache_init_early */
diff --git a/fs/inode.c b/fs/inode.c
index 6d0d54230363..d2e8e3884b36 100644
--- a/fs/inode.c
+++ b/fs/inode.c
@@ -2286,7 +2286,7 @@  void __init inode_init(void)
 					 sizeof(struct inode),
 					 0,
 					 (SLAB_RECLAIM_ACCOUNT|SLAB_PANIC|
-					 SLAB_MEM_SPREAD|SLAB_ACCOUNT),
+					 SLAB_ACCOUNT),
 					 init_once);
 
 	/* Hash may have been set up in inode_init_early */
diff --git a/fs/mbcache.c b/fs/mbcache.c
index fe2624e17253..e60a840999aa 100644
--- a/fs/mbcache.c
+++ b/fs/mbcache.c
@@ -426,8 +426,7 @@  EXPORT_SYMBOL(mb_cache_destroy);
 
 static int __init mbcache_init(void)
 {
-	mb_entry_cache = KMEM_CACHE(mb_cache_entry,
-					 SLAB_RECLAIM_ACCOUNT | SLAB_MEM_SPREAD);
+	mb_entry_cache = KMEM_CACHE(mb_cache_entry, SLAB_RECLAIM_ACCOUNT);
 	if (!mb_entry_cache)
 		return -ENOMEM;
 	return 0;