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 6A6304A5C4A for ; Fri, 4 Sep 2026 20:32:07 +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=1788553932; cv=none; b=ZtGhUDzlZrC0MBvOa5ek/akgqdW5LHsotEiZa7pWiBSyXLxhNLiA9xg2A5XjTl44GhimHm2bYwnG40eSIhKPUMiwHeiqPFbHnF8yXYb6K59T0l3+BT3P55poMFW7PdXLVKQFLxMNbSgoI8LpZZ0iT1gnYft88xpdge+tU1DucOM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788553932; c=relaxed/simple; bh=fiKBn/XLASKhW0bKJCUmDkFyPyClr+dWOvE0vj5uIGY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=bEnhGgL9f7ERmHm91hYRjCJ7uQoh9ouZ1oD2o0PL97huBWaxy11RU5cX617BplUGUxDsnSrtROK8Muv1sRwSuurk0F2FlL2jWKCh/T4nb+t2DH7w1pdvn+sX7cvigdmWWJhZylmmD5cPX9WLH5LYwQEV1DpI6iPlEj4n3qOsSx0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=FhI+89nw; 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="FhI+89nw" Received: by smtp.kernel.org (Postfix) with ESMTPSA id C6D1B1F00ACA; Fri, 4 Sep 2026 20:32:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1788553926; bh=JnIZgHzrEHITN9RNc5kqZtJHtYSSY+gdz6sIQ4v+Kd4=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=FhI+89nwMP1eip/c+1TTWHzw/in016imFEUKqP99RVNJrqyH0iyQ0bwgBciMB/pc9 lmczSqjxW/V0aSj+GXnDbfOwW4CIwb1E08nTmqb9qf8bArpVcu5iHNFhUNZUXLrbFL Rmzuy7q2WK11XuL1ZW9t90u90fX97WRc/c6lXS1NRIJP1KRSAXbL6pYuvN/8869+HZ KDoel3c/iZ+0af4UtUjgkYjlzgzQ5B7TjJ6ecKsMZfQAmXk94/d8fu+z4IQtYYwRCU HZEb8DJjVmX7fQ8jLysrs/8zRaphgWEsWceJ7d0AbBnGrBeCw7ZK48ZW3YL9i4qhkl rKmptNC9nXwaw== 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 5.10.y 2/2] mm/page_vma_mapped: use huge_ptep_get() for hugetlb Date: Fri, 4 Sep 2026 16:32:00 -0400 Message-ID: <20260904203200.1546524-2-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260904203200.1546524-1-sashal@kernel.org> References: <2026090327-numerous-array-4fc1@gregkh> <20260904203200.1546524-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 d9ee1a33db344..6e4482bc06a95 100644 --- a/mm/page_vma_mapped.c +++ b/mm/page_vma_mapped.c @@ -85,7 +85,13 @@ static inline bool pfn_is_match(struct page *page, unsigned long pfn) 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