Commit de40bb8a authored by Oliver Upton's avatar Oliver Upton Committed by Marc Zyngier
Browse files

KVM: arm64: Add a helper to check if a VM has ran once 



The test_bit(...) pattern is quite a lot of keystrokes. Replace
existing callsites with a helper.

No functional change intended.

Signed-off-by: default avatarOliver Upton <oliver.upton@linux.dev>
Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/20230404154050.2270077-3-oliver.upton@linux.dev
parent e65733b5

arch/arm64/include/asm/kvm_host.h

+3 −0
Original line number Diff line number Diff line
@@ -1061,6 +1061,9 @@ bool kvm_arm_vcpu_is_finalized(struct kvm_vcpu *vcpu); 
	(system_supports_32bit_el0() &&				\

	 !static_branch_unlikely(&arm64_mismatched_32bit_el0))



#define kvm_vm_has_ran_once(kvm)					\

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



int kvm_trng_call(struct kvm_vcpu *vcpu);

#ifdef CONFIG_KVM

extern phys_addr_t hyp_mem_base;

arch/arm64/kvm/hypercalls.c

+1 −2
Original line number Diff line number Diff line
@@ -379,8 +379,7 @@ static int kvm_arm_set_fw_reg_bmap(struct kvm_vcpu *vcpu, u64 reg_id, u64 val) 


	mutex_lock(&kvm->lock);



	if (test_bit(KVM_ARCH_FLAG_HAS_RAN_ONCE, &kvm->arch.flags) &&

	    val != *fw_reg_bmap) {

	if (kvm_vm_has_ran_once(kvm) && val != *fw_reg_bmap) {

		ret = -EBUSY;

		goto out;

	}

arch/arm64/kvm/pmu-emul.c

+2 −2
Original line number Diff line number Diff line
@@ -880,7 +880,7 @@ static int kvm_arm_pmu_v3_set_pmu(struct kvm_vcpu *vcpu, int pmu_id) 
	list_for_each_entry(entry, &arm_pmus, entry) {

		arm_pmu = entry->arm_pmu;

		if (arm_pmu->pmu.type == pmu_id) {

			if (test_bit(KVM_ARCH_FLAG_HAS_RAN_ONCE, &kvm->arch.flags) ||

			if (kvm_vm_has_ran_once(kvm) ||

			    (kvm->arch.pmu_filter && kvm->arch.arm_pmu != arm_pmu)) {

				ret = -EBUSY;

				break;
@@ -963,7 +963,7 @@ int kvm_arm_pmu_v3_set_attr(struct kvm_vcpu *vcpu, struct kvm_device_attr *attr) 


		mutex_lock(&kvm->lock);



		if (test_bit(KVM_ARCH_FLAG_HAS_RAN_ONCE, &kvm->arch.flags)) {

		if (kvm_vm_has_ran_once(kvm)) {

			mutex_unlock(&kvm->lock);

			return -EBUSY;

		}