Skip to content

Commit 79e6ea8

Browse files
author
Charles Mirabile
committed
KVM: RISC-V: Use kvm_faultin_pfn() when mapping pfns into the guest
JIRA: https://issues.redhat.com/browse/RHEL-101827 commit 334511d Author: Sean Christopherson <seanjc@google.com> Date: Thu, 10 Oct 2024 11:24:01 -0700 Convert RISC-V to __kvm_faultin_pfn()+kvm_release_faultin_page(), which are new APIs to consolidate arch code and provide consistent behavior across all KVM architectures. Opportunisticaly fix a s/priort/prior typo in the related comment. Reviewed-by: Andrew Jones <ajones@ventanamicro.com> Acked-by: Anup Patel <anup@brainfault.org> Signed-off-by: Sean Christopherson <seanjc@google.com> Tested-by: Dmitry Osipenko <dmitry.osipenko@collabora.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> Message-ID: <20241010182427.1434605-60-seanjc@google.com> Signed-off-by: Charles Mirabile <cmirabil@redhat.com>
1 parent 5f46ea5 commit 79e6ea8

File tree

1 file changed

+4
-7
lines changed

1 file changed

+4
-7
lines changed

arch/riscv/kvm/mmu.c

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -601,6 +601,7 @@ int kvm_riscv_gstage_map(struct kvm_vcpu *vcpu,
601601
bool logging = (memslot->dirty_bitmap &&
602602
!(memslot->flags & KVM_MEM_READONLY)) ? true : false;
603603
unsigned long vma_pagesize, mmu_seq;
604+
struct page *page;
604605

605606
/* We need minimum second+third level pages */
606607
ret = kvm_mmu_topup_memory_cache(pcache, gstage_pgd_levels);
@@ -631,7 +632,7 @@ int kvm_riscv_gstage_map(struct kvm_vcpu *vcpu,
631632

632633
/*
633634
* Read mmu_invalidate_seq so that KVM can detect if the results of
634-
* vma_lookup() or gfn_to_pfn_prot() become stale priort to acquiring
635+
* vma_lookup() or __kvm_faultin_pfn() become stale prior to acquiring
635636
* kvm->mmu_lock.
636637
*
637638
* Rely on mmap_read_unlock() for an implicit smp_rmb(), which pairs
@@ -647,7 +648,7 @@ int kvm_riscv_gstage_map(struct kvm_vcpu *vcpu,
647648
return -EFAULT;
648649
}
649650

650-
hfn = gfn_to_pfn_prot(kvm, gfn, is_write, &writable);
651+
hfn = kvm_faultin_pfn(vcpu, gfn, is_write, &writable, &page);
651652
if (hfn == KVM_PFN_ERR_HWPOISON) {
652653
send_sig_mceerr(BUS_MCEERR_AR, (void __user *)hva,
653654
vma_pageshift, current);
@@ -681,11 +682,7 @@ int kvm_riscv_gstage_map(struct kvm_vcpu *vcpu,
681682
kvm_err("Failed to map in G-stage\n");
682683

683684
out_unlock:
684-
if ((!ret || ret == -EEXIST) && writable)
685-
kvm_release_pfn_dirty(hfn);
686-
else
687-
kvm_release_pfn_clean(hfn);
688-
685+
kvm_release_faultin_page(kvm, page, ret && ret != -EEXIST, writable);
689686
spin_unlock(&kvm->mmu_lock);
690687
return ret;
691688
}

0 commit comments

Comments
 (0)