From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 D477447279F; Tue, 16 Jun 2026 16:31:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781627480; cv=none; b=CJuNmTUvOJO2hEcTKaQben+iwHCoC/WanL2nJvjZhdpCh6Fls4OUwqfweq+M+JzKIAJMIInQ9gRBPs+0EcTyG2zCEwd4B6722Z2a5I0irt63XHtNbCpoOJKWerm7Uj0J8lvqO8wPIKPp+OYVPi/gs3x6sFvICx2HgM96eXrhpfg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781627480; c=relaxed/simple; bh=g/FVpmqh6z1mH1a+vqR3ic/0z6xzEwICHlLLl0DBJZM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=o3Q/jpXGplux39uSW/aBBJRD9FAswiFFcASfw0HsnsETLgpp9olT7hT849rH2j4bycPSxrKVAzAn4sPUkjlSpOZTy+h+q9M9CPNtKcrDYZLxF5uwTW1dZtEeaZZ2RP+WFnpvWDPsQhrDPVpGCfs2YyvRDv+g1u3PK3Nlj5VdS0Q= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=tom63gzb; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="tom63gzb" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5A1161F000E9; Tue, 16 Jun 2026 16:31:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1781627479; bh=RN+inHkTL8vQ2j6XLR8hDOq/yhBAh5nGwuT1R57TmLg=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=tom63gzbtvU8OA4OJVnBWr6yuKSjZwnz5keiF5Tq0NSqtTaVOtk4SYKHn17axYtgj ASUShmQjInYuWsf5std6yyBPJoB+tcHCL4F222uGDSllYhxHxP/oDHGN5THntabVnJ eK14OqQuyL8X8OQfW9P76R2Rr2CbrOtos3qYSHQ8= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Yin Tirui , Lorenzo Stoakes , "David Hildenbrand (arm)" , Lance Yang , Dev Jain , Baolin Wang , Barry Song , Chen Jun , Kefeng Wang , "Liam R. Howlett" , Nico Pache , Ryan Roberts , Vlastimil Babka , Yang Shi , Zi Yan , Andrew Morton Subject: [PATCH 6.12 148/261] mm/huge_memory: update file PMD counter before folio_put() Date: Tue, 16 Jun 2026 20:29:46 +0530 Message-ID: <20260616145051.936824012@linuxfoundation.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260616145044.869532709@linuxfoundation.org> References: <20260616145044.869532709@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Yin Tirui commit 8d878059924f12c1bc24556a92ec56add74de3c8 upstream. __split_huge_pmd_locked() updates the file/shmem RSS counter after dropping the PMD mapping's folio reference. If folio_put() drops the last reference, mm_counter_file() can later read freed folio state via folio_test_swapbacked(). Move the counter update before folio_put(). Link: https://lore.kernel.org/20260526101337.1984081-1-yintirui@huawei.com Fixes: fadae2953072 ("thp: use mm_file_counter to determine update which rss counter") Signed-off-by: Yin Tirui Reviewed-by: Lorenzo Stoakes Acked-by: David Hildenbrand (arm) Reviewed-by: Lance Yang Reviewed-by: Dev Jain Cc: Baolin Wang Cc: Barry Song Cc: Chen Jun Cc: Kefeng Wang Cc: Liam R. Howlett Cc: Nico Pache Cc: Ryan Roberts Cc: Vlastimil Babka Cc: Yang Shi Cc: Zi Yan Cc: Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman --- mm/huge_memory.c | 2 ++ 1 file changed, 2 insertions(+) --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -2701,7 +2701,9 @@ static void __split_huge_pmd_locked(stru if (!folio_test_referenced(folio) && pmd_young(old_pmd)) folio_set_referenced(folio); folio_remove_rmap_pmd(folio, page, vma); + add_mm_counter(mm, mm_counter_file(folio), -HPAGE_PMD_NR); folio_put(folio); + return; } add_mm_counter(mm, mm_counter_file(folio), -HPAGE_PMD_NR); return;