KVM: arm64: Generalise VM features into a set of flags

[ Upstream commit 06394531b425794dc56f3d525b7994d25b8072f7 ]

We currently deal with a set of booleans for VM features,
while they could be better represented as set of flags
contained in an unsigned long, similarily to what we are
doing on the CPU side.

Signed-off-by: Marc Zyngier <maz@kernel.org>
[Oliver: Flag-ify the 'ran_once' boolean]
Signed-off-by: Oliver Upton <oupton@google.com>
Signed-off-by: Marc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/20220311174001.605719-2-oupton@google.com
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/arch/arm64/include/asm/kvm_host.h b/arch/arm64/include/asm/kvm_host.h
index 8234626a945a7eb1d8c06fb9b3e46daaacb1f0b1..2619fda42ca2d635260df89a82096445d491f070 100644 (file)
--- a/arch/arm64/include/asm/kvm_host.h
+++ b/arch/arm64/include/asm/kvm_host.h
@@ -122,7 +122,12 @@ struct kvm_arch {
         * should) opt in to this feature if KVM_CAP_ARM_NISV_TO_USER is
         * supported.
         */
-       bool return_nisv_io_abort_to_user;
+#define KVM_ARCH_FLAG_RETURN_NISV_IO_ABORT_TO_USER     0
+       /* Memory Tagging Extension enabled for the guest */
+#define KVM_ARCH_FLAG_MTE_ENABLED                      1
+       /* At least one vCPU has ran in the VM */
+#define KVM_ARCH_FLAG_HAS_RAN_ONCE                     2
+       unsigned long flags;
 
        /*
         * VM-wide PMU filter, implemented as a bitmap and big enough for
@@ -133,10 +138,6 @@ struct kvm_arch {
 
        u8 pfr0_csv2;
        u8 pfr0_csv3;
-
-       /* Memory Tagging Extension enabled for the guest */
-       bool mte_enabled;
-       bool ran_once;
 };
 
 struct kvm_vcpu_fault_info {
@@ -792,7 +793,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_has_mte(kvm) (system_supports_mte() && (kvm)->arch.mte_enabled)
+#define kvm_has_mte(kvm)                                       \
+       (system_supports_mte() &&                               \
+        test_bit(KVM_ARCH_FLAG_MTE_ENABLED, &(kvm)->arch.flags))
 #define kvm_vcpu_has_pmu(vcpu)                                 \
        (test_bit(KVM_ARM_VCPU_PMU_V3, (vcpu)->arch.features))
 

diff --git a/arch/arm64/kvm/arm.c b/arch/arm64/kvm/arm.c
index 85a2a75f44982a1d1d60f75119f2150621dabdd7..25d8aff273a104ef4624d9b7a2370dc33d945570 100644 (file)
--- a/arch/arm64/kvm/arm.c
+++ b/arch/arm64/kvm/arm.c
@@ -89,7 +89,8 @@ int kvm_vm_ioctl_enable_cap(struct kvm *kvm,
        switch (cap->cap) {
        case KVM_CAP_ARM_NISV_TO_USER:
                r = 0;
-               kvm->arch.return_nisv_io_abort_to_user = true;
+               set_bit(KVM_ARCH_FLAG_RETURN_NISV_IO_ABORT_TO_USER,
+                       &kvm->arch.flags);
                break;
        case KVM_CAP_ARM_MTE:
                mutex_lock(&kvm->lock);
@@ -97,7 +98,7 @@ int kvm_vm_ioctl_enable_cap(struct kvm *kvm,
                        r = -EINVAL;
                } else {
                        r = 0;
-                       kvm->arch.mte_enabled = true;
+                       set_bit(KVM_ARCH_FLAG_MTE_ENABLED, &kvm->arch.flags);
                }
                mutex_unlock(&kvm->lock);
                break;
@@ -635,7 +636,7 @@ int kvm_arch_vcpu_run_pid_change(struct kvm_vcpu *vcpu)
                kvm_call_hyp_nvhe(__pkvm_vcpu_init_traps, vcpu);
 
        mutex_lock(&kvm->lock);
-       kvm->arch.ran_once = true;
+       set_bit(KVM_ARCH_FLAG_HAS_RAN_ONCE, &kvm->arch.flags);
        mutex_unlock(&kvm->lock);
 
        return ret;

diff --git a/arch/arm64/kvm/mmio.c b/arch/arm64/kvm/mmio.c
index 3e2d8ba11a02780a3a1bf8da495d659cc913aae8..3dd38a151d2a683c6f5e15c2b918ec663cf0f5cc 100644 (file)
--- a/arch/arm64/kvm/mmio.c
+++ b/arch/arm64/kvm/mmio.c
@@ -135,7 +135,8 @@ int io_mem_abort(struct kvm_vcpu *vcpu, phys_addr_t fault_ipa)
         * volunteered to do so, and bail out otherwise.
         */
        if (!kvm_vcpu_dabt_isvalid(vcpu)) {
-               if (vcpu->kvm->arch.return_nisv_io_abort_to_user) {
+               if (test_bit(KVM_ARCH_FLAG_RETURN_NISV_IO_ABORT_TO_USER,
+                            &vcpu->kvm->arch.flags)) {
                        run->exit_reason = KVM_EXIT_ARM_NISV;
                        run->arm_nisv.esr_iss = kvm_vcpu_dabt_iss_nisv_sanitized(vcpu);
                        run->arm_nisv.fault_ipa = fault_ipa;

diff --git a/arch/arm64/kvm/pmu-emul.c b/arch/arm64/kvm/pmu-emul.c
index bc771bc1a0413a5796f8ea9efb594398a297b1ef..fc6ee6f02fec448878eebe06692ae3e10dfbc1f5 100644 (file)
--- a/arch/arm64/kvm/pmu-emul.c
+++ b/arch/arm64/kvm/pmu-emul.c
@@ -982,7 +982,7 @@ int kvm_arm_pmu_v3_set_attr(struct kvm_vcpu *vcpu, struct kvm_device_attr *attr)
 
                mutex_lock(&kvm->lock);
 
-               if (kvm->arch.ran_once) {
+               if (test_bit(KVM_ARCH_FLAG_HAS_RAN_ONCE, &kvm->arch.flags)) {
                        mutex_unlock(&kvm->lock);
                        return -EBUSY;
                }