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 6002042A96; Wed, 21 Jan 2026 01:25:59 +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=1768958759; cv=none; b=KrRMijRJtLykQWFxLDI2lcqHr6Lqp6iqWUI6ISX3DXBLZMuVhKmNPwlAVVApmLWiW5BpDDqH46BZ2scLxV44GVHe0cr+GJMj0BgRze88YfZcJ9KPpN5r0TfPsA7rYBJBfVqMftKXUimtM8uZF3lAzAgrsuNtauZ4E9+phM2ak6A= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768958759; c=relaxed/simple; bh=oxHPTh/zDNyXXpPXyNaGy5UyL4F+G/F+9SZr67xEFKU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=QHTXeM1i5rirGlRmkEHEhxaPf73sIw2vykZsmACJNC8mRpS1Tbv9FYabdVAwbFTY/+rwOh7k2uT0Lss5UP4ItMRwzvQDc0eLmGqpT0QuLVc2+9wm0T6CVofYfkx4i/SQKCoetqqLeO+IKZ1y/V57JLrc/bm/jlLOPMdTKzGR0+M= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=PmlxBwta; 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="PmlxBwta" Received: by smtp.kernel.org (Postfix) with ESMTPSA id BDB05C16AAE; Wed, 21 Jan 2026 01:25:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1768958758; bh=oxHPTh/zDNyXXpPXyNaGy5UyL4F+G/F+9SZr67xEFKU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=PmlxBwtadyCuT+gLNWEwqHNChRLZCQOe4U95xpN3d2xSfgf9sA4y+LKfsgEFGU+Qt uqMgSyBXlVUScocUmAW7UDp4YMsMH77w0ZUtSbDEHfJUduaEAo/xrbztYOEpD49nHy +EiLdGTnlnCTmHsTNGTjwfpKjyn+YuwJMB0LsedL3gvf5sSfOg/0QnhSqhPy7ulz2L JAWpQR3uMoMAkT7NxDpcsw7Z9NqGopFjoRONStvOFzCP6iHQvEKalZdA+fp5GZWfY7 56+FFTHWoOtkrjbli4ylv6liUxSkNELPzI5Ta0gGgcs6qR/YFwtTYT+WbHMHzrqfFi UvyXlhsCSMnLw== 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 access_pattern subdirs on scheme dir setup failure Date: Tue, 20 Jan 2026 17:25:49 -0800 Message-ID: <20260121012549.251984-1-sj@kernel.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <2026012015-plank-morphing-040c@gregkh> References: <2026012015-plank-morphing-040c@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org 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 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: 9bbb820a5bd5 ("mm/damon/sysfs: support DAMOS quotas") Signed-off-by: SeongJae Park Cc: chongjiapeng Cc: # 5.18.x Signed-off-by: Andrew Morton (cherry picked from commit 392b3d9d595f34877dd745b470c711e8ebcd225c) 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..1b85a0beeaaa4 100644 --- a/mm/damon/sysfs.c +++ b/mm/damon/sysfs.c @@ -856,7 +856,7 @@ static int damon_sysfs_scheme_add_dirs(struct damon_sysfs_scheme *scheme) return err; err = damon_sysfs_scheme_set_quotas(scheme); if (err) - goto put_access_pattern_out; + goto rmdir_put_access_pattern_out; err = damon_sysfs_scheme_set_watermarks(scheme); if (err) goto put_quotas_access_pattern_out; @@ -871,7 +871,8 @@ static int damon_sysfs_scheme_add_dirs(struct damon_sysfs_scheme *scheme) put_quotas_access_pattern_out: kobject_put(&scheme->quotas->kobj); scheme->quotas = NULL; -put_access_pattern_out: +rmdir_put_access_pattern_out: + damon_sysfs_access_pattern_rm_dirs(scheme->access_pattern); kobject_put(&scheme->access_pattern->kobj); scheme->access_pattern = NULL; return err; -- 2.47.3