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 9DBAB302750 for ; Wed, 21 Jan 2026 01:16:15 +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=1768958175; cv=none; b=hxtyf5Z5He+0X/MtjA7zdYI2/AZS6GyJZ8pSeGQHpU97RzvgRk2GBuqFrPL7D/OIueM8oy/pKWy3VG1D5I3b51RElUs5/SOeiN/auHFq7zZ7NIydsmbgJU7eFAnAuc33eBOsct1P2wg7rJ3otbOrKFcROOMk//WjUy4H8nV16/k= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768958175; c=relaxed/simple; bh=9v9Cet/tLsIbGyg5HU0NBA44amp0wB6CYglulzZc3RU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=PFMQmSTmPSzPSY8hhg+yLmGL10nFzzs0NjdHM9orudUInnw9+XLCzSBJdu6pqV1UhcO79ou3d4DjI9KnIKSlHaNExvPkhWJQR+G05clXVsWfnFWcLJZs1xxn/NO95svn2PQWkxMkV7kmk+DVc40qKocfnizxWYHV/OA+tsWbs5o= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=F6oZkCC/; 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="F6oZkCC/" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 05094C16AAE; Wed, 21 Jan 2026 01:16:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1768958175; bh=9v9Cet/tLsIbGyg5HU0NBA44amp0wB6CYglulzZc3RU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=F6oZkCC/OZBC9X1oc/y+KJC9EpvyWhkARk54K8dSBuB+1/6A5Tr0GNUWwW1nSMcAN cq+HGNjFRzc7ojV+cK5AG6UJls+fkt1JW55FPgXtIb5nbBikXI9w8KXjr7deM2fgAc JFocfqxab9ns7b6oLoQBWpe6Ru5XLdtjAv1qV6jPGAqEoM2oswqK0WXtmTdZkJxBCK 0rr9j/qh8p5z3eCdkMwYMu7IVO5XGnGejqulZQQYASibWad6Z2tjqAkjYSuRS7GP2h E2th7oUBE7yVI4fdtB5tczPA0WEXTrlIRPvSlAv3perVwqkAXkORbr3eq5I8mS9RRJ O6k1YAqmsq8GQ== From: SeongJae Park To: stable@vger.kernel.org Cc: damon@lists.linux-dev, SeongJae Park , chongjiapeng , Andrew Morton Subject: [PATCH 6.6.y] mm/damon/sysfs-scheme: cleanup access_pattern subdirs on scheme dir setup failure Date: Tue, 20 Jan 2026 17:16:08 -0800 Message-ID: <20260121011608.167602-1-sj@kernel.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <2026012015-democracy-snowdrop-9f8c@gregkh> References: <2026012015-democracy-snowdrop-9f8c@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-schemes.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/mm/damon/sysfs-schemes.c b/mm/damon/sysfs-schemes.c index 19d661889cf79..2d081df6b2c16 100644 --- a/mm/damon/sysfs-schemes.c +++ b/mm/damon/sysfs-schemes.c @@ -1282,9 +1282,10 @@ static int damon_sysfs_scheme_add_dirs(struct damon_sysfs_scheme *scheme) err = damon_sysfs_scheme_set_access_pattern(scheme); if (err) 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; @@ -1311,7 +1312,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