From nobody Fri Dec 19 15:36:05 2025 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by smtp.subspace.kernel.org (Postfix) with ESMTP id C694921D009 for ; Mon, 17 Feb 2025 14:08:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.140.110.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739801305; cv=none; b=BVFJPJPwLslfZr8OqDtEVHocmluYNThsAOB4tirMMOjxKripv4ON8TCfoT4/m5Fl76kLVYbFHris68hL3mwbs0uQc4PqbkOjwjzVqRU5X9SD7btfBIZ0v09u1wQs/dPZaEME1MT3Ugz1dC9Unp97KZ/KzC7x7dRqnZjzT9C8IoM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739801305; c=relaxed/simple; bh=+HwykcDc6Ktv8Botq1cxur9WkVhdPHNol9k2KcCgsAE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Qj/nGTpZJfGvfjqaIyWYXU8uAvU5r8JqIhuXGb0YqEMoUGwajJ0Jxk77aJ5rcoxwXcwdtuYcwCr22RVsYrkIfESx1xdUGIM8kHkF0CSK0x3Ew6e9yrJlwfQXWRMHVPJgffbGyIBtG9l2jr9Kk6PqlmSCUxhjfE4owpDLmP4g+Mo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com; spf=pass smtp.mailfrom=arm.com; arc=none smtp.client-ip=217.140.110.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=arm.com Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 1DD911A2D; Mon, 17 Feb 2025 06:08:42 -0800 (PST) Received: from e125769.cambridge.arm.com (e125769.cambridge.arm.com [10.1.196.27]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id A3E023F6A8; Mon, 17 Feb 2025 06:08:20 -0800 (PST) From: Ryan Roberts To: Catalin Marinas , Will Deacon , Pasha Tatashin , Andrew Morton , Uladzislau Rezki , Christoph Hellwig , David Hildenbrand , "Matthew Wilcox (Oracle)" , Mark Rutland , Anshuman Khandual , Alexandre Ghiti , Kevin Brodsky Cc: Ryan Roberts , linux-arm-kernel@lists.infradead.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 01/14] arm64: hugetlb: Cleanup huge_pte size discovery mechanisms Date: Mon, 17 Feb 2025 14:07:53 +0000 Message-ID: <20250217140809.1702789-2-ryan.roberts@arm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250217140809.1702789-1-ryan.roberts@arm.com> References: <20250217140809.1702789-1-ryan.roberts@arm.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Not all huge_pte helper APIs explicitly provide the size of the huge_pte. So the helpers have to depend on various methods to determine the size of the huge_pte. Some of these methods are dubious. Let's clean up the code to use preferred methods and retire the dubious ones. The options in order of preference: - If size is provided as parameter, use it together with num_contig_ptes(). This is explicit and works for both present and non-present ptes. - If vma is provided as a parameter, retrieve size via huge_page_size(hstate_vma(vma)) and use it together with num_contig_ptes(). This is explicit and works for both present and non-present ptes. - If the pte is present and contiguous, use find_num_contig() to walk the pgtable to find the level and infer the number of ptes from level. Only works for *present* ptes. - If the pte is present and not contiguous and you can infer from this that only 1 pte needs to be operated on. This is ok if you don't care about the absolute size, and just want to know the number of ptes. - NEVER rely on resolving the PFN of a present pte to a folio and getting the folio's size. This is fragile at best, because there is nothing to stop the core-mm from allocating a folio twice as big as the huge_pte then mapping it across 2 consecutive huge_ptes. Or just partially mapping it. Where we require that the pte is present, add warnings if not-present. Signed-off-by: Ryan Roberts --- arch/arm64/mm/hugetlbpage.c | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/arch/arm64/mm/hugetlbpage.c b/arch/arm64/mm/hugetlbpage.c index 614b2feddba2..31ea826a8a09 100644 --- a/arch/arm64/mm/hugetlbpage.c +++ b/arch/arm64/mm/hugetlbpage.c @@ -136,7 +136,7 @@ pte_t huge_ptep_get(struct mm_struct *mm, unsigned long= addr, pte_t *ptep) if (!pte_present(orig_pte) || !pte_cont(orig_pte)) return orig_pte; =20 - ncontig =3D num_contig_ptes(page_size(pte_page(orig_pte)), &pgsize); + ncontig =3D find_num_contig(mm, addr, ptep, &pgsize); for (i =3D 0; i < ncontig; i++, ptep++) { pte_t pte =3D __ptep_get(ptep); =20 @@ -445,16 +445,19 @@ int huge_ptep_set_access_flags(struct vm_area_struct = *vma, pgprot_t hugeprot; pte_t orig_pte; =20 + VM_WARN_ON(!pte_present(pte)); + if (!pte_cont(pte)) return __ptep_set_access_flags(vma, addr, ptep, pte, dirty); =20 - ncontig =3D find_num_contig(mm, addr, ptep, &pgsize); + ncontig =3D num_contig_ptes(huge_page_size(hstate_vma(vma)), &pgsize); dpfn =3D pgsize >> PAGE_SHIFT; =20 if (!__cont_access_flags_changed(ptep, pte, ncontig)) return 0; =20 orig_pte =3D get_clear_contig_flush(mm, addr, ptep, pgsize, ncontig); + VM_WARN_ON(!pte_present(orig_pte)); =20 /* Make sure we don't lose the dirty or young state */ if (pte_dirty(orig_pte)) @@ -479,7 +482,10 @@ void huge_ptep_set_wrprotect(struct mm_struct *mm, size_t pgsize; pte_t pte; =20 - if (!pte_cont(__ptep_get(ptep))) { + pte =3D __ptep_get(ptep); + VM_WARN_ON(!pte_present(pte)); + + if (!pte_cont(pte)) { __ptep_set_wrprotect(mm, addr, ptep); return; } @@ -503,11 +509,15 @@ pte_t huge_ptep_clear_flush(struct vm_area_struct *vm= a, struct mm_struct *mm =3D vma->vm_mm; size_t pgsize; int ncontig; + pte_t pte; + + pte =3D __ptep_get(ptep); + VM_WARN_ON(!pte_present(pte)); =20 - if (!pte_cont(__ptep_get(ptep))) + if (!pte_cont(pte)) return ptep_clear_flush(vma, addr, ptep); =20 - ncontig =3D find_num_contig(mm, addr, ptep, &pgsize); + ncontig =3D num_contig_ptes(huge_page_size(hstate_vma(vma)), &pgsize); return get_clear_contig_flush(mm, addr, ptep, pgsize, ncontig); } =20 --=20 2.43.0