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=1795034490; b=A9qA9kKCaBN1Mk8fpBLKXXiwlyPbt10Q1LOeel5RFNnWvZQHXWRFnssQZySdvcqjP7/i RbSwDmthmtdnpdGT4UxmXNY9qThl7U6DfiO3hPemmdMoSfxuD9x+DNxlpalYLkcIDtEJ3 rfvWlk+ir8NgvYvVt3U74PkA53ZLUQ+bq0oo1PKxGklzpmCHZKrjam9eMujFSlzkj//wg Cyr2T6Qt7O/sz9Y7Lt1KEW3elM0a/4WaU82krK9swxLnASLZw53M215vUTfe/nmAkOVvN iNKUwkTssTmh/lxZm/SNTiLkTQ61EGW8CWlZdUNc6sQYSJFdbLRFR36xoqBk2zEQwRw== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795034490; 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=v7mMBQLMuEM6pF5PpnSdwZjuHoHOsXsb9JgSZ/djLjI=; b=JfmCda+xVjbh6/NsILyYu2oLf4skhhVhLTdm92lT2owT31SqCcTrXrJePp1GjA/5EOPr Djc9xnSWjGdgkWu80KNFDQuMHEJ+zkCkaAvXEee71GzewfakzVe0LNFTDorhjqFIAVSv2 WytRzCNzYXLeyZuUcIo6w/PQkKDH17dM5ZmR8VsRVv7WnudZMJxRqqqrBRYMX6vD1UETI 8mn9guHAUSxIkri/BhNQ+pPz9gidXc1FGjCqUbBAV9Lygr4YKzC0Pf1a3d4L8D/qiVimb XAz8XSmT8yXs31j09pWkkS8TjAaFcmXaMrQYld0FmNXCJPL+xKN4klpQ7bBCTBf+XSw== 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=QX0QGk5i; 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 8F6A9606A31C; Wed, 18 Nov 2026 20:41:30 +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=QX0QGk5i Received: by smtp.kernel.org (Postfix) with ESMTPSA id B8DC61F000C4; Wed, 18 Nov 2026 20:41:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1795034490; bh=v7mMBQLMuEM6pF5PpnSdwZjuHoHOsXsb9JgSZ/djLjI=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=QX0QGk5i5PUPgtEgNUowiYs03DwqBORxCR4B7BG50hA5cAo1golPsgQbv7iIybMjp lUSanY0/nXktLKYdf7RHhHMFoGp8SB5ZAd/mFHcE3sdKXjtGmhzW1lID4hyCWaLURR gHylRCuihU0HWTcx4l/GhLNPW+A6O2eHJtTZDJJk= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Dev Jain , "David Hildenbrand (Arm)" , Muchun Song , 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 0389/3318] mm/page_vma_mapped: use huge_ptep_get() for hugetlb Date: Wed, 18 Nov 2026 15:16:51 +0100 Message-ID: <20261118150327.993936541@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 e87df0d5d6962bde50f55f6d02b779daa394f894 ] check_pte() is the final validation step in page_vma_mapped_walk(). It reads pvmw->pte with ptep_get() to decide whether the entry maps the PFN range being walked. For hugetlb VMAs, that pointer refers to a hugetlb entry. 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. Link: https://lore.kernel.org/20260703114202.365553-6-dev.jain@arm.com Fixes: ace71a19cec5 ("mm: introduce page_vma_mapped_walk()") Signed-off-by: Dev Jain Acked-by: David Hildenbrand (Arm) Reviewed-by: Muchun Song 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: Adapted the huge_ptep_get() call in check_pte() to the older single-argument form, passing only pvmw->pte. ] Signed-off-by: Sasha Levin --- mm/page_vma_mapped.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/mm/page_vma_mapped.c b/mm/page_vma_mapped.c index dcc1ee3d059e9..c7e8ccd1aa06f 100644 --- a/mm/page_vma_mapped.c +++ b/mm/page_vma_mapped.c @@ -97,7 +97,12 @@ static bool map_pte(struct page_vma_mapped_walk *pvmw, spinlock_t **ptlp) static bool check_pte(struct page_vma_mapped_walk *pvmw, unsigned long pte_nr) { unsigned long pfn; - pte_t ptent = ptep_get(pvmw->pte); + pte_t ptent; + + if (is_vm_hugetlb_page(pvmw->vma)) + ptent = huge_ptep_get(pvmw->pte); + else + ptent = ptep_get(pvmw->pte); if (pvmw->flags & PVMW_MIGRATION) { swp_entry_t entry; -- 2.53.0