Commit 8794b4f5 authored by Marc Zyngier's avatar Marc Zyngier
Browse files

Merge branch kvm-arm64/per-vcpu-host-pmu-data into kvmarm-master/next 



* kvm-arm64/per-vcpu-host-pmu-data:
  : .
  : Pass the host PMU state in the vcpu to avoid the use of additional
  : shared memory between EL1 and EL2 (this obviously only applies
  : to nVHE and Protected setups).
  :
  : Patches courtesy of Fuad Tabba.
  : .
  KVM: arm64: pmu: Restore compilation when HW_PERF_EVENTS isn't selected
  KVM: arm64: Reenable pmu in Protected Mode
  KVM: arm64: Pass pmu events to hyp via vcpu
  KVM: arm64: Repack struct kvm_pmu to reduce size
  KVM: arm64: Wrapper for getting pmu_events

Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
parents ec2cff6c 20492a62

arch/arm64/include/asm/kvm_host.h

+0 −11
Original line number Diff line number Diff line
@@ -273,14 +273,8 @@ struct kvm_cpu_context { 
	struct kvm_vcpu *__hyp_running_vcpu;

};



struct kvm_pmu_events {

	u32 events_host;

	u32 events_guest;

};



struct kvm_host_data {

	struct kvm_cpu_context host_ctxt;

	struct kvm_pmu_events pmu_events;

};



struct kvm_host_psci_config {
@@ -820,9 +814,6 @@ void kvm_arch_vcpu_put_debug_state_flags(struct kvm_vcpu *vcpu); 
#ifdef CONFIG_KVM

void kvm_set_pmu_events(u32 set, struct perf_event_attr *attr);

void kvm_clr_pmu_events(u32 clr);



void kvm_vcpu_pmu_restore_guest(struct kvm_vcpu *vcpu);

void kvm_vcpu_pmu_restore_host(struct kvm_vcpu *vcpu);

#else

static inline void kvm_set_pmu_events(u32 set, struct perf_event_attr *attr) {}

static inline void kvm_clr_pmu_events(u32 clr) {}
@@ -854,8 +845,6 @@ bool kvm_arm_vcpu_is_finalized(struct kvm_vcpu *vcpu); 
#define kvm_has_mte(kvm)					\

	(system_supports_mte() &&				\

	 test_bit(KVM_ARCH_FLAG_MTE_ENABLED, &(kvm)->arch.flags))

#define kvm_vcpu_has_pmu(vcpu)					\

	(test_bit(KVM_ARM_VCPU_PMU_V3, (vcpu)->arch.features))



int kvm_trng_call(struct kvm_vcpu *vcpu);

#ifdef CONFIG_KVM

arch/arm64/kvm/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ obj-$(CONFIG_KVM) += hyp/ 
kvm-y += arm.o mmu.o mmio.o psci.o hypercalls.o pvtime.o \

	 inject_fault.o va_layout.o handle_exit.o \

	 guest.o debug.o reset.o sys_regs.o \

	 vgic-sys-reg-v3.o fpsimd.o pmu.o pkvm.o \

	 vgic-sys-reg-v3.o fpsimd.o pkvm.o \

	 arch_timer.o trng.o vmid.o \

	 vgic/vgic.o vgic/vgic-init.o \

	 vgic/vgic-irqfd.o vgic/vgic-v2.o \
@@ -22,7 +22,7 @@ kvm-y += arm.o mmu.o mmio.o psci.o hypercalls.o pvtime.o \ 
	 vgic/vgic-mmio-v3.o vgic/vgic-kvm-device.o \

