From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1795034626; b=T2RA650RROdIzEIpscSG74h+IltPJPvGOq1WQQIJp46Ie4/TNRQWTm/2QYgJE1/UNPn8 BxUHP11YBvIcjikT2O3rglptxi8o5W2COuuzrUFBJEpKJYFOMgzRHQi+PKI04onnMyaIi fDjbEj41H1XknrDy3UGSbi/61TRfeIgjNYDOrc+1prqh7OKvV0iu4r5Ju8Yp94AIZn4u0 kiVih+PTvR3Mxr7uK2RrKpMaLhQM9GLyOCF1UnXYxb/ssLNBcLNpN7YpajMpt1S3Tl4hk JHPNrzhSVNW5xzK7jNb7H2Y5GtP8Wzm8hKaNXeqgaWLIEffV8/950agPxWZzp/Zl6Eg== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795034626; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:User-Agent:X-stable:X-Patchwork-Hint: MIME-Version:Content-Transfer-Encoding; bh=2sVyESWBnhO5q+jwHpBmbjhzLFvGwhd/m5Jz+PbHFp0=; b=e/XvwVI/kLAqFsbcA2hITU7xu53O4g3ojEPSuweI4gH4PyQBzIkdXMU7sQcaK23bSvp9 fDBWgymKI0UlLjyI1joQH2WA0Ps34yLWhJSoxQWEAZHziN4oUUjqfXbpql2+FITw15bvb /ejpqN3HM5LSDrA/0sX/Y27+4jknFacGWYbP1dEbIxSxIAKAHmntR9LRn4jbBJveABc3j I+k61g8UlJs3OoDpFkY7eS17pgjdwayehmYb7ILHw4ivF5Opq4OywNP59iC3o/mCCGGN7 JlWOh8MQy42ST8WVF3LMHgt967CdNfz70cwK3OFRAb+7yssHKO7g0CWU2xtJaWLJf+g== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=BnLF8exl; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5122A60A2604; Wed, 18 Nov 2026 20:43:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=BnLF8exl Received: by smtp.kernel.org (Postfix) with ESMTPSA id 41CAC1F000C7; Wed, 18 Nov 2026 20:43:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1795034626; bh=2sVyESWBnhO5q+jwHpBmbjhzLFvGwhd/m5Jz+PbHFp0=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=BnLF8exlI9GHt2nCqRHO6LszzkS+L7Glw+FJMKQhBkRNpXccfQWq7MnQtmXCu6Gwn XlfxziY1MGSHkILn/iJNMrFrlDrui5XPaAVZnljt4BZEkrmq4IMZu7dfZoODTSUDY8 OQ7M9BPrbjz/f4SBNvZrV4+W+kVSUcvwEyAbVwNs= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Dev Jain , Muchun Song , "David Hildenbrand (Arm)" , Alistair Popple , Andi Kleen , Anshuman Khandual , Byungchul Park , Catalin Marinas , Dave Hansen , Gregory Price , Harry Yoo , "Huang, Ying" , Jann Horn , Josh Poimboeuf , Joshua Hahn , =?UTF-8?q?Junichi=20 Nick =20Nomura?= , Kiryl Shutsemau , Lance Yang , "Liam R. Howlett" , Lorenzo Stoakes , Matthew Brost , Mel Gorman , Naoya Horiguchi , Oscar Salvador , Pedro Falcato , Rakie Kim , Ralph Campbell , Rik van Riel , Ryan Roberts , Vlastimil Babka , Will Deacon , Zi Yan , Andrew Morton , Sasha Levin Subject: [PATCH 6.6 0387/3318] mm/rmap: use huge_ptep_get() in try_to_migrate_one() Date: Wed, 18 Nov 2026 15:16:49 +0100 Message-ID: <20261118150327.916635838@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261118150313.527275416@linuxfoundation.org> References: <20261118150313.527275416@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: patches@lists.linux.dev List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Dev Jain [ Upstream commit 9be12ffa78cd087d41086f937a156435d4e588e9 ] try_to_migrate_one() is used by folio migration to replace a present mapping with a migration entry. For hugetlb folios, page_vma_mapped_walk() returns the pte pointer to the hugetlb folio in pvmw.pte, but the code reads the huge pte entry with ptep_get(). On arches which provide their own huge_ptep_get() to dereference a huge pte pointer, accessing via ptep_get() would cause pte_pfn(), pte_present() etc to misbehave. It is not clear whether this has a trivially visible effect to userspace. Use huge_ptep_get() to dereference a huge pte pointer. Commit a98a2f0c8ce1 copied the bug from try_to_unmap_one into try_to_migrate_one. [akpm@linux-foundation.org: coding-style cleanups] Link: https://lore.kernel.org/20260703114202.365553-4-dev.jain@arm.com Fixes: a98a2f0c8ce1 ("mm/rmap: split migration into its own function") Signed-off-by: Dev Jain Acked-by: Muchun Song Acked-by: David Hildenbrand (Arm) Cc: Alistair Popple Cc: Andi Kleen Cc: Anshuman Khandual Cc: Byungchul Park Cc: Catalin Marinas Cc: Dave Hansen Cc: Gregory Price Cc: Harry Yoo Cc: "Huang, Ying" Cc: Jann Horn Cc: Josh Poimboeuf Cc: Joshua Hahn Cc: Jun'ichi "Nick" Nomura Cc: Kiryl Shutsemau Cc: Lance Yang Cc: Liam R. Howlett Cc: Lorenzo Stoakes Cc: Matthew Brost Cc: Mel Gorman Cc: Naoya Horiguchi Cc: Oscar Salvador Cc: Pedro Falcato Cc: Rakie Kim Cc: Ralph Campbell Cc: Rik van Riel Cc: Ryan Roberts Cc: Vlastimil Babka Cc: Will Deacon Cc: Zi Yan Cc: Signed-off-by: Andrew Morton [ sashal: Used the one-argument huge_ptep_get(pvmw.pte) instead of the three-argument form, and dropped the softleaf rewrite and the address move that this tree doesn't support. ] Signed-off-by: Sasha Levin --- mm/rmap.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/mm/rmap.c b/mm/rmap.c index 639a5f762d6c8..bdd32890d5487 100644 --- a/mm/rmap.c +++ b/mm/rmap.c @@ -1895,7 +1895,11 @@ static bool try_to_migrate_one(struct folio *folio, struct vm_area_struct *vma, /* Unexpected PMD-mapped THP? */ VM_BUG_ON_FOLIO(!pvmw.pte, folio); - pfn = pte_pfn(ptep_get(pvmw.pte)); + if (folio_test_hugetlb(folio)) + pteval = huge_ptep_get(pvmw.pte); + else + pteval = ptep_get(pvmw.pte); + pfn = pte_pfn(pteval); if (folio_is_zone_device(folio)) { /* -- 2.53.0