From: Anish Moorthy <amoorthy@google.com>
To: Paolo Bonzini <pbonzini@redhat.com>, Marc Zyngier <maz@kernel.org>
Cc: Oliver Upton <oliver.upton@linux.dev>,
Sean Christopherson <seanjc@google.com>,
James Houghton <jthoughton@google.com>,
Anish Moorthy <amoorthy@google.com>,
Ben Gardon <bgardon@google.com>,
David Matlack <dmatlack@google.com>,
Ricardo Koller <ricarkol@google.com>,
Chao Peng <chao.p.peng@linux.intel.com>,
Axel Rasmussen <axelrasmussen@google.com>,
kvm@vger.kernel.org, kvmarm@lists.linux.dev
Subject: [PATCH 7/8] kvm/arm64: Implement KVM_CAP_MEM_FAULT_NOWAIT for arm64
Date: Wed, 15 Feb 2023 01:16:13 +0000 [thread overview]
Message-ID: <20230215011614.725983-8-amoorthy@google.com> (raw)
In-Reply-To: <20230215011614.725983-1-amoorthy@google.com>
Just do atomic gfn_to_pfn_memslot when the cap is enabled. Since we
don't have to deal with async page faults, the implementation is even
simpler than on x86
Signed-off-by: Anish Moorthy <amoorthy@google.com>
Acked-by: James Houghton <jthoughton@google.com>
---
arch/arm64/kvm/arm.c | 1 +
arch/arm64/kvm/mmu.c | 14 ++++++++++++--
2 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/arch/arm64/kvm/arm.c b/arch/arm64/kvm/arm.c
index 698787ed87e92..31bec7866c346 100644
--- a/arch/arm64/kvm/arm.c
+++ b/arch/arm64/kvm/arm.c
@@ -220,6 +220,7 @@ int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext)
case KVM_CAP_VCPU_ATTRIBUTES:
case KVM_CAP_PTP_KVM:
case KVM_CAP_ARM_SYSTEM_SUSPEND:
+ case KVM_CAP_MEM_FAULT_NOWAIT:
r = 1;
break;
case KVM_CAP_SET_GUEST_DEBUG2:
diff --git a/arch/arm64/kvm/mmu.c b/arch/arm64/kvm/mmu.c
index 01352f5838a00..964af7cd5f1c8 100644
--- a/arch/arm64/kvm/mmu.c
+++ b/arch/arm64/kvm/mmu.c
@@ -1206,6 +1206,7 @@ static int user_mem_abort(struct kvm_vcpu *vcpu, phys_addr_t fault_ipa,
unsigned long vma_pagesize, fault_granule;
enum kvm_pgtable_prot prot = KVM_PGTABLE_PROT_R;
struct kvm_pgtable *pgt;
+ bool mem_fault_nowait;
fault_granule = 1UL << ARM64_HW_PGTABLE_LEVEL_SHIFT(fault_level);
write_fault = kvm_is_write_fault(vcpu);
@@ -1301,8 +1302,17 @@ static int user_mem_abort(struct kvm_vcpu *vcpu, phys_addr_t fault_ipa,
*/
smp_rmb();
- pfn = __gfn_to_pfn_memslot(memslot, gfn, false, false, NULL,
- write_fault, &writable, NULL);
+ mem_fault_nowait = memory_faults_enabled(vcpu->kvm);
+ pfn = __gfn_to_pfn_memslot(
+ memslot, gfn, mem_fault_nowait, false, NULL,
+ write_fault, &writable, NULL);
+
+ if (mem_fault_nowait && pfn == KVM_PFN_ERR_FAULT) {
+ vcpu->run->exit_reason = KVM_EXIT_MEMORY_FAULT;
+ vcpu->run->memory_fault.gpa = gfn << PAGE_SHIFT;
+ vcpu->run->memory_fault.size = vma_pagesize;
+ return -EFAULT;
+ }
if (pfn == KVM_PFN_ERR_HWPOISON) {
kvm_send_hwpoison_signal(hva, vma_shift);
return 0;
--
2.39.1.581.gbfd45094c4-goog
next prev parent reply other threads:[~2023-02-15 1:17 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-15 1:16 [PATCH 0/8] Add memory fault exits to avoid slow GUP Anish Moorthy
2023-02-15 1:16 ` [PATCH 1/8] selftests/kvm: Fix bug in how demand_paging_test calculates paging rate Anish Moorthy
2023-02-15 7:27 ` Oliver Upton
2023-02-15 16:44 ` Sean Christopherson
2023-02-15 18:05 ` Anish Moorthy
2023-02-15 1:16 ` [PATCH 2/8] selftests/kvm: Allow many vcpus per UFFD in demand paging test Anish Moorthy
2023-02-15 1:16 ` [PATCH 3/8] selftests/kvm: Switch demand paging uffd readers to epoll Anish Moorthy
2023-02-15 1:16 ` [PATCH 4/8] kvm: Allow hva_pfn_fast to resolve read-only faults Anish Moorthy
2023-02-15 9:01 ` Oliver Upton
2023-02-15 17:03 ` Sean Christopherson
2023-02-15 18:19 ` Anish Moorthy
2023-02-15 1:16 ` [PATCH 5/8] kvm: Add cap/kvm_run field for memory fault exits Anish Moorthy
2023-02-15 8:41 ` Marc Zyngier
2023-02-15 17:07 ` Sean Christopherson
2023-02-16 18:53 ` Anish Moorthy
2023-02-16 21:38 ` Sean Christopherson
2023-02-17 19:14 ` Anish Moorthy
2023-02-17 20:33 ` Sean Christopherson
2023-02-23 1:16 ` Anish Moorthy
2023-02-23 20:55 ` Sean Christopherson
2023-02-23 23:03 ` Anish Moorthy
2023-02-24 0:01 ` Sean Christopherson
2023-02-17 20:47 ` Sean Christopherson
2023-02-15 8:59 ` Oliver Upton
2023-02-15 1:16 ` [PATCH 6/8] kvm/x86: Add mem fault exit on EPT violations Anish Moorthy
2023-02-15 17:23 ` Sean Christopherson
2023-02-16 22:55 ` Peter Xu
2023-02-23 0:35 ` Anish Moorthy
2023-02-23 20:11 ` Sean Christopherson
2023-02-15 1:16 ` Anish Moorthy [this message]
2023-02-15 18:24 ` [PATCH 7/8] kvm/arm64: Implement KVM_CAP_MEM_FAULT_NOWAIT for arm64 Oliver Upton
2023-02-15 23:28 ` Anish Moorthy
2023-02-15 23:37 ` Oliver Upton
2023-02-15 1:16 ` [PATCH 8/8] selftests/kvm: Handle mem fault exits in demand paging test Anish Moorthy
2023-02-15 1:46 ` [PATCH 0/8] Add memory fault exits to avoid slow GUP James Houghton
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230215011614.725983-8-amoorthy@google.com \
--to=amoorthy@google.com \
--cc=axelrasmussen@google.com \
--cc=bgardon@google.com \
--cc=chao.p.peng@linux.intel.com \
--cc=dmatlack@google.com \
--cc=jthoughton@google.com \
--cc=kvm@vger.kernel.org \
--cc=kvmarm@lists.linux.dev \
--cc=maz@kernel.org \
--cc=oliver.upton@linux.dev \
--cc=pbonzini@redhat.com \
--cc=ricarkol@google.com \
--cc=seanjc@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.