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 301A233A6E2 for ; Mon, 15 Jun 2026 22:52:37 +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=1781563958; cv=none; b=BdqQEB1iD7rmo2RrBmeb6HxGzMKoD+BqO8W2jkdDBucutr1eTdgIGRcsld9mDsnQhiELiPUpSeizKIXbxc2aVphCx9eGb6/qN1yBs44ffiKAN3FZEPgkUaJxZ+RzmfPrAJwpYkthOafbn8NmdrixERT+RTUiWUPwbr7mgpJD+1U= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781563958; c=relaxed/simple; bh=vK7U92GBSn6kfYoxz+DT7CVIBlEaka7Y8boJhmDM4OA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=bJZUcmka0xmu6R/yAMQZmmu6QbjzzMv5t1dyv4bDA4wuIf1/miBFIr1rtmZE+M9q8Vfve48DTjk8UuZbNGlOUIEOTTlQSItidnmL9PEho9XDUEahtL61Qa8vX8mA+nyFlFgIdJRNxMkunxk8voZPRUq0OHGaWX61Zomo/dOXzJQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=KQa74io7; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="KQa74io7" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5BE151F000E9; Mon, 15 Jun 2026 22:52:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1781563957; bh=0GFs4O2Q7lHnz+oyRZGzqXMb5TIUW1yK3MW98AsNtqQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=KQa74io7fnKc4beSWszb9ixSEw3wx6bX+7qjnAjV3+TM9mtVRq2wZvznH6zPOi2N8 yCdi1T0yz1+bBlIa962DRNPt9CgHO37SbXqs8zdIxEeYqi6umY7L2ZU2d/rfNm5P4V 2LG4QJyq8qj27VskZ1EEUosF9i/IANMSc/A55/F/XudgTVOpZU2XImadoDZkV2TfW3 Kle+INRm8bO+BruARYP0TE8q0eTEC7WIRR2e2oE9dBC7mm2Ra/S748e3Pcg69D547X ctwYVO+/vtJJY4YqjHQYawQIQG+915DktRfEeDQG9z82F3LL/QPjHAMjtXFyzMZe4G 3mzuhe/ZXt9Hg== From: Sasha Levin To: stable@vger.kernel.org Cc: 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 , Sasha Levin Subject: [PATCH 6.6.y] mm/huge_memory: update file PMD counter before folio_put() Date: Mon, 15 Jun 2026 18:52:33 -0400 Message-ID: <20260615225233.2520866-1-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <2026061508-robin-cupid-c1e8@gregkh> References: <2026061508-robin-cupid-c1e8@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Yin Tirui [ Upstream commit 8d878059924f12c1bc24556a92ec56add74de3c8 ] __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 [ changed folio API calls (folio_remove_rmap_pmd/mm_counter_file(folio)/folio_put) to page-based equivalents (page_remove_rmap/mm_counter_file(page)/put_page) ] Signed-off-by: Sasha Levin --- mm/huge_memory.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mm/huge_memory.c b/mm/huge_memory.c index 78f5df12b8eb37..4443cc44cbf9f1 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -2095,7 +2095,9 @@ static void __split_huge_pmd_locked(struct vm_area_struct *vma, pmd_t *pmd, if (!PageReferenced(page) && pmd_young(old_pmd)) SetPageReferenced(page); page_remove_rmap(page, vma, true); + add_mm_counter(mm, mm_counter_file(page), -HPAGE_PMD_NR); put_page(page); + return; } add_mm_counter(mm, mm_counter_file(page), -HPAGE_PMD_NR); return; -- 2.53.0