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 BCD4E19F40A for ; Tue, 20 Jan 2026 13:09: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=1768914556; cv=none; b=JQKu/5SfEVn+jriNOzuFx05MQhWogtJrgaJph083tvcsiFmSZyfsTeMTICJ4kqH9lqO3hK+XsnMelSZVKUKZJAFBZqayfGuROA9/FGMSskWfIiR9a2Hn+q761CgjlBMeW+CSYx3qhQo2HRowOKa2YUsPlgO2RlTjdzOsRQ3XS8g= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768914556; c=relaxed/simple; bh=sZQ3Lte6JUAYxRwN58Nnbw7fWbYJNCjSI69GrGfbeHw=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=QVQHMd7MME0udMFxCnHni6Pa71XYZ4rcdvlKzZpKecTZYT7vGp8AaPocy9NfzqOGnvN7um1yRWCnZmbdYZYzaWGstA3wK0XgORpSzKVOomR3Wor7f88Yka3jn0GQ0fpfiM7sF4xEMKtnHckT7af2GUYD3pKyjwhnStA6dA2DPgs= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=EmPvD9u3; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="EmPvD9u3" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E6671C16AAE; Tue, 20 Jan 2026 13:09:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1768914555; bh=sZQ3Lte6JUAYxRwN58Nnbw7fWbYJNCjSI69GrGfbeHw=; h=Subject:To:Cc:From:Date:From; b=EmPvD9u3x1hpKPJx9/ZKrT+hP1LF+disZHlk7fQofKEIDBZLYf6IOrClfGSMbIQNJ k89XXOBTDcdQ3EthgPDKWn5POBgOMmFKrhf18vUXX/0EZHk0yXXN4pE0eMw4iDTd1d CWd365xc8o6YhodfKR7e1DqXOQjcMC0mIqvYEhyY= Subject: FAILED: patch "[PATCH] mm/damon/sysfs-scheme: cleanup quotas subdirs on scheme dir" failed to apply to 6.1-stable tree To: sj@kernel.org,akpm@linux-foundation.org,jiapeng.chong@linux.alibaba.com,stable@vger.kernel.org Cc: From: Date: Tue, 20 Jan 2026 14:09:02 +0100 Message-ID: <2026012002-resume-although-c862@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit The patch below does not apply to the 6.1-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.1.y git checkout FETCH_HEAD git cherry-pick -x dc7e1d75fd8c505096d0cddeca9e2efb2b55aaf9 # git commit -s git send-email --to '' --in-reply-to '2026012002-resume-although-c862@gregkh' --subject-prefix 'PATCH 6.1.y' HEAD^.. Possible dependencies: thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From dc7e1d75fd8c505096d0cddeca9e2efb2b55aaf9 Mon Sep 17 00:00:00 2001 From: SeongJae Park Date: Wed, 24 Dec 2025 18:30:36 -0800 Subject: [PATCH] mm/damon/sysfs-scheme: cleanup quotas subdirs on scheme dir setup failure 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 diff --git a/mm/damon/sysfs-schemes.c b/mm/damon/sysfs-schemes.c index 30d20f5b3192..2c7a2b54be57 100644 --- a/mm/damon/sysfs-schemes.c +++ b/mm/damon/sysfs-schemes.c @@ -2158,7 +2158,7 @@ static int damon_sysfs_scheme_add_dirs(struct damon_sysfs_scheme *scheme) goto put_dests_out; err = damon_sysfs_scheme_set_watermarks(scheme); if (err) - goto put_quotas_access_pattern_out; + goto rmdir_put_quotas_access_pattern_out; err = damos_sysfs_set_filter_dirs(scheme); if (err) goto put_watermarks_quotas_access_pattern_out; @@ -2183,7 +2183,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_dests_out: