Skip to content

Commit 392b3d9

Browse files
sjp38akpm00
authored andcommitted
mm/damon/sysfs-scheme: cleanup access_pattern subdirs on scheme dir setup failure
When a DAMOS-scheme DAMON sysfs directory setup fails after setup of access_pattern/ directory, subdirectories of access_pattern/ directory are not cleaned up. As a result, DAMON sysfs interface is nearly broken until the system reboots, and the memory for the unremoved directory is leaked. Cleanup the directories under such failures. Link: https://lkml.kernel.org/r/20251225023043.18579-5-sj@kernel.org Fixes: 9bbb820 ("mm/damon/sysfs: support DAMOS quotas") Signed-off-by: SeongJae Park <sj@kernel.org> Cc: chongjiapeng <jiapeng.chong@linux.alibaba.com> Cc: <stable@vger.kernel.org> # 5.18.x Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
1 parent dc7e1d7 commit 392b3d9

1 file changed

Lines changed: 3 additions & 2 deletions

File tree

mm/damon/sysfs-schemes.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2152,7 +2152,7 @@ static int damon_sysfs_scheme_add_dirs(struct damon_sysfs_scheme *scheme)
21522152
return err;
21532153
err = damos_sysfs_set_dests(scheme);
21542154
if (err)
2155-
goto put_access_pattern_out;
2155+
goto rmdir_put_access_pattern_out;
21562156
err = damon_sysfs_scheme_set_quotas(scheme);
21572157
if (err)
21582158
goto put_dests_out;
@@ -2190,7 +2190,8 @@ static int damon_sysfs_scheme_add_dirs(struct damon_sysfs_scheme *scheme)
21902190
put_dests_out:
21912191
kobject_put(&scheme->dests->kobj);
21922192
scheme->dests = NULL;
2193-
put_access_pattern_out:
2193+
rmdir_put_access_pattern_out:
2194+
damon_sysfs_access_pattern_rm_dirs(scheme->access_pattern);
21942195
kobject_put(&scheme->access_pattern->kobj);
21952196
scheme->access_pattern = NULL;
21962197
return err;

0 commit comments

Comments
 (0)