Commit 1f7c9d52 authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

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

KVM/riscv changes for 6.16

- Add vector registers to get-reg-list selftest
- VCPU reset related improvements
- Remove scounteren initialization from VCPU reset
- Support VCPU reset from userspace using set_mpstate() ioctl
parents 4d526b02 7917be17

Documentation/virt/kvm/api.rst

+11 −0
Original line number Diff line number Diff line
@@ -8541,6 +8541,17 @@ aforementioned registers before the first KVM_RUN. These registers are VM 
scoped, meaning that the same set of values are presented on all vCPUs in a

given VM.



7.43 KVM_CAP_RISCV_MP_STATE_RESET

---------------------------------



:Architectures: riscv

:Type: VM

:Parameters: None

:Returns: 0 on success, -EINVAL if arg[0] is not zero



When this capability is enabled, KVM resets the VCPU when setting

MP_STATE_INIT_RECEIVED through IOCTL.  The original MP_STATE is preserved.



8. Other capabilities.

======================

arch/riscv/include/asm/kvm_aia.h

+0 −3
Original line number Diff line number Diff line
@@ -63,9 +63,6 @@ struct kvm_vcpu_aia { 
	/* CPU AIA CSR context of Guest VCPU */

	struct kvm_vcpu_aia_csr guest_csr;



	/* CPU AIA CSR context upon Guest VCPU reset */

	struct kvm_vcpu_aia_csr guest_reset_csr;



	/* Guest physical address of IMSIC for this VCPU */

	gpa_t		imsic_addr;

arch/riscv/include/asm/kvm_host.h

+11 −6
Original line number Diff line number Diff line
@@ -119,6 +119,9 @@ struct kvm_arch { 


	/* AIA Guest/VM context */

	struct kvm_aia aia;



	/* KVM_CAP_RISCV_MP_STATE_RESET */

	bool mp_state_reset;

};



struct kvm_cpu_trap {
@@ -193,6 +196,12 @@ struct kvm_vcpu_smstateen_csr { 
	unsigned long sstateen0;

};



struct kvm_vcpu_reset_state {

	spinlock_t lock;

	unsigned long pc;

	unsigned long a1;

};



struct kvm_vcpu_arch {

	/* VCPU ran at least once */

	bool ran_atleast_once;
@@ -227,12 +236,8 @@ struct kvm_vcpu_arch { 
	/* CPU Smstateen CSR context of Guest VCPU */

	struct kvm_vcpu_smstateen_csr smstateen_csr;



	/* CPU context upon Guest VCPU reset */

	struct kvm_cpu_context guest_reset_context;

	spinlock_t reset_cntx_lock;



	/* CPU CSR context upon Guest VCPU reset */

	struct kvm_vcpu_csr guest_reset_csr;

	/* CPU reset state of Guest VCPU */

	struct kvm_vcpu_reset_state reset_state;



	/*

	 * VCPU interrupts

arch/riscv/include/asm/kvm_vcpu_sbi.h

+3 −0
Original line number Diff line number Diff line
@@ -55,6 +55,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);

void kvm_riscv_vcpu_sbi_request_reset(struct kvm_vcpu *vcpu,

				      unsigned long pc, unsigned long a1);

void kvm_riscv_vcpu_sbi_load_reset_state(struct kvm_vcpu *vcpu);

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

int kvm_riscv_vcpu_set_reg_sbi_ext(struct kvm_vcpu *vcpu,

				   const struct kvm_one_reg *reg);

arch/riscv/include/asm/kvm_vcpu_vector.h

+2 −4
Original line number Diff line number Diff line
@@ -33,8 +33,7 @@ void kvm_riscv_vcpu_guest_vector_restore(struct kvm_cpu_context *cntx, 
					 unsigned long *isa);

void kvm_riscv_vcpu_host_vector_save(struct kvm_cpu_context *cntx);

void kvm_riscv_vcpu_host_vector_restore(struct kvm_cpu_context *cntx);

int kvm_riscv_vcpu_alloc_vector_context(struct kvm_vcpu *vcpu,

					struct kvm_cpu_context *cntx);

int kvm_riscv_vcpu_alloc_vector_context(struct kvm_vcpu *vcpu);

void kvm_riscv_vcpu_free_vector_context(struct kvm_vcpu *vcpu);

#else
@@ -62,8 +61,7 @@ static inline void kvm_riscv_vcpu_host_vector_restore(struct kvm_cpu_context *cn 
{

}



static inline int kvm_riscv_vcpu_alloc_vector_context(struct kvm_vcpu *vcpu,

						      struct kvm_cpu_context *cntx)

static inline int kvm_riscv_vcpu_alloc_vector_context(struct kvm_vcpu *vcpu)

{

	return 0;

}