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

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

 KVM/riscv changes for 6.10

- Support guest breakpoints using ebreak
- Introduce per-VCPU mp_state_lock and reset_cntx_lock
- Virtualize SBI PMU snapshot and counter overflow interrupts
- New selftests for SBI PMU and Guest ebreak
parents a96cb3bf 5ef2f3d4

Makefile

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
VERSION = 6

PATCHLEVEL = 9

SUBLEVEL = 0

EXTRAVERSION = -rc2

EXTRAVERSION = -rc3

NAME = Hurr durr I'ma ninja sloth



# *DOCUMENTATION*

arch/powerpc/include/asm/vdso/gettimeofday.h

+1 −2
Original line number Diff line number Diff line
@@ -4,7 +4,6 @@ 


#ifndef __ASSEMBLY__



#include <asm/page.h>

#include <asm/vdso/timebase.h>

#include <asm/barrier.h>

#include <asm/unistd.h>
@@ -95,7 +94,7 @@ const struct vdso_data *__arch_get_vdso_data(void); 
static __always_inline

const struct vdso_data *__arch_get_timens_vdso_data(const struct vdso_data *vd)

{

	return (void *)vd + PAGE_SIZE;

	return (void *)vd + (1U << CONFIG_PAGE_SHIFT);

}

#endif

arch/riscv/include/asm/csr.h

+3 −2
Original line number Diff line number Diff line
@@ -168,7 +168,8 @@ 
#define VSIP_TO_HVIP_SHIFT	(IRQ_VS_SOFT - IRQ_S_SOFT)

#define VSIP_VALID_MASK		((_AC(1, UL) << IRQ_S_SOFT) | \

				 (_AC(1, UL) << IRQ_S_TIMER) | \

				 (_AC(1, UL) << IRQ_S_EXT))

				 (_AC(1, UL) << IRQ_S_EXT) | \

				 (_AC(1, UL) << IRQ_PMU_OVF))



/* AIA CSR bits */

#define TOPI_IID_SHIFT		16
@@ -281,7 +282,7 @@ 
#define CSR_HPMCOUNTER30H	0xc9e

#define CSR_HPMCOUNTER31H	0xc9f



#define CSR_SSCOUNTOVF		0xda0

#define CSR_SCOUNTOVF		0xda0



#define CSR_SSTATUS		0x100

#define CSR_SIE			0x104

arch/riscv/include/asm/kvm_host.h

+19 −2
Original line number Diff line number Diff line
@@ -43,6 +43,17 @@ 
	KVM_ARCH_REQ_FLAGS(5, KVM_REQUEST_WAIT | KVM_REQUEST_NO_WAKEUP)

#define KVM_REQ_STEAL_UPDATE		KVM_ARCH_REQ(6)



#define KVM_HEDELEG_DEFAULT		(BIT(EXC_INST_MISALIGNED) | \

					 BIT(EXC_BREAKPOINT)      | \

					 BIT(EXC_SYSCALL)         | \

					 BIT(EXC_INST_PAGE_FAULT) | \

					 BIT(EXC_LOAD_PAGE_FAULT) | \

					 BIT(EXC_STORE_PAGE_FAULT))



#define KVM_HIDELEG_DEFAULT		(BIT(IRQ_VS_SOFT)  | \

					 BIT(IRQ_VS_TIMER) | \

					 BIT(IRQ_VS_EXT))



enum kvm_riscv_hfence_type {

	KVM_RISCV_HFENCE_UNKNOWN = 0,

