Commit 6bff2a3d authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

Merge tag 'kvmarm-fixes-for-5.2' of... 

Merge tag 'kvmarm-fixes-for-5.2' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEAD

KVM/arm updates for 5.2-rc2

- Correctly annotate HYP-callable code to be non-traceable
- Remove Christoffer from the MAINTAINERS file as his request
parents 94830f18 623e1528

MAINTAINERS

+0 −2
Original line number Diff line number Diff line
@@ -8611,14 +8611,12 @@ F: arch/x86/include/asm/svm.h 
F:	arch/x86/kvm/svm.c



KERNEL VIRTUAL MACHINE FOR ARM/ARM64 (KVM/arm, KVM/arm64)

M:	Christoffer Dall <christoffer.dall@arm.com>

M:	Marc Zyngier <marc.zyngier@arm.com>

R:	James Morse <james.morse@arm.com>

R:	Julien Thierry <julien.thierry@arm.com>

R:	Suzuki K Pouloze <suzuki.poulose@arm.com>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

L:	kvmarm@lists.cs.columbia.edu

W:	http://systems.cs.columbia.edu/projects/kvm-arm

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git

S:	Maintained

F:	arch/arm/include/uapi/asm/kvm*

arch/arm/kvm/hyp/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ CFLAGS_ARMV7VE :=$(call cc-option, -march=armv7ve) 


obj-$(CONFIG_KVM_ARM_HOST) += $(KVM)/arm/hyp/vgic-v3-sr.o

obj-$(CONFIG_KVM_ARM_HOST) += $(KVM)/arm/hyp/timer-sr.o

obj-$(CONFIG_KVM_ARM_HOST) += $(KVM)/arm/hyp/aarch32.o



obj-$(CONFIG_KVM_ARM_HOST) += tlb.o

obj-$(CONFIG_KVM_ARM_HOST) += cp15-sr.o

arch/arm64/include/asm/kvm_host.h

+0 −3
Original line number Diff line number Diff line
@@ -592,9 +592,6 @@ static inline int kvm_arch_vcpu_run_pid_change(struct kvm_vcpu *vcpu) 
void kvm_set_pmu_events(u32 set, struct perf_event_attr *attr);

void kvm_clr_pmu_events(u32 clr);



void __pmu_switch_to_host(struct kvm_cpu_context *host_ctxt);

bool __pmu_switch_to_guest(struct kvm_cpu_context *host_ctxt);



void kvm_vcpu_pmu_restore_guest(struct kvm_vcpu *vcpu);

void kvm_vcpu_pmu_restore_host(struct kvm_vcpu *vcpu);

#else

arch/arm64/kvm/hyp/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ KVM=../../../../virt/kvm 


obj-$(CONFIG_KVM_ARM_HOST) += $(KVM)/arm/hyp/vgic-v3-sr.o

obj-$(CONFIG_KVM_ARM_HOST) += $(KVM)/arm/hyp/timer-sr.o

obj-$(CONFIG_KVM_ARM_HOST) += $(KVM)/arm/hyp/aarch32.o



obj-$(CONFIG_KVM_ARM_HOST) += vgic-v2-cpuif-proxy.o

obj-$(CONFIG_KVM_ARM_HOST) += sysreg-sr.o

arch/arm64/kvm/hyp/switch.c

+39 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
 */



#include <linux/arm-smccc.h>

#include <linux/kvm_host.h>

#include <linux/types.h>

#include <linux/jump_label.h>

#include <uapi/linux/psci.h>
@@ -505,6 +506,44 @@ static void __hyp_text __set_host_arch_workaround_state(struct kvm_vcpu *vcpu) 
#endif

}



/**

 * Disable host events, enable guest events

 */

static bool __hyp_text __pmu_switch_to_guest(struct kvm_cpu_context *host_ctxt)

{

	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;



	if (pmu->events_host)

		write_sysreg(pmu->events_host, pmcntenclr_el0);



	if (pmu->events_guest)

		write_sysreg(pmu->events_guest, pmcntenset_el0);



	return (pmu->events_host || pmu->events_guest);

}



/**

 * Disable guest events, enable host events

 */

static void __hyp_text __pmu_switch_to_host(struct kvm_cpu_context *host_ctxt)

{

	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;



	if (pmu->events_guest)

		write_sysreg(pmu->events_guest, pmcntenclr_el0);



	if (pmu->events_host)

		write_sysreg(pmu->events_host, pmcntenset_el0);

}



/* Switch to the guest for VHE systems running in EL2 */

int kvm_vcpu_run_vhe(struct kvm_vcpu *vcpu)

{

CRA Git | Maintained and supported by SUSTech CRA and CCSE