erofs: use spin_lock to protect workgroup tree

Signed-off-by: wulan17 <wulan17@nusantararom.org>
xiaomi-mt6765-devs · Feb 2, 2024 · db56f1e · db56f1e
1 parent 5554e2f
commit db56f1e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/fs/erofs/internal.h b/fs/erofs/internal.h
@@ -61,6 +61,7 @@ struct erofs_sb_info {
 
 	/* the dedicated workstation for compression */
 	struct radix_tree_root workstn_tree;
+	spinlock_t tree_lock;
 
 	/* threshold for decompression synchronously */
 	unsigned int max_sync_decompress_pages;

diff --git a/fs/erofs/super.c b/fs/erofs/super.c
@@ -571,6 +571,7 @@ static int erofs_fill_super(struct super_block *sb, void *data, int silent)
 
 #ifdef CONFIG_EROFS_FS_ZIP
 	INIT_RADIX_TREE(&sbi->workstn_tree, GFP_ATOMIC);
+	spin_lock_init(&sbi->tree_lock);
 #endif
 
 	/* get the root inode */

diff --git a/fs/erofs/utils.c b/fs/erofs/utils.c
@@ -84,7 +84,7 @@ int erofs_register_workgroup(struct super_block *sb,
 		return err;
 
 	sbi = EROFS_SB(sb);
-	xa_lock(&sbi->workstn_tree);
+	spin_lock(&sbi->tree_lock);
 
 	/*
 	 * Bump up reference count before making this workgroup
@@ -101,7 +101,7 @@ int erofs_register_workgroup(struct super_block *sb,
 		 */
 		__erofs_workgroup_put(grp);
 
-	xa_unlock(&sbi->workstn_tree);
+	spin_unlock(&sbi->tree_lock);
 	radix_tree_preload_end();
 	return err;
 }
@@ -167,7 +167,7 @@ static unsigned long erofs_shrink_workstation(struct erofs_sb_info *sbi,
 
 	int i, found;
 repeat:
-	xa_lock(&sbi->workstn_tree);
+	spin_lock(&sbi->tree_lock);
 
 	found = radix_tree_gang_lookup(&sbi->workstn_tree,
 				       batch, first_index, PAGEVEC_SIZE);
@@ -185,7 +185,7 @@ static unsigned long erofs_shrink_workstation(struct erofs_sb_info *sbi,
 		if (!--nr_shrink)
 			break;
 	}
-	xa_unlock(&sbi->workstn_tree);
+	spin_unlock(&sbi->tree_lock);
 
 	if (i && nr_shrink)
 		goto repeat;