	 vgic/vgic-its.o vgic/vgic-debug.o



kvm-$(CONFIG_HW_PERF_EVENTS)  += pmu-emul.o

kvm-$(CONFIG_HW_PERF_EVENTS)  += pmu-emul.o pmu.o



always-y := hyp_constants.h hyp-constants.s

arch/arm64/kvm/arm.c

+2 −0
Original line number Diff line number Diff line
@@ -882,6 +882,8 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu) 


		kvm_vgic_flush_hwstate(vcpu);



		kvm_pmu_update_vcpu_events(vcpu);



		/*

		 * Ensure we set mode to IN_GUEST_MODE after we disable

		 * interrupts and before the final VCPU requests check.

arch/arm64/kvm/hyp/nvhe/switch.c

+11 −14
Original line number Diff line number Diff line
@@ -153,13 +153,10 @@ static void __hyp_vgic_restore_state(struct kvm_vcpu *vcpu) 
/**

 * Disable host events, enable guest events

 */

static bool __pmu_switch_to_guest(struct kvm_cpu_context *host_ctxt)

#ifdef CONFIG_HW_PERF_EVENTS

static bool __pmu_switch_to_guest(struct kvm_vcpu *vcpu)

{

	struct kvm_host_data *host;

	struct kvm_pmu_events *pmu;



	host = container_of(host_ctxt, struct kvm_host_data, host_ctxt);

	pmu = &host->pmu_events;

	struct kvm_pmu_events *pmu = &vcpu->arch.pmu.events;



	if (pmu->events_host)

		write_sysreg(pmu->events_host, pmcntenclr_el0);
@@ -173,13 +170,9 @@ static bool __pmu_switch_to_guest(struct kvm_cpu_context *host_ctxt) 
/**

 * Disable guest events, enable host events

 */

static void __pmu_switch_to_host(struct kvm_cpu_context *host_ctxt)

static void __pmu_switch_to_host(struct kvm_vcpu *vcpu)

{

	struct kvm_host_data *host;

	struct kvm_pmu_events *pmu;



	host = container_of(host_ctxt, struct kvm_host_data, host_ctxt);

	pmu = &host->pmu_events;

	struct kvm_pmu_events *pmu = &vcpu->arch.pmu.events;



	if (pmu->events_guest)

		write_sysreg(pmu->events_guest, pmcntenclr_el0);
@@ -187,6 +180,10 @@ static void __pmu_switch_to_host(struct kvm_cpu_context *host_ctxt) 
	if (pmu->events_host)

		write_sysreg(pmu->events_host, pmcntenset_el0);

}

#else

#define __pmu_switch_to_guest(v)	({ false; })

#define __pmu_switch_to_host(v)		do {} while (0)

#endif



/**

 * Handler for protected VM MSR, MRS or System instruction execution in AArch64.
@@ -304,7 +301,7 @@ int __kvm_vcpu_run(struct kvm_vcpu *vcpu) 
	host_ctxt->__hyp_running_vcpu = vcpu;

	guest_ctxt = &vcpu->arch.ctxt;



	pmu_switch_needed = __pmu_switch_to_guest(host_ctxt);

	pmu_switch_needed = __pmu_switch_to_guest(vcpu);



	__sysreg_save_state_nvhe(host_ctxt);

	/*
@@ -366,7 +363,7 @@ int __kvm_vcpu_run(struct kvm_vcpu *vcpu) 
	__debug_restore_host_buffers_nvhe(vcpu);



	if (pmu_switch_needed)

		__pmu_switch_to_host(host_ctxt);

		__pmu_switch_to_host(vcpu);



	/* Returning to host will clear PSR.I, remask PMR if needed */

	if (system_uses_irq_prio_masking())

arch/arm64/kvm/pmu-emul.c

+1 −2
Original line number Diff line number Diff line
@@ -774,8 +774,7 @@ void kvm_host_pmu_init(struct arm_pmu *pmu) 
{

	struct arm_pmu_entry *entry;



	if (pmu->pmuver == 0 || pmu->pmuver == ID_AA64DFR0_PMUVER_IMP_DEF ||

	    is_protected_kvm_enabled())

	if (pmu->pmuver == 0 || pmu->pmuver == ID_AA64DFR0_PMUVER_IMP_DEF)

		return;



	mutex_lock(&arm_pmus_lock);