Commit 7a5189c5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm 

Pull RISC-V kvm updates from Paolo Bonzini:

 - Allow unloading KVM module

 - Allow KVM user-space to set mvendorid, marchid, and mimpid

 - Several fixes and cleanups

* tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
  RISC-V: KVM: Add ONE_REG interface for mvendorid, marchid, and mimpid
  RISC-V: KVM: Save mvendorid, marchid, and mimpid when creating VCPU
  RISC-V: Export sbi_get_mvendorid() and friends
  RISC-V: KVM: Move sbi related struct and functions to kvm_vcpu_sbi.h
  RISC-V: KVM: Use switch-case in kvm_riscv_vcpu_set/get_reg()
  RISC-V: KVM: Remove redundant includes of asm/csr.h
  RISC-V: KVM: Remove redundant includes of asm/kvm_vcpu_timer.h
  RISC-V: KVM: Fix reg_val check in kvm_riscv_vcpu_set_reg_config()
  RISC-V: KVM: Simplify kvm_arch_prepare_memory_region()
  RISC-V: KVM: Exit run-loop immediately if xfer_to_guest fails
  RISC-V: KVM: use vma_lookup() instead of find_vma_intersection()
  RISC-V: KVM: Add exit logic to main.c
parents 569c3a28 6ebbdecf

arch/riscv/include/asm/kvm_host.h

+7 −9
Original line number Diff line number Diff line
@@ -13,10 +13,10 @@ 
#include <linux/kvm.h>

#include <linux/kvm_types.h>

#include <linux/spinlock.h>

#include <asm/csr.h>

#include <asm/hwcap.h>

#include <asm/kvm_vcpu_fp.h>

#include <asm/kvm_vcpu_insn.h>

#include <asm/kvm_vcpu_sbi.h>

#include <asm/kvm_vcpu_timer.h>



#define KVM_MAX_VCPUS			1024
@@ -95,10 +95,6 @@ struct kvm_arch { 
	struct kvm_guest_timer timer;

};



struct kvm_sbi_context {

	int return_handled;

};



struct kvm_cpu_trap {

	unsigned long sepc;

	unsigned long scause;
@@ -169,6 +165,11 @@ struct kvm_vcpu_arch { 
	/* ISA feature bits (similar to MISA) */

	DECLARE_BITMAP(isa, RISCV_ISA_EXT_MAX);



	/* Vendor, Arch, and Implementation details */

	unsigned long mvendorid;

	unsigned long marchid;

	unsigned long mimpid;



	/* SSCRATCH, STVEC, and SCOUNTEREN of Host */

	unsigned long host_sscratch;

	unsigned long host_stvec;
@@ -217,7 +218,7 @@ struct kvm_vcpu_arch { 
	struct kvm_csr_decode csr_decode;



	/* SBI context */

	struct kvm_sbi_context sbi_context;

	struct kvm_vcpu_sbi_context sbi_context;



	/* Cache pages needed to program page tables with spinlock held */

	struct kvm_mmu_memory_cache mmu_page_cache;
@@ -327,7 +328,4 @@ bool kvm_riscv_vcpu_has_interrupts(struct kvm_vcpu *vcpu, unsigned long mask); 
void kvm_riscv_vcpu_power_off(struct kvm_vcpu *vcpu);

void kvm_riscv_vcpu_power_on(struct kvm_vcpu *vcpu);



int kvm_riscv_vcpu_sbi_return(struct kvm_vcpu *vcpu, struct kvm_run *run);

int kvm_riscv_vcpu_sbi_ecall(struct kvm_vcpu *vcpu, struct kvm_run *run);



#endif /* __RISCV_KVM_HOST_H__ */

arch/riscv/include/asm/kvm_vcpu_sbi.h

+6 −0
Original line number Diff line number Diff line
@@ -14,6 +14,10 @@ 
#define KVM_SBI_VERSION_MAJOR 1

#define KVM_SBI_VERSION_MINOR 0



struct kvm_vcpu_sbi_context {

	int return_handled;

};



struct kvm_vcpu_sbi_extension {

	unsigned long extid_start;

	unsigned long extid_end;
@@ -31,7 +35,9 @@ void kvm_riscv_vcpu_sbi_forward(struct kvm_vcpu *vcpu, struct kvm_run *run); 
void kvm_riscv_vcpu_sbi_system_reset(struct kvm_vcpu *vcpu,

				     struct kvm_run *run,

				     u32 type, u64 flags);

int kvm_riscv_vcpu_sbi_return(struct kvm_vcpu *vcpu, struct kvm_run *run);

const struct kvm_vcpu_sbi_extension *kvm_vcpu_sbi_find_ext(unsigned long extid);

int kvm_riscv_vcpu_sbi_ecall(struct kvm_vcpu *vcpu, struct kvm_run *run);



#ifdef CONFIG_RISCV_SBI_V01

extern const struct kvm_vcpu_sbi_extension vcpu_sbi_ext_v01;

arch/riscv/include/uapi/asm/kvm.h

+3 −0
Original line number Diff line number Diff line
@@ -49,6 +49,9 @@ struct kvm_sregs { 
struct kvm_riscv_config {

	unsigned long isa;

	unsigned long zicbom_block_size;

	unsigned long mvendorid;

	unsigned long marchid;

	unsigned long mimpid;

};



/* CORE registers for KVM_GET_ONE_REG and KVM_SET_ONE_REG */

arch/riscv/kernel/sbi.c

+3 −0
Original line number Diff line number Diff line
@@ -627,16 +627,19 @@ long sbi_get_mvendorid(void) 
{

	return __sbi_base_ecall(SBI_EXT_BASE_GET_MVENDORID);

}

EXPORT_SYMBOL_GPL(sbi_get_mvendorid);



long sbi_get_marchid(void)

{

	return __sbi_base_ecall(SBI_EXT_BASE_GET_MARCHID);

}

EXPORT_SYMBOL_GPL(sbi_get_marchid);



long sbi_get_mimpid(void)

{

	return __sbi_base_ecall(SBI_EXT_BASE_GET_MIMPID);

}

EXPORT_SYMBOL_GPL(sbi_get_mimpid);



static void sbi_send_cpumask_ipi(const struct cpumask *target)

{

arch/riscv/kvm/main.c

+6 −0
Original line number Diff line number Diff line
@@ -127,3 +127,9 @@ static int __init riscv_kvm_init(void) 
	return kvm_init(NULL, sizeof(struct kvm_vcpu), 0, THIS_MODULE);

}

module_init(riscv_kvm_init);



static void __exit riscv_kvm_exit(void)

{

	kvm_exit();

}

module_exit(riscv_kvm_exit);