Commit 43f640f4 authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

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

KVM/riscv changes for 6.14

- Svvptc, Zabha, and Ziccrse extension support for Guest/VM
- Virtualize SBI system suspend extension for Guest/VM
- Trap related exit statstics as SBI PMU firmware counters for Guest/VM
parents 4f7ff70c af79caa8

arch/riscv/include/asm/kvm_host.h

+5 −0
Original line number Diff line number Diff line
@@ -87,6 +87,11 @@ struct kvm_vcpu_stat { 
	u64 csr_exit_kernel;

	u64 signal_exits;

	u64 exits;

	u64 instr_illegal_exits;

	u64 load_misaligned_exits;

	u64 store_misaligned_exits;

	u64 load_access_exits;

	u64 store_access_exits;

};



struct kvm_arch_memory_slot {

arch/riscv/include/asm/kvm_vcpu_sbi.h

+1 −0
Original line number Diff line number Diff line
@@ -85,6 +85,7 @@ extern const struct kvm_vcpu_sbi_extension vcpu_sbi_ext_rfence; 
extern const struct kvm_vcpu_sbi_extension vcpu_sbi_ext_srst;

extern const struct kvm_vcpu_sbi_extension vcpu_sbi_ext_hsm;

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_experimental;

extern const struct kvm_vcpu_sbi_extension vcpu_sbi_ext_vendor;

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

+4 −0
Original line number Diff line number Diff line
@@ -179,6 +179,9 @@ enum KVM_RISCV_ISA_EXT_ID { 
	KVM_RISCV_ISA_EXT_SSNPM,

	KVM_RISCV_ISA_EXT_SVADE,

	KVM_RISCV_ISA_EXT_SVADU,

	KVM_RISCV_ISA_EXT_SVVPTC,

	KVM_RISCV_ISA_EXT_ZABHA,

	KVM_RISCV_ISA_EXT_ZICCRSE,

	KVM_RISCV_ISA_EXT_MAX,

};
@@ -198,6 +201,7 @@ enum KVM_RISCV_SBI_EXT_ID { 
	KVM_RISCV_SBI_EXT_VENDOR,

	KVM_RISCV_SBI_EXT_DBCN,

	KVM_RISCV_SBI_EXT_STA,

	KVM_RISCV_SBI_EXT_SUSP,

	KVM_RISCV_SBI_EXT_MAX,

};

arch/riscv/kvm/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ kvm-y += vcpu_sbi_hsm.o 
kvm-$(CONFIG_RISCV_PMU_SBI) += vcpu_sbi_pmu.o

kvm-y += vcpu_sbi_replace.o

kvm-y += vcpu_sbi_sta.o

kvm-y += vcpu_sbi_system.o

kvm-$(CONFIG_RISCV_SBI_V01) += vcpu_sbi_v01.o

kvm-y += vcpu_switch.o

kvm-y += vcpu_timer.o

arch/riscv/kvm/vcpu.c

+6 −1
Original line number Diff line number Diff line
@@ -34,7 +34,12 @@ const struct _kvm_stats_desc kvm_vcpu_stats_desc[] = { 
	STATS_DESC_COUNTER(VCPU, csr_exit_user),

	STATS_DESC_COUNTER(VCPU, csr_exit_kernel),

	STATS_DESC_COUNTER(VCPU, signal_exits),

	STATS_DESC_COUNTER(VCPU, exits)

	STATS_DESC_COUNTER(VCPU, exits),

	STATS_DESC_COUNTER(VCPU, instr_illegal_exits),

	STATS_DESC_COUNTER(VCPU, load_misaligned_exits),

	STATS_DESC_COUNTER(VCPU, store_misaligned_exits),

	STATS_DESC_COUNTER(VCPU, load_access_exits),

	STATS_DESC_COUNTER(VCPU, store_access_exits),

};



const struct kvm_stats_header kvm_vcpu_stats_header = {