From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 3EBA943CEE3; Mon, 5 Oct 2026 09:08:50 +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=1791191331; cv=none; b=QaDW5wRYll4tuN4RUcL0o2b/IXYRHUdIQlLYKq1lP+UErl/0nmy+L7o2tlr+uMPZdRqEyrd/B8VbQiUOAqfpcVvsQzCIIBpB6NdB9zi203L95XdRmUlSsBFpNaXjM6oa30BeAo6YPvOS5L4wfBRKT8uOU2xYsWN6T97PXDJ+fGc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1791191331; c=relaxed/simple; bh=foXir2xk3Xfhn9uFRx2Vb3yGeX1QSITmWqkyUOAHW7I=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=FT52SP2j4OTYWd/9EIEVMjai0yGTZQRVs3UgnYzHXQw0P1Ol+mOhsheS6uGG50NDzUZPnmy4sY+wEzgZI+iDUucmS6jowIvehdGRvMMNVbFiHhSVdQ15bDdLK6smj5PWNYH1VnLSU7UHrgoIBdcX5vFXrKplO3vFObWJskUKn18= 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; dkim=pass (1024-bit key) header.d=arm.com header.i=@arm.com header.b=BdciGGEV; 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 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=arm.com header.i=@arm.com header.b="BdciGGEV" 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 4FB62152B; Mon, 5 Oct 2026 02:08:46 -0700 (PDT) Received: from ewhatever.cambridge.arm.com (ewhatever.cambridge.arm.com [10.2.197.99]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id AE58F3F66F; Mon, 5 Oct 2026 02:08:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=arm.com; s=foss; t=1791191329; bh=foXir2xk3Xfhn9uFRx2Vb3yGeX1QSITmWqkyUOAHW7I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BdciGGEV+FzTS89MKFFnh9fHRvsnFwPwgcr1g2mLKSGjrvdAIqSq7Y2X2vU5qSjMt IG60CHE6oqFZ/6N+w5AE1ftlQBl+cYUM/2OdUCrHFTpbk52vWLP1x6wCHsNUzyrjDZ Fnn0ovBrrsrdv4tK12vO5oH0Ib/H7Z7IWOq3hXyc= From: Suzuki K Poulose To: kvm@vger.kernel.org, kvmarm@lists.linux.dev Cc: maz@kernel.org, will@kernel.org, catalin.marinas@arm.com, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, steven.price@arm.com, aneesh.kumar@kernel.org, oupton@kernel.org, gshan@redhat.com, joey.gouly@arm.com, tabba@google.com, yuzenghui@huawei.com, linux-coco@lists.linux.dev, gankulkarni@os.amperecomputing.com, sdonthineni@nvidia.com, alpergun@google.com, fj0570is@fujitsu.com, WeiLin.Chang@arm.com, lpieralisi@kernel.org, enju.kohei@fujitsu.com, sudeep.holla@arm.com, jonathan.cameron@oss.qualcomm.com, Suzuki K Poulose Subject: [PATCH v22 13/23] KVM: arm64: Abstract out memory abort handling Date: Mon, 5 Oct 2026 10:07:44 +0100 Message-ID: <20261005090754.2140522-14-suzuki.poulose@arm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20261005090754.2140522-1-suzuki.poulose@arm.com> References: <20261005090754.2140522-1-suzuki.poulose@arm.com> Precedence: bulk X-Mailing-List: linux-coco@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Move the memory abort handling under VM specific s2 operation. Tested-by: Gavin Shan Signed-off-by: Suzuki K Poulose --- Changes since v21: - Rename protected_vm_mem_abort => protected_pkvm_mem_abort for consistency with the other callbacks. --- arch/arm64/include/asm/kvm_host.h | 2 ++ arch/arm64/kvm/mmu.c | 33 ++++++++++++++++++------------- 2 files changed, 21 insertions(+), 14 deletions(-) diff --git a/arch/arm64/include/asm/kvm_host.h b/arch/arm64/include/asm/kvm_host.h index 0778c308ce597..7cb343583953d 100644 --- a/arch/arm64/include/asm/kvm_host.h +++ b/arch/arm64/include/asm/kvm_host.h @@ -156,6 +156,7 @@ struct kvm_vcpu_ops { }; struct kvm_gfn_range; +struct kvm_s2_fault_desc; struct kvm_vm_s2_ops { bool (*vm_age_gfn)(struct kvm *kvm, struct kvm_gfn_range *range); @@ -166,6 +167,7 @@ struct kvm_vm_s2_ops { void (*vm_stage2_unmap_range)(struct kvm_s2_mmu *mmu, phys_addr_t start, u64 size, bool may_block); + int (*vm_mem_abort)(const struct kvm_s2_fault_desc *s2fd); }; struct kvm_s2_mmu { diff --git a/arch/arm64/kvm/mmu.c b/arch/arm64/kvm/mmu.c index 9cc7fcde4dd0a..ccbe2ffeda40b 100644 --- a/arch/arm64/kvm/mmu.c +++ b/arch/arm64/kvm/mmu.c @@ -1740,7 +1740,7 @@ struct kvm_s2_fault_vma_info { bool map_non_cacheable; }; -static int pkvm_mem_abort(const struct kvm_s2_fault_desc *s2fd) +static int protected_pkvm_mem_abort(const struct kvm_s2_fault_desc *s2fd) { unsigned int flags = FOLL_HWPOISON | FOLL_LONGTERM | FOLL_WRITE; struct kvm_vcpu *vcpu = s2fd->vcpu; @@ -2178,6 +2178,20 @@ static int user_mem_abort(const struct kvm_s2_fault_desc *s2fd) return kvm_s2_fault_map(s2fd, &s2vi, prot, memcache); } +static int kvm_vm_mem_abort(const struct kvm_s2_fault_desc *s2fd) +{ + struct kvm_vcpu *vcpu = s2fd->vcpu; + + VM_WARN_ON_ONCE(kvm_vcpu_trap_is_permission_fault(vcpu) && + !kvm_is_write_fault(vcpu) && + !kvm_vcpu_trap_is_exec_fault(vcpu)); + + if (kvm_slot_has_gmem(s2fd->memslot)) + return gmem_abort(s2fd); + else + return user_mem_abort(s2fd); +} + /* Resolve the access fault by making the page young again. */ static void handle_access_fault(struct kvm_vcpu *vcpu, phys_addr_t fault_ipa) { @@ -2447,19 +2461,7 @@ int kvm_handle_guest_abort(struct kvm_vcpu *vcpu) .hva = hva, }; - if (kvm_vm_is_protected(kvm)) { - ret = pkvm_mem_abort(&s2fd); - } else { - VM_WARN_ON_ONCE(kvm_vcpu_trap_is_permission_fault(vcpu) && - !write_fault && - !kvm_vcpu_trap_is_exec_fault(vcpu)); - - if (kvm_slot_has_gmem(memslot)) - ret = gmem_abort(&s2fd); - else - ret = user_mem_abort(&s2fd); - } - + ret = kvm->arch.vm_s2_ops->vm_mem_abort(&s2fd); if (ret == 0) ret = 1; out: @@ -2873,6 +2875,7 @@ static const struct kvm_vm_s2_ops protected_pkvm_vm_s2_ops = { .vm_age_gfn = no_age_gfn, .vm_test_age_gfn = no_age_gfn, .vm_stage2_unmap_range = no_stage2_unmap_range, + .vm_mem_abort = protected_pkvm_mem_abort, }; static const struct kvm_vm_s2_ops pkvm_vm_s2_ops = { @@ -2881,6 +2884,7 @@ static const struct kvm_vm_s2_ops pkvm_vm_s2_ops = { .vm_age_gfn = pkvm_age_gfn, .vm_test_age_gfn = pkvm_test_age_gfn, .vm_stage2_unmap_range = pkvm_stage2_unmap_range, + .vm_mem_abort = kvm_vm_mem_abort, }; static const struct kvm_vm_s2_ops kvm_default_vm_s2_ops = { @@ -2889,6 +2893,7 @@ static const struct kvm_vm_s2_ops kvm_default_vm_s2_ops = { .vm_age_gfn = kvm_vm_age_gfn, .vm_test_age_gfn = kvm_vm_test_age_gfn, .vm_stage2_unmap_range = kvm_vm_stage2_unmap_range, + .vm_mem_abort = kvm_vm_mem_abort, }; #define KVM_VM_S2_OPS(flavor, ops) \ -- 2.43.0