Commit 63a9b0bc authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

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

KVM/riscv changes for 6.19

- SBI MPXY support for KVM guest
- New KVM_EXIT_FAIL_ENTRY_NO_VSFILE for the case when in-kernel
  AIA virtualization fails to allocate IMSIC VS-file
- Support enabling dirty log gradually in small chunks
- Fix guest page fault within HLV* instructions
- Flush VS-stage TLB after VCPU migration for Andes cores
parents 80402804 3239c52f

Documentation/virt/kvm/api.rst

+1 −1
Original line number Diff line number Diff line
@@ -8028,7 +8028,7 @@ will be initialized to 1 when created. This also improves performance because 
dirty logging can be enabled gradually in small chunks on the first call

to KVM_CLEAR_DIRTY_LOG.  KVM_DIRTY_LOG_INITIALLY_SET depends on

KVM_DIRTY_LOG_MANUAL_PROTECT_ENABLE (it is also only available on

x86 and arm64 for now).

x86, arm64 and riscv for now).



KVM_CAP_MANUAL_DIRTY_LOG_PROTECT2 was previously available under the name

KVM_CAP_MANUAL_DIRTY_LOG_PROTECT, but the implementation had bugs that make

arch/riscv/include/asm/kvm_host.h

+6 −0
Original line number Diff line number Diff line
@@ -59,6 +59,9 @@ 
					 BIT(IRQ_VS_TIMER) | \

					 BIT(IRQ_VS_EXT))



#define KVM_DIRTY_LOG_MANUAL_CAPS	(KVM_DIRTY_LOG_MANUAL_PROTECT_ENABLE | \

					 KVM_DIRTY_LOG_INITIALLY_SET)



struct kvm_vm_stat {

	struct kvm_vm_stat_generic generic;

};
@@ -327,4 +330,7 @@ bool kvm_riscv_vcpu_stopped(struct kvm_vcpu *vcpu); 


void kvm_riscv_vcpu_record_steal_time(struct kvm_vcpu *vcpu);



/* Flags representing implementation specific details */

DECLARE_STATIC_KEY_FALSE(kvm_riscv_vsstage_tlb_no_gpa);



#endif /* __RISCV_KVM_HOST_H__ */

arch/riscv/include/asm/kvm_tlb.h

+1 −0
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ void kvm_riscv_local_hfence_vvma_gva(unsigned long vmid, 
				     unsigned long gva, unsigned long gvsz,

				     unsigned long order);

void kvm_riscv_local_hfence_vvma_all(unsigned long vmid);

void kvm_riscv_local_tlb_sanitize(struct kvm_vcpu *vcpu);



void kvm_riscv_tlb_flush_process(struct kvm_vcpu *vcpu);

arch/riscv/include/asm/kvm_vcpu_sbi.h

+4 −1
Original line number Diff line number Diff line
@@ -69,7 +69,9 @@ struct kvm_vcpu_sbi_extension { 
			     unsigned long reg_size, const void *reg_val);

};



void kvm_riscv_vcpu_sbi_forward(struct kvm_vcpu *vcpu, struct kvm_run *run);

int kvm_riscv_vcpu_sbi_forward_handler(struct kvm_vcpu *vcpu,

				       struct kvm_run *run,

				       struct kvm_vcpu_sbi_return *retdata);

void kvm_riscv_vcpu_sbi_system_reset(struct kvm_vcpu *vcpu,

				     struct kvm_run *run,

				     u32 type, u64 flags);
@@ -105,6 +107,7 @@ extern const struct kvm_vcpu_sbi_extension vcpu_sbi_ext_dbcn; 
extern const struct kvm_vcpu_sbi_extension vcpu_sbi_ext_susp;

extern const struct kvm_vcpu_sbi_extension vcpu_sbi_ext_sta;

extern const struct kvm_vcpu_sbi_extension vcpu_sbi_ext_fwft;

extern const struct kvm_vcpu_sbi_extension vcpu_sbi_ext_mpxy;

extern const struct kvm_vcpu_sbi_extension vcpu_sbi_ext_experimental;

extern const struct kvm_vcpu_sbi_extension vcpu_sbi_ext_vendor;

arch/riscv/include/asm/kvm_vmid.h

+0 −1
Original line number Diff line number Diff line
@@ -22,6 +22,5 @@ unsigned long kvm_riscv_gstage_vmid_bits(void); 
int kvm_riscv_gstage_vmid_init(struct kvm *kvm);

bool kvm_riscv_gstage_vmid_ver_changed(struct kvm_vmid *vmid);

void kvm_riscv_gstage_vmid_update(struct kvm_vcpu *vcpu);

void kvm_riscv_gstage_vmid_sanitize(struct kvm_vcpu *vcpu);



#endif