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

KVM: arm64: Add kvm_vcpu_has_pmu() helper 

mainline inclusion
from mainline-v5.11-rc1
commit 14bda7a9
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=14bda7a927336055d7c0deb1483f9cdb687c2080



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

There are a number of places where we check for the KVM_ARM_VCPU_PMU_V3
feature. Wrap this check into a new kvm_vcpu_has_pmu(), and use
it at the existing locations.

No functional change.

Reviewed-by: default avatarAlexandru Elisei <alexandru.elisei@arm.com>
Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
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 ac463cf3

arch/arm64/include/asm/kvm_host.h

+3 −0
Original line number Diff line number Diff line
@@ -700,6 +700,9 @@ bool kvm_arm_vcpu_is_finalized(struct kvm_vcpu *vcpu); 
#define kvm_arm_vcpu_sve_finalized(vcpu) \

	((vcpu)->arch.flags & KVM_ARM64_VCPU_SVE_FINALIZED)



#define kvm_vcpu_has_pmu(vcpu) \

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



#ifdef CONFIG_ARM64_TWED

#define use_twed() (has_twed() && twed_enable)

extern bool twed_enable;

arch/arm64/kvm/pmu-emul.c

+3 −5
Original line number Diff line number Diff line
@@ -918,8 +918,7 @@ static bool pmu_irq_is_valid(struct kvm *kvm, int irq) 


int kvm_arm_pmu_v3_set_attr(struct kvm_vcpu *vcpu, struct kvm_device_attr *attr)

{

	if (!kvm_arm_support_pmu_v3() ||

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

	if (!kvm_arm_support_pmu_v3() || !kvm_vcpu_has_pmu(vcpu))

		return -ENODEV;



	if (vcpu->arch.pmu.created)
@@ -1020,7 +1019,7 @@ int kvm_arm_pmu_v3_get_attr(struct kvm_vcpu *vcpu, struct kvm_device_attr *attr) 
		if (!irqchip_in_kernel(vcpu->kvm))

			return -EINVAL;



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

		if (!kvm_vcpu_has_pmu(vcpu))

			return -ENODEV;



		if (!kvm_arm_pmu_irq_initialized(vcpu))
@@ -1040,8 +1039,7 @@ int kvm_arm_pmu_v3_has_attr(struct kvm_vcpu *vcpu, struct kvm_device_attr *attr) 
	case KVM_ARM_VCPU_PMU_V3_IRQ:

	case KVM_ARM_VCPU_PMU_V3_INIT:

	case KVM_ARM_VCPU_PMU_V3_FILTER:

		if (kvm_arm_support_pmu_v3() &&

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

		if (kvm_arm_support_pmu_v3() && kvm_vcpu_has_pmu(vcpu))

			return 0;

	}