Commit 557971e3 authored by Marc Zyngier's avatar Marc Zyngier Committed by Zheng Zengkai
Browse files

KVM: arm64: Restore PMU configuration on first run 

mainline inclusion
from mainline-v5.14-rc1
commit d0c94c49
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I4NP0K
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=d0c94c49792cf780cbfefe29f81bb8c3b73bc76b



-------------------

Restoring a guest with an active virtual PMU results in no perf
counters being instanciated on the host side. Not quite what
you'd expect from a restore.

In order to fix this, force a writeback of PMCR_EL0 on the first
run of a vcpu (using a new request so that it happens once the
vcpu has been loaded). This will in turn create all the host-side
counters that were missing.

Reported-by: default avatarJinank Jain <jinankj@amazon.de>
Tested-by: default avatarJinank Jain <jinankj@amazon.de>
Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/87wnrbylxv.wl-maz@kernel.org
Link: https://lore.kernel.org/r/b53dfcf9bbc4db7f96154b1cd5188d72b9766358.camel@amazon.de


Signed-off-by: default avatarJingyi Wang <wangjingyi11@huawei.com>
Reviewed-by: default avatarZenghui Yu <yuzenghui@huawei.com>
Reviewed-by: default avatarWei Li <liwei391@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parent 2f6ef3e0

arch/arm64/include/asm/kvm_host.h

+1 −0
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ 
#define KVM_REQ_VCPU_RESET	KVM_ARCH_REQ(2)

#define KVM_REQ_RECORD_STEAL	KVM_ARCH_REQ(3)

#define KVM_REQ_RELOAD_GICv4	KVM_ARCH_REQ(4)

#define KVM_REQ_RELOAD_PMU	KVM_ARCH_REQ(5)



#define KVM_DIRTY_LOG_MANUAL_CAPS   (KVM_DIRTY_LOG_MANUAL_PROTECT_ENABLE | \

				     KVM_DIRTY_LOG_INITIALLY_SET)

arch/arm64/kvm/arm.c

+4 −0
Original line number Diff line number Diff line
@@ -713,6 +713,10 @@ static void check_vcpu_requests(struct kvm_vcpu *vcpu) 
			vgic_v4_load(vcpu);

			preempt_enable();

		}



		if (kvm_check_request(KVM_REQ_RELOAD_PMU, vcpu))

			kvm_pmu_handle_pmcr(vcpu,

					    __vcpu_sys_reg(vcpu, PMCR_EL0));

	}

}

arch/arm64/kvm/pmu-emul.c

+3 −0
Original line number Diff line number Diff line
@@ -858,6 +858,9 @@ int kvm_arm_pmu_v3_enable(struct kvm_vcpu *vcpu) 
	kvm_pmu_vcpu_reset(vcpu);

	vcpu->arch.pmu.ready = true;



	/* One-off reload of the PMU on first run */

	kvm_make_request(KVM_REQ_RELOAD_PMU, vcpu);



	return 0;

}