From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 C2F1F37AA87; Fri, 27 Mar 2026 11:36:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774611390; cv=none; b=pMWo+CKP4gBjF9JOQFvnEIUgyzmhS/zUL0lxoC4zlJAgp//iEaF41NdwBcPnQ5pRXhiHn0GHdelbC2dnJKK/bU5DGG4v3CSdTrytuHhZo4Tqpo6+LduxseljMoPuAxpZBbAMeuB9cMdN0VID5HVHAgtyBJ4hi9q/JGNqXjQSCSo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774611390; c=relaxed/simple; bh=JBNTJRSvjklGeXjz74YMlXlOnAfmQRC0oOqP8vM31FY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=AEiINqKsYRJFrGOCIfmwFHVJszn5DbHPqTNfMf0hETnfIvp0ZwFfffPQE7RV4l43tc4UnI6Fq/FS2Z0UjP2irQ61+Wz4pnQiks5jkL7/r1RBEgrVme8Rufc9wRdVdNOcsryVc1iZ5GodjU7+l4F8ibecZ0vD0hBbre5WYL9y0b8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Yk5JO1Rd; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="Yk5JO1Rd" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8AD27C2BCB9; Fri, 27 Mar 2026 11:36:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1774611390; bh=JBNTJRSvjklGeXjz74YMlXlOnAfmQRC0oOqP8vM31FY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Yk5JO1Rda0QGnBFyP9+ez0TpEM35b3LzMgfaDHMDZaTwyF00N977lhkYALEgGNb4M O9fQRDGSjRTXdO6Jy99ctARChBLUu6k0/HtIdTtbYTdgvJUPvDePZwDlETH6Zjhorj e7H1HKTu+uBIjrqwm/ZXsVsghlrUtfi6pW0MPqwM0RipaLuHJoL1x+xqC1cjmiDZwx sknz+ZtpS9MALJBi+i1nIl1bhkI0rCy2UoltZQogmQxMJkvY821yj4fWdqFzprIhsY aAhstvXAGERhB+w+hkakCRJ4X4Nbfis1OFpSQk6C6qf771rPUSdgXwUIF+yKdg3e9U FPFv5WrGVq/ng== Received: from sofa.misterjones.org ([185.219.108.64] helo=valley-girl.lan) by disco-boy.misterjones.org with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.98.2) (envelope-from ) id 1w65UK-00000006K4a-1n6y; Fri, 27 Mar 2026 11:36:28 +0000 From: Marc Zyngier To: kvmarm@lists.linux.dev, linux-arm-kernel@lists.infradead.org, kvm@vger.kernel.org Cc: Joey Gouly , Suzuki K Poulose , Oliver Upton , Zenghui Yu , Fuad Tabba , Will Deacon , Quentin Perret Subject: [PATCH v2 26/30] KVM: arm64: Replace force_pte with a max_map_size attribute Date: Fri, 27 Mar 2026 11:36:14 +0000 Message-ID: <20260327113618.4051534-27-maz@kernel.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260327113618.4051534-1-maz@kernel.org> References: <20260327113618.4051534-1-maz@kernel.org> Precedence: bulk X-Mailing-List: kvm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SA-Exim-Connect-IP: 185.219.108.64 X-SA-Exim-Rcpt-To: kvmarm@lists.linux.dev, linux-arm-kernel@lists.infradead.org, kvm@vger.kernel.org, joey.gouly@arm.com, suzuki.poulose@arm.com, oupton@kernel.org, yuzenghui@huawei.com, tabba@google.com, will@kernel.org, qperret@google.com X-SA-Exim-Mail-From: maz@kernel.org X-SA-Exim-Scanned: No (on disco-boy.misterjones.org); SAEximRunCond expanded to false force_pte is annoyingly limited in what it expresses, and we'd be better off with a more generic primitive. Introduce max_map_size instead, which does the trick and can be moved into the vma_info structure. This firther allows it to reduce the scopes in which it is mutable. Tested-by: Fuad Tabba Reviewed-by: Fuad Tabba Reviewed-by: Suzuki K Poulose Signed-off-by: Marc Zyngier --- arch/arm64/kvm/mmu.c | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/arch/arm64/kvm/mmu.c b/arch/arm64/kvm/mmu.c index 39f01dd59259c..61b979365c6ee 100644 --- a/arch/arm64/kvm/mmu.c +++ b/arch/arm64/kvm/mmu.c @@ -1652,6 +1652,7 @@ struct kvm_s2_fault_vma_info { unsigned long mmu_seq; long vma_pagesize; vm_flags_t vm_flags; + unsigned long max_map_size; struct page *page; kvm_pfn_t pfn; gfn_t gfn; @@ -1661,14 +1662,18 @@ struct kvm_s2_fault_vma_info { }; static short kvm_s2_resolve_vma_size(const struct kvm_s2_fault_desc *s2fd, - struct vm_area_struct *vma, bool *force_pte) + struct kvm_s2_fault_vma_info *s2vi, + struct vm_area_struct *vma) { short vma_shift; - if (*force_pte) + if (memslot_is_logging(s2fd->memslot)) { + s2vi->max_map_size = PAGE_SIZE; vma_shift = PAGE_SHIFT; - else + } else { + s2vi->max_map_size = PUD_SIZE; vma_shift = get_vma_page_shift(vma, s2fd->hva); + } switch (vma_shift) { #ifndef __PAGETABLE_PMD_FOLDED @@ -1686,7 +1691,7 @@ static short kvm_s2_resolve_vma_size(const struct kvm_s2_fault_desc *s2fd, fallthrough; case CONT_PTE_SHIFT: vma_shift = PAGE_SHIFT; - *force_pte = true; + s2vi->max_map_size = PAGE_SIZE; fallthrough; case PAGE_SHIFT: break; @@ -1697,7 +1702,7 @@ static short kvm_s2_resolve_vma_size(const struct kvm_s2_fault_desc *s2fd, if (s2fd->nested) { unsigned long max_map_size; - max_map_size = *force_pte ? PAGE_SIZE : PUD_SIZE; + max_map_size = min(s2vi->max_map_size, PUD_SIZE); /* * If we're about to create a shadow stage 2 entry, then we @@ -1715,7 +1720,7 @@ static short kvm_s2_resolve_vma_size(const struct kvm_s2_fault_desc *s2fd, else if (max_map_size >= PAGE_SIZE && max_map_size < PMD_SIZE) max_map_size = PAGE_SIZE; - *force_pte = (max_map_size == PAGE_SIZE); + s2vi->max_map_size = max_map_size; vma_shift = min_t(short, vma_shift, __ffs(max_map_size)); } @@ -1724,7 +1729,6 @@ static short kvm_s2_resolve_vma_size(const struct kvm_s2_fault_desc *s2fd, struct kvm_s2_fault { bool s2_force_noncacheable; - bool force_pte; enum kvm_pgtable_prot prot; }; @@ -1748,7 +1752,7 @@ static int kvm_s2_fault_get_vma_info(const struct kvm_s2_fault_desc *s2fd, return -EFAULT; } - s2vi->vma_pagesize = BIT(kvm_s2_resolve_vma_size(s2fd, vma, &fault->force_pte)); + s2vi->vma_pagesize = BIT(kvm_s2_resolve_vma_size(s2fd, s2vi, vma)); /* * Both the canonical IPA and fault IPA must be aligned to the @@ -1933,7 +1937,7 @@ static int kvm_s2_fault_map(const struct kvm_s2_fault_desc *s2fd, * backed by a THP and thus use block mapping if possible. */ if (mapping_size == PAGE_SIZE && - !(fault->force_pte || fault->s2_force_noncacheable)) { + !(s2vi->max_map_size == PAGE_SIZE || fault->s2_force_noncacheable)) { if (perm_fault_granule > PAGE_SIZE) { mapping_size = perm_fault_granule; } else { @@ -1994,7 +1998,6 @@ static int user_mem_abort(const struct kvm_s2_fault_desc *s2fd) bool perm_fault = kvm_vcpu_trap_is_permission_fault(s2fd->vcpu); struct kvm_s2_fault_vma_info s2vi = {}; struct kvm_s2_fault fault = { - .force_pte = memslot_is_logging(s2fd->memslot), .prot = KVM_PGTABLE_PROT_R, }; void *memcache = NULL; -- 2.47.3