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 351434F4753 for ; Fri, 4 Sep 2026 15:27:50 +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=1788535674; cv=none; b=gNOS5vSbHkiDoqnfoU47sawpwlCOAtQYW5OmbgHnHSXTKXcaWPHIbLlHqOtdedMOgr5BY/cr6DN+rlrc/jC5LgTe4vmlhC0lcygZkYNzCbzp5Tpr2TK9qFG69lrR2ioTy0AQF2GWVm4+6HWeqAYXghugun31ZMWng6FoDPbZJkg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788535674; c=relaxed/simple; bh=FELDwohOmiYdQZuAML6nr1BibkNNkKbkedriZdWWYr0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=XEL7hYmKm3x4PV7oO2GDJzRYaKj2CRaBsNiuMlCPKOaMRwnnyui8qLqpt8fgZb9NzcNptVCo0q+ffSdFk2t5ulLJNHTR3eWlxO977Xs80r2c7N9bf6VCauTAaY3xWUi78THRhGhAVlkzgG85nQKEC94lcbaBmV4V6BWtAJwWaAU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=DTGzbL4x; 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="DTGzbL4x" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E89501F00A3E; Fri, 4 Sep 2026 15:27:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1788535670; bh=uNSrfzNyNRGhnukm69lGD9qtsH2dPd4uc7H6l/Qr6G8=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=DTGzbL4xAOPwHfH16m1Hl5shfSewOsrQsCF/4BWyzi301M/0vsBzRL2UJZh7Cam8c knF3t11CmHROS5h1oJfWYyhezPoF5VL3RB3jN8Ds+3zOMZc6tcdC/8TqqQrvOcYu+I oGmCiGGZQgW8vjlOTE1i/AufXmKK5qX3VNJ6TigE9cG8NW34G0JuPBdSzwQRQEjDw3 NJO6r4OK49LZlt/cxFpCyO65QtVO+cPH5JRax8Fp7cRRwBySlYlwhJt6BD+pOxKV35 4pAweIZSl/6ylOYptkDw8UT33w6FU1CcDdPcN4In2J4eYRaNXxYUZ2qlpA9EQ5G+9w FX19wrCFE12Yw== From: Sasha Levin To: stable@vger.kernel.org Cc: 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 , 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.1.y 5/5] mm/page_vma_mapped: use huge_ptep_get() for hugetlb Date: Fri, 4 Sep 2026 11:27:41 -0400 Message-ID: <20260904152741.898549-5-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260904152741.898549-1-sashal@kernel.org> References: <2026090326-freestyle-gratify-7686@gregkh> <20260904152741.898549-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 Signed-off-by: Sasha Levin --- mm/page_vma_mapped.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/mm/page_vma_mapped.c b/mm/page_vma_mapped.c index db442094ee8de..927650d4e2d63 100644 --- a/mm/page_vma_mapped.c +++ b/mm/page_vma_mapped.c @@ -75,7 +75,13 @@ static bool map_pte(struct page_vma_mapped_walk *pvmw) static bool check_pte(struct page_vma_mapped_walk *pvmw) { 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->vma->vm_mm, pvmw->address, + pvmw->pte); + else + ptent = ptep_get(pvmw->pte); if (pvmw->flags & PVMW_MIGRATION) { swp_entry_t entry; -- 2.53.0