tmakin/tegra-linux-noble
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

erofs: get rid of erofs_{find,insert}_workgroup

Browse Source 
BugLink: https://bugs.launchpad.net/bugs/2111953

[ Upstream commit b091e8ed24b7965953147a389bac1dc7c3e8a11c ]

Just fold them into the only two callers since
they are simple enough.

Reviewed-by: Chao Yu <chao@kernel.org>
Signed-off-by: Gao Xiang <hsiangkao@linux.alibaba.com>
Link: https://lore.kernel.org/r/20241021035323.3280682-1-hsiangkao@linux.alibaba.com
Stable-dep-of: db902986dee4 ("erofs: fix potential return value overflow of z_erofs_shrink_scan()")
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Manuel Diewald <manuel.diewald@canonical.com>
Signed-off-by: Mehmet Basaran <mehmet.basaran@canonical.com>
This commit is contained in:
Gao Xiang
2024-10-21 11:53:21 +08:00
committed by Mehmet Basaran
parent 1cf1b64ec8
commit dfd686ae18
3 changed files with 30 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fs/erofs/internal.h
+1 -4
View File
@@ -448,10 +448,7 @@ void erofs_release_pages(struct page **pagepool);
#ifdef CONFIG_EROFS_FS_ZIP
void erofs_workgroup_put(struct erofs_workgroup *grp);
struct erofs_workgroup *erofs_find_workgroup(struct super_block *sb,
pgoff_t index);
struct erofs_workgroup *erofs_insert_workgroup(struct super_block *sb,
struct erofs_workgroup *grp);
bool erofs_workgroup_get(struct erofs_workgroup *grp);
void erofs_workgroup_free_rcu(struct erofs_workgroup *grp);
void erofs_shrinker_register(struct super_block *sb);
void erofs_shrinker_unregister(struct super_block *sb);
fs/erofs/utils.c
+1 -49
View File
@@ -32,7 +32,7 @@ void erofs_release_pages(struct page **pagepool)
/* global shrink count (for all mounted EROFS instances) */
static atomic_long_t erofs_global_shrink_cnt;
static bool erofs_workgroup_get(struct erofs_workgroup *grp)
bool erofs_workgroup_get(struct erofs_workgroup *grp)
{
if (lockref_get_not_zero(&grp->lockref))
return true;
@@ -49,54 +49,6 @@ static bool erofs_workgroup_get(struct erofs_workgroup *grp)
return true;
}
struct erofs_workgroup *erofs_find_workgroup(struct super_block *sb,
pgoff_t index)
{
struct erofs_sb_info *sbi = EROFS_SB(sb);
struct erofs_workgroup *grp;
repeat:
rcu_read_lock();
grp = xa_load(&sbi->managed_pslots, index);
if (grp) {
if (!erofs_workgroup_get(grp)) {
/* prefer to relax rcu read side */
rcu_read_unlock();
goto repeat;
}
DBG_BUGON(index != grp->index);
}
rcu_read_unlock();
return grp;
}
struct erofs_workgroup *erofs_insert_workgroup(struct super_block *sb,
struct erofs_workgroup *grp)
{
struct erofs_sb_info *const sbi = EROFS_SB(sb);
struct erofs_workgroup *pre;
DBG_BUGON(grp->lockref.count < 1);
repeat:
xa_lock(&sbi->managed_pslots);
pre = __xa_cmpxchg(&sbi->managed_pslots, grp->index,
NULL, grp, GFP_KERNEL);
if (pre) {
if (xa_is_err(pre)) {
pre = ERR_PTR(xa_err(pre));
} else if (!erofs_workgroup_get(pre)) {
/* try to legitimize the current in-tree one */
xa_unlock(&sbi->managed_pslots);
cond_resched();
goto repeat;
}
grp = pre;
}
xa_unlock(&sbi->managed_pslots);
return grp;
}
static void __erofs_workgroup_free(struct erofs_workgroup *grp)
{
atomic_long_dec(&erofs_global_shrink_cnt);
fs/erofs/zdata.c
+28 -10
View File
@@ -775,9 +775,10 @@ static int z_erofs_register_pcluster(struct z_erofs_decompress_frontend *fe)
{
struct erofs_map_blocks *map = &fe->map;
struct super_block *sb = fe->inode->i_sb;
struct erofs_sb_info *sbi = EROFS_SB(sb);
bool ztailpacking = map->m_flags & EROFS_MAP_META;
struct z_erofs_pcluster *pcl;
struct erofs_workgroup *grp;
struct erofs_workgroup *grp, *pre;
int err;
if (!(map->m_flags & EROFS_MAP_ENCODED) ||
@@ -813,15 +814,23 @@ static int z_erofs_register_pcluster(struct z_erofs_decompress_frontend *fe)
pcl->obj.index = 0; /* which indicates ztailpacking */
} else {
pcl->obj.index = erofs_blknr(sb, map->m_pa);
grp = erofs_insert_workgroup(fe->inode->i_sb, &pcl->obj);
if (IS_ERR(grp)) {
err = PTR_ERR(grp);
goto err_out;
while (1) {
xa_lock(&sbi->managed_pslots);
pre = __xa_cmpxchg(&sbi->managed_pslots, grp->index,
NULL, grp, GFP_KERNEL);
if (!pre || xa_is_err(pre) || erofs_workgroup_get(pre)) {
xa_unlock(&sbi->managed_pslots);
break;
}
/* try to legitimize the current in-tree one */
xa_unlock(&sbi->managed_pslots);
cond_resched();
}
if (grp != &pcl->obj) {
fe->pcl = container_of(grp,
if (xa_is_err(pre)) {
err = xa_err(pre);
goto err_out;
} else if (pre) {
fe->pcl = container_of(pre,
struct z_erofs_pcluster, obj);
err = -EEXIST;
goto err_out;
@@ -851,7 +860,16 @@ static int z_erofs_pcluster_begin(struct z_erofs_decompress_frontend *fe)
DBG_BUGON(fe->owned_head == Z_EROFS_PCLUSTER_NIL);
if (!(map->m_flags & EROFS_MAP_META)) {
grp = erofs_find_workgroup(sb, blknr);
while (1) {
rcu_read_lock();
grp = xa_load(&EROFS_SB(sb)->managed_pslots, blknr);
if (!grp || erofs_workgroup_get(grp)) {
DBG_BUGON(grp && blknr != grp->index);
rcu_read_unlock();
break;
}
rcu_read_unlock();
}
} else if ((map->m_pa & ~PAGE_MASK) + map->m_plen > PAGE_SIZE) {
DBG_BUGON(1);
return -EFSCORRUPTED;