Commit b89acb65 authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

Merge tag 'kvm-riscv-fixes-5.16-1' of https://github.com/kvm-riscv/linux into HEAD 

KVM/riscv fixes for 5.16, take #1

- Fix incorrect KVM_MAX_VCPUS value

- Unmap stage2 mapping when deleting/moving a memslot
  (This was due to empty kvm_arch_flush_shadow_memslot())
parents 13605725 74c2e97b

arch/riscv/include/asm/kvm_host.h

+3 −5
Original line number Diff line number Diff line
@@ -12,14 +12,12 @@ 
#include <linux/types.h>

#include <linux/kvm.h>

#include <linux/kvm_types.h>

#include <asm/csr.h>

#include <asm/kvm_vcpu_fp.h>

#include <asm/kvm_vcpu_timer.h>



#ifdef CONFIG_64BIT

#define KVM_MAX_VCPUS			(1U << 16)

#else

#define KVM_MAX_VCPUS			(1U << 9)

#endif

#define KVM_MAX_VCPUS			\

	((HGATP_VMID_MASK >> HGATP_VMID_SHIFT) + 1)



#define KVM_HALT_POLL_NS_DEFAULT	500000

arch/riscv/kvm/mmu.c

+6 −0
Original line number Diff line number Diff line
@@ -453,6 +453,12 @@ void kvm_arch_flush_shadow_all(struct kvm *kvm) 
void kvm_arch_flush_shadow_memslot(struct kvm *kvm,

				   struct kvm_memory_slot *slot)

{

	gpa_t gpa = slot->base_gfn << PAGE_SHIFT;

	phys_addr_t size = slot->npages << PAGE_SHIFT;



	spin_lock(&kvm->mmu_lock);

	stage2_unmap_range(kvm, gpa, size, false);

	spin_unlock(&kvm->mmu_lock);

}



void kvm_arch_commit_memory_region(struct kvm *kvm,