	KVM_RISCV_HFENCE_GVMA_VMID_GPA,
@@ -169,6 +180,7 @@ struct kvm_vcpu_csr { 
struct kvm_vcpu_config {

	u64 henvcfg;

	u64 hstateen0;

	unsigned long hedeleg;

};



struct kvm_vcpu_smstateen_csr {
@@ -211,6 +223,7 @@ struct kvm_vcpu_arch { 


	/* 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;
@@ -252,8 +265,9 @@ struct kvm_vcpu_arch { 
	/* Cache pages needed to program page tables with spinlock held */

	struct kvm_mmu_memory_cache mmu_page_cache;



	/* VCPU power-off state */

	bool power_off;

	/* VCPU power state */

	struct kvm_mp_state mp_state;

	spinlock_t mp_state_lock;



	/* Don't run the VCPU (blocked) */

	bool pause;
@@ -374,8 +388,11 @@ int kvm_riscv_vcpu_unset_interrupt(struct kvm_vcpu *vcpu, unsigned int irq); 
void kvm_riscv_vcpu_flush_interrupts(struct kvm_vcpu *vcpu);

void kvm_riscv_vcpu_sync_interrupts(struct kvm_vcpu *vcpu);

bool kvm_riscv_vcpu_has_interrupts(struct kvm_vcpu *vcpu, u64 mask);

void __kvm_riscv_vcpu_power_off(struct kvm_vcpu *vcpu);

void kvm_riscv_vcpu_power_off(struct kvm_vcpu *vcpu);

void __kvm_riscv_vcpu_power_on(struct kvm_vcpu *vcpu);

void kvm_riscv_vcpu_power_on(struct kvm_vcpu *vcpu);

bool kvm_riscv_vcpu_stopped(struct kvm_vcpu *vcpu);



void kvm_riscv_vcpu_sbi_sta_reset(struct kvm_vcpu *vcpu);

void kvm_riscv_vcpu_record_steal_time(struct kvm_vcpu *vcpu);

arch/riscv/include/asm/kvm_vcpu_pmu.h

+14 −2
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ static_assert(RISCV_KVM_MAX_COUNTERS <= 64); 


struct kvm_fw_event {

	/* Current value of the event */

	unsigned long value;

	u64 value;



	/* Event monitoring status */

	bool started;
@@ -36,6 +36,7 @@ struct kvm_pmc { 
	bool started;

	/* Monitoring event ID */

	unsigned long event_idx;

	struct kvm_vcpu *vcpu;

};



/* PMU data structure per vcpu */
@@ -50,6 +51,12 @@ struct kvm_pmu { 
	bool init_done;

	/* Bit map of all the virtual counter used */

	DECLARE_BITMAP(pmc_in_use, RISCV_KVM_MAX_COUNTERS);

	/* Bit map of all the virtual counter overflown */

	DECLARE_BITMAP(pmc_overflown, RISCV_KVM_MAX_COUNTERS);

	/* The address of the counter snapshot area (guest physical address) */

	gpa_t snapshot_addr;

	/* The actual data of the snapshot */

	struct riscv_pmu_snapshot_data *sdata;

};



#define vcpu_to_pmu(vcpu) (&(vcpu)->arch.pmu_context)
@@ -82,9 +89,14 @@ int kvm_riscv_vcpu_pmu_ctr_cfg_match(struct kvm_vcpu *vcpu, unsigned long ctr_ba 
				     unsigned long ctr_mask, unsigned long flags,

				     unsigned long eidx, u64 evtdata,

				     struct kvm_vcpu_sbi_return *retdata);

int kvm_riscv_vcpu_pmu_ctr_read(struct kvm_vcpu *vcpu, unsigned long cidx,

int kvm_riscv_vcpu_pmu_fw_ctr_read(struct kvm_vcpu *vcpu, unsigned long cidx,

				struct kvm_vcpu_sbi_return *retdata);

int kvm_riscv_vcpu_pmu_fw_ctr_read_hi(struct kvm_vcpu *vcpu, unsigned long cidx,

				      struct kvm_vcpu_sbi_return *retdata);

void kvm_riscv_vcpu_pmu_init(struct kvm_vcpu *vcpu);

int kvm_riscv_vcpu_pmu_snapshot_set_shmem(struct kvm_vcpu *vcpu, unsigned long saddr_low,

				      unsigned long saddr_high, unsigned long flags,

				      struct kvm_vcpu_sbi_return *retdata);

void kvm_riscv_vcpu_pmu_deinit(struct kvm_vcpu *vcpu);

void kvm_riscv_vcpu_pmu_reset(struct kvm_vcpu *vcpu);