Commit 50b07818 authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

Merge tag 'kvmarm-fixes-5.15-1' of... 

Merge tag 'kvmarm-fixes-5.15-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into kvm-master

KVM/arm64 fixes for 5.15, take #1

- Add missing FORCE target when building the EL2 object
- Fix a PMU probe regression on some platforms
parents 386ca9d7 e840f42a

arch/arm64/kvm/hyp/nvhe/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ $(obj)/kvm_nvhe.tmp.o: $(obj)/hyp.lds $(addprefix $(obj)/,$(hyp-obj)) FORCE 
#    runtime. Because the hypervisor is part of the kernel binary, relocations

#    produce a kernel VA. We enumerate relocations targeting hyp at build time

#    and convert the kernel VAs at those positions to hyp VAs.

$(obj)/hyp-reloc.S: $(obj)/kvm_nvhe.tmp.o $(obj)/gen-hyprel

$(obj)/hyp-reloc.S: $(obj)/kvm_nvhe.tmp.o $(obj)/gen-hyprel FORCE

	$(call if_changed,hyprel)



# 5) Compile hyp-reloc.S and link it into the existing partially linked object.

arch/arm64/kvm/perf.c

+0 −3
Original line number Diff line number Diff line
@@ -50,9 +50,6 @@ static struct perf_guest_info_callbacks kvm_guest_cbs = { 


int kvm_perf_init(void)

{

	if (kvm_pmu_probe_pmuver() != ID_AA64DFR0_PMUVER_IMP_DEF && !is_protected_kvm_enabled())

		static_branch_enable(&kvm_arm_pmu_available);



	return perf_register_guest_info_callbacks(&kvm_guest_cbs);

}

arch/arm64/kvm/pmu-emul.c

+8 −1
Original line number Diff line number Diff line
@@ -740,7 +740,14 @@ void kvm_pmu_set_counter_event_type(struct kvm_vcpu *vcpu, u64 data, 
	kvm_pmu_create_perf_event(vcpu, select_idx);

}



int kvm_pmu_probe_pmuver(void)

void kvm_host_pmu_init(struct arm_pmu *pmu)

{

	if (pmu->pmuver != 0 && pmu->pmuver != ID_AA64DFR0_PMUVER_IMP_DEF &&

	    !kvm_arm_support_pmu_v3() && !is_protected_kvm_enabled())

		static_branch_enable(&kvm_arm_pmu_available);

}



static int kvm_pmu_probe_pmuver(void)

{

	struct perf_event_attr attr = { };

	struct perf_event *event;

drivers/perf/arm_pmu.c

+2 −0
Original line number Diff line number Diff line
@@ -952,6 +952,8 @@ int armpmu_register(struct arm_pmu *pmu) 
		pmu->name, pmu->num_events,

		has_nmi ? ", using NMIs" : "");



	kvm_host_pmu_init(pmu);



	return 0;



out_destroy:

include/kvm/arm_pmu.h

+0 −3
Original line number Diff line number Diff line
@@ -61,7 +61,6 @@ int kvm_arm_pmu_v3_get_attr(struct kvm_vcpu *vcpu, 
int kvm_arm_pmu_v3_has_attr(struct kvm_vcpu *vcpu,

			    struct kvm_device_attr *attr);

int kvm_arm_pmu_v3_enable(struct kvm_vcpu *vcpu);

int kvm_pmu_probe_pmuver(void);

#else

struct kvm_pmu {

};
@@ -118,8 +117,6 @@ static inline u64 kvm_pmu_get_pmceid(struct kvm_vcpu *vcpu, bool pmceid1) 
	return 0;

}



static inline int kvm_pmu_probe_pmuver(void) { return 0xf; }



#endif



#endif