Commit 07a289a0 authored by Quan Zhou's avatar Quan Zhou Committed by Anup Patel
Browse files

RISC-V: KVM: Avoid re-acquiring memslot in kvm_riscv_gstage_map() 



The caller has already passed in the memslot, and there are
two instances `{kvm_faultin_pfn/mark_page_dirty}` of retrieving
the memslot again in `kvm_riscv_gstage_map`, we can replace them
with `{__kvm_faultin_pfn/mark_page_dirty_in_slot}`.

Signed-off-by: default avatarQuan Zhou <zhouquan@iscas.ac.cn>
Reviewed-by: default avatarAnup Patel <anup@brainfault.org>
Link: https://lore.kernel.org/r/50989f0a02790f9d7dc804c2ade6387c4e7fbdbc.1749634392.git.zhouquan@iscas.ac.cn


Signed-off-by: default avatarAnup Patel <anup@brainfault.org>
parent fce11b66

arch/riscv/kvm/mmu.c

+3 −2
Original line number Diff line number Diff line
@@ -391,7 +391,8 @@ int kvm_riscv_mmu_map(struct kvm_vcpu *vcpu, struct kvm_memory_slot *memslot, 
		return -EFAULT;

	}



	hfn = kvm_faultin_pfn(vcpu, gfn, is_write, &writable, &page);

	hfn = __kvm_faultin_pfn(memslot, gfn, is_write ? FOLL_WRITE : 0,

				&writable, &page);

	if (hfn == KVM_PFN_ERR_HWPOISON) {

		send_sig_mceerr(BUS_MCEERR_AR, (void __user *)hva,

				vma_pageshift, current);
@@ -413,7 +414,7 @@ int kvm_riscv_mmu_map(struct kvm_vcpu *vcpu, struct kvm_memory_slot *memslot, 
		goto out_unlock;



	if (writable) {

		mark_page_dirty(kvm, gfn);

		mark_page_dirty_in_slot(kvm, memslot, gfn);

		ret = kvm_riscv_gstage_map_page(&gstage, pcache, gpa, hfn << PAGE_SHIFT,

						vma_pagesize, false, true, out_map);

	} else {