From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 800393019CB; Wed, 21 Jan 2026 01:23:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768958612; cv=none; b=ASGeiNgR6RP6D3iksQd5E8lZNjXJdcj2ZwDW4I64r9PkuUUNaMEgS5PYH1FW1/6zBtCW7TjK5Qb0Zn23+OxJUhzXcsewZ7BKDWKx6AIwsUNV3P4g5bEExtKyfQO5YnC5jFwtU23sYuL4YCC8eJIk8Fg746n5x9ILZlSPpdnSqrA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768958612; c=relaxed/simple; bh=ZVl8zwmV6QFDiCpZpunlApXWiZSpvgx9ANB4Zbbvq54=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=VImXREtndSNc6D09LBXeOpufVgaL2UaAh8kGwqpCCnogvi5gb8B5y4m8ETM+74fPG0iDLnaXwUbF23VEqgVs+eDHRC9nDUmGf0fPMlkxHL+X/Szr3du6273TxKeXiMhJx7V8IwqvPgEk5kB1oxI2NGEqJhakLqBQnPEHPc5Bg2I= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=VkFNPLSv; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="VkFNPLSv" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D1BA9C16AAE; Wed, 21 Jan 2026 01:23:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1768958612; bh=ZVl8zwmV6QFDiCpZpunlApXWiZSpvgx9ANB4Zbbvq54=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VkFNPLSvzo+DpxZQvBkGFk+s0/VVGhwTKonm70yPVUipnem0lkGFHkFg3aW8p5HHQ W53/kKHypPZSaONS4VA3YWUnseKKKC561SL8XGG5dnTdmgZ+sxFhf9QuuMWUwVVSF3 FJvgthbMMmbUCIVKQfDaBjVow+hc/xg3+Qc3ElIQlUVbmdNYBBa5UeuXbvLEUabT85 GVwTFOtwYMslFgaFOZSmPGnXpA0NOyKj61kb8nFD1UpkTKz9RQ1bz8xG/jrJlxun1a esiKQcgb4AFoLa6xCf18zWq0T/C4EwebmfWEmYx7+Llx8CzsZB3koEnrpjQFxvs+1j X7bHe9WfR5YXg== From: SeongJae Park To: stable@vger.kernel.org Cc: damon@lists.linux.dev, SeongJae Park , chongjiapeng , Andrew Morton Subject: [PATCH 6.1.y] mm/damon/sysfs-scheme: cleanup quotas subdirs on scheme dir setup failure Date: Tue, 20 Jan 2026 17:23:21 -0800 Message-ID: <20260121012321.243917-1-sj@kernel.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <2026012002-resume-although-c862@gregkh> References: <2026012002-resume-although-c862@gregkh> Precedence: bulk X-Mailing-List: damon@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit When a DAMOS-scheme DAMON sysfs directory setup fails after setup of quotas/ directory, subdirectories of quotas/ 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-4-sj@kernel.org Fixes: 1b32234ab087 ("mm/damon/sysfs: support DAMOS watermarks") Signed-off-by: SeongJae Park Cc: chongjiapeng Cc: # 5.18.x Signed-off-by: Andrew Morton (cherry picked from commit dc7e1d75fd8c505096d0cddeca9e2efb2b55aaf9) Signed-off-by: SeongJae Park --- mm/damon/sysfs.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/mm/damon/sysfs.c b/mm/damon/sysfs.c index 18f459a3c9fff..9621e31016f85 100644 --- a/mm/damon/sysfs.c +++ b/mm/damon/sysfs.c @@ -859,7 +859,7 @@ static int damon_sysfs_scheme_add_dirs(struct damon_sysfs_scheme *scheme) goto put_access_pattern_out; err = damon_sysfs_scheme_set_watermarks(scheme); if (err) - goto put_quotas_access_pattern_out; + goto rmdir_put_quotas_access_pattern_out; err = damon_sysfs_scheme_set_stats(scheme); if (err) goto put_watermarks_quotas_access_pattern_out; @@ -868,7 +868,8 @@ static int damon_sysfs_scheme_add_dirs(struct damon_sysfs_scheme *scheme) put_watermarks_quotas_access_pattern_out: kobject_put(&scheme->watermarks->kobj); scheme->watermarks = NULL; -put_quotas_access_pattern_out: +rmdir_put_quotas_access_pattern_out: + damon_sysfs_quotas_rm_dirs(scheme->quotas); kobject_put(&scheme->quotas->kobj); scheme->quotas = NULL; put_access_pattern_out: -- 2.47.3