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 D4829296BDC for ; Mon, 16 Mar 2026 17:55:01 +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=1773683701; cv=none; b=qHGoPuL3xRh+0AQIfO425WN+aeg/XuW3/xjhp8ugZW6AfPleSID75bpTsbflTQbLceqhB7jSMhzfU+5hah1rcGHaLgPNaUbV0s6bnxq2HpzIU+32wdZTEZtK5J2kksfpTkKY4YslBM2IBbFEqHXhX06rDtxuGtAToDuIJEjADdw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773683701; c=relaxed/simple; bh=iue78zY/b1ZgWy121QZwiADQ7RdqCAVxLt25uXa4RPc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=OF4GwtZQU9q1liS/NDaQnUhSvDERHxiWIv8o2zAC0XRXAsSSXC3W6VoicLkTRCEI3mcvGt+y+YceiYHDzD1ThDPsTn9xlTmeN9ouux5sUj6MR+0A78/pApwJRinsUkAs1tdYQdzJ+emwzVjZPUwkmg3Evu8euTi9wDXjvbPJq2M= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=NTPkPSQE; 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="NTPkPSQE" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B2B46C19425; Mon, 16 Mar 2026 17:55:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1773683701; bh=iue78zY/b1ZgWy121QZwiADQ7RdqCAVxLt25uXa4RPc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NTPkPSQE1BvhjxjtgNEBNSNMcTzYuMFcu5ANadMNtOAal1iGooJGYvXxuEpjmC7x0 5X6O4/sU0nOIprVPzAAF6lJAAzDhPO/jt4Gb4t01ivz+sQFiyyJoozLwiFJcOX9amz QP+aaaCP8u4znyiWPDP9SVvCjZg32wUBwT5oKSYvne5QtSTzT1NOp7jAmybU4ttbCv evFHrsBn+drfoBNhNdtx+qzbZJJLleMMG4ex0zE9ZO65mDWCzpNLzj2f0jZAgv6KjC MdM7AL7el8cM3cfg49LWGcXrDmzAOFlc+Yu6oCSnd+vxtzgfnXGdXW7eBBpOHfchm4 7rzRYqNOoD6jA== 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 1w2C9b-00000002XDx-2C8c; Mon, 16 Mar 2026 17:54:59 +0000 From: Marc Zyngier To: kvmarm@lists.linux.dev, linux-arm-kernel@lists.infradead.org Cc: Joey Gouly , Suzuki K Poulose , Oliver Upton , Zenghui Yu , Fuad Tabba , Will Deacon , Quentin Perret Subject: [PATCH 02/17] KVM: arm64: Make fault_ipa immutable Date: Mon, 16 Mar 2026 17:54:35 +0000 Message-ID: <20260316175451.1866175-3-maz@kernel.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260316175451.1866175-1-maz@kernel.org> References: <20260316175451.1866175-1-maz@kernel.org> Precedence: bulk X-Mailing-List: kvmarm@lists.linux.dev 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, 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 Updating fault_ipa is conceptually annoying, as it changes something that is a property of the fault itself. Stop doing so and instead use fault->gfn as the sole piece of state that can be used to represent the faulting IPA. At the same time, introduce get_canonical_gfn() for the couple of case we're we are concerned with the memslot-related IPA and not the faulting one. Signed-off-by: Marc Zyngier --- arch/arm64/kvm/mmu.c | 38 ++++++++++++++++++++++++++------------ 1 file changed, 26 insertions(+), 12 deletions(-) diff --git a/arch/arm64/kvm/mmu.c b/arch/arm64/kvm/mmu.c index fe8f8057cf412..ab8a269d4366d 100644 --- a/arch/arm64/kvm/mmu.c +++ b/arch/arm64/kvm/mmu.c @@ -1400,10 +1400,10 @@ static bool fault_supports_stage2_huge_mapping(struct kvm_memory_slot *memslot, */ static long transparent_hugepage_adjust(struct kvm *kvm, struct kvm_memory_slot *memslot, - unsigned long hva, kvm_pfn_t *pfnp, - phys_addr_t *ipap) + unsigned long hva, kvm_pfn_t *pfnp, gfn_t *gfnp) { kvm_pfn_t pfn = *pfnp; + gfn_t gfn = *gfnp; /* * Make sure the adjustment is done only for THP pages. Also make @@ -1419,7 +1419,8 @@ transparent_hugepage_adjust(struct kvm *kvm, struct kvm_memory_slot *memslot, if (sz < PMD_SIZE) return PAGE_SIZE; - *ipap &= PMD_MASK; + gfn &= ~(PTRS_PER_PMD - 1); + *gfnp = gfn; pfn &= ~(PTRS_PER_PMD - 1); *pfnp = pfn; @@ -1735,7 +1736,6 @@ static int kvm_s2_fault_get_vma_info(struct kvm_s2_fault *fault) { struct vm_area_struct *vma; struct kvm *kvm = fault->vcpu->kvm; - phys_addr_t ipa; mmap_read_lock(current->mm); vma = vma_lookup(current->mm, fault->hva); @@ -1753,9 +1753,7 @@ static int kvm_s2_fault_get_vma_info(struct kvm_s2_fault *fault) * mapping size to ensure we find the right PFN and lay down the * mapping in the right place. */ - fault->fault_ipa = ALIGN_DOWN(fault->fault_ipa, fault->vma_pagesize); - ipa = fault->nested ? kvm_s2_trans_output(fault->nested) : fault->fault_ipa; - fault->gfn = ALIGN_DOWN(ipa, fault->vma_pagesize) >> PAGE_SHIFT; + fault->gfn = ALIGN_DOWN(fault->fault_ipa, fault->vma_pagesize) >> PAGE_SHIFT; fault->mte_allowed = kvm_vma_mte_allowed(vma); @@ -1777,6 +1775,17 @@ static int kvm_s2_fault_get_vma_info(struct kvm_s2_fault *fault) return 0; } +static gfn_t get_canonical_gfn(struct kvm_s2_fault *fault) +{ + phys_addr_t ipa; + + if (!fault->nested) + return fault->gfn; + + ipa = kvm_s2_trans_output(fault->nested); + return ALIGN_DOWN(ipa, fault->vma_pagesize) >> PAGE_SHIFT; +} + static int kvm_s2_fault_pin_pfn(struct kvm_s2_fault *fault) { int ret; @@ -1785,7 +1794,7 @@ static int kvm_s2_fault_pin_pfn(struct kvm_s2_fault *fault) if (ret) return ret; - fault->pfn = __kvm_faultin_pfn(fault->memslot, fault->gfn, + fault->pfn = __kvm_faultin_pfn(fault->memslot, get_canonical_gfn(fault), fault->write_fault ? FOLL_WRITE : 0, &fault->writable, &fault->page); if (unlikely(is_error_noslot_pfn(fault->pfn))) { @@ -1885,6 +1894,11 @@ static int kvm_s2_fault_compute_prot(struct kvm_s2_fault *fault) return 0; } +static phys_addr_t get_ipa(const struct kvm_s2_fault *fault) +{ + return gfn_to_gpa(fault->gfn); +} + static int kvm_s2_fault_map(struct kvm_s2_fault *fault, void *memcache) { struct kvm *kvm = fault->vcpu->kvm; @@ -1909,7 +1923,7 @@ static int kvm_s2_fault_map(struct kvm_s2_fault *fault, void *memcache) } else { fault->vma_pagesize = transparent_hugepage_adjust(kvm, fault->memslot, fault->hva, &fault->pfn, - &fault->fault_ipa); + &fault->gfn); if (fault->vma_pagesize < 0) { ret = fault->vma_pagesize; @@ -1932,10 +1946,10 @@ static int kvm_s2_fault_map(struct kvm_s2_fault *fault, void *memcache) * PTE, which will be preserved. */ fault->prot &= ~KVM_NV_GUEST_MAP_SZ; - ret = KVM_PGT_FN(kvm_pgtable_stage2_relax_perms)(pgt, fault->fault_ipa, + ret = KVM_PGT_FN(kvm_pgtable_stage2_relax_perms)(pgt, get_ipa(fault), fault->prot, flags); } else { - ret = KVM_PGT_FN(kvm_pgtable_stage2_map)(pgt, fault->fault_ipa, fault->vma_pagesize, + ret = KVM_PGT_FN(kvm_pgtable_stage2_map)(pgt, get_ipa(fault), fault->vma_pagesize, __pfn_to_phys(fault->pfn), fault->prot, memcache, flags); } @@ -1946,7 +1960,7 @@ static int kvm_s2_fault_map(struct kvm_s2_fault *fault, void *memcache) /* Mark the fault->page dirty only if the fault is handled successfully */ if (fault->writable && !ret) - mark_page_dirty_in_slot(kvm, fault->memslot, fault->gfn); + mark_page_dirty_in_slot(kvm, fault->memslot, get_canonical_gfn(fault)); if (ret != -EAGAIN) return ret; -- 2.47.3