KVM: PPC: Use accessors for VCORE registers

Introduce accessor generator macros for VCORE registers. Use the accessor
functions to replace direct accesses to this registers.

This will be important later for Nested APIv2 support which requires
additional functionality for accessing and modifying VCPU state.

Signed-off-by: Jordan Niethe <jniethe5@gmail.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://msgid.link/20230914030600.16993-6-jniethe5@gmail.com

diff --git a/arch/powerpc/include/asm/kvm_book3s.h b/arch/powerpc/include/asm/kvm_book3s.h
index 1a220cd632271929cd3875eb6b2c424c8d175e8d..4c6558d5fefe3331ab332e69062262a5d32d1d87 100644 (file)
--- a/arch/powerpc/include/asm/kvm_book3s.h
+++ b/arch/powerpc/include/asm/kvm_book3s.h
@@ -483,6 +483,29 @@ KVMPPC_BOOK3S_VCPU_ACCESSOR(bescr, 64)
 KVMPPC_BOOK3S_VCPU_ACCESSOR(ic, 64)
 KVMPPC_BOOK3S_VCPU_ACCESSOR(vrsave, 64)
 
+
+#define KVMPPC_BOOK3S_VCORE_ACCESSOR_SET(reg, size)                    \
+static inline void kvmppc_set_##reg(struct kvm_vcpu *vcpu, u##size val)        \
+{                                                                      \
+       vcpu->arch.vcore->reg = val;                                    \
+}
+
+#define KVMPPC_BOOK3S_VCORE_ACCESSOR_GET(reg, size)                    \
+static inline u##size kvmppc_get_##reg(struct kvm_vcpu *vcpu)          \
+{                                                                      \
+       return vcpu->arch.vcore->reg;                                   \
+}
+
+#define KVMPPC_BOOK3S_VCORE_ACCESSOR(reg, size)                                \
+       KVMPPC_BOOK3S_VCORE_ACCESSOR_SET(reg, size)                     \
+       KVMPPC_BOOK3S_VCORE_ACCESSOR_GET(reg, size)                     \
+
+
+KVMPPC_BOOK3S_VCORE_ACCESSOR(vtb, 64)
+KVMPPC_BOOK3S_VCORE_ACCESSOR(tb_offset, 64)
+KVMPPC_BOOK3S_VCORE_ACCESSOR_GET(arch_compat, 32)
+KVMPPC_BOOK3S_VCORE_ACCESSOR_GET(lpcr, 64)
+
 static inline u64 kvmppc_get_dec_expires(struct kvm_vcpu *vcpu)
 {
        return vcpu->arch.dec_expires;
@@ -496,7 +519,7 @@ static inline void kvmppc_set_dec_expires(struct kvm_vcpu *vcpu, u64 val)
 /* Expiry time of vcpu DEC relative to host TB */
 static inline u64 kvmppc_dec_expires_host_tb(struct kvm_vcpu *vcpu)
 {
-       return kvmppc_get_dec_expires(vcpu) - vcpu->arch.vcore->tb_offset;
+       return kvmppc_get_dec_expires(vcpu) - kvmppc_get_tb_offset(vcpu);
 }
 
 static inline bool is_kvmppc_resume_guest(int r)

diff --git a/arch/powerpc/kvm/book3s_hv.c b/arch/powerpc/kvm/book3s_hv.c
index 27faecad1e3b5043923b3fb2266c1b377088d7e1..73d9a9eb376fb126b0c66940752c7da7afb35f7e 100644 (file)
--- a/arch/powerpc/kvm/book3s_hv.c
+++ b/arch/powerpc/kvm/book3s_hv.c
@@ -794,7 +794,7 @@ static void kvmppc_update_vpa_dispatch(struct kvm_vcpu *vcpu,
 
        vpa->enqueue_dispatch_tb = cpu_to_be64(be64_to_cpu(vpa->enqueue_dispatch_tb) + stolen);
 
-       __kvmppc_create_dtl_entry(vcpu, vpa, vc->pcpu, now + vc->tb_offset, stolen);
+       __kvmppc_create_dtl_entry(vcpu, vpa, vc->pcpu, now + kvmppc_get_tb_offset(vcpu), stolen);
 
        vcpu->arch.vpa.dirty = true;
 }
@@ -845,9 +845,9 @@ static bool kvmppc_doorbell_pending(struct kvm_vcpu *vcpu)
 
 static bool kvmppc_power8_compatible(struct kvm_vcpu *vcpu)
 {
-       if (vcpu->arch.vcore->arch_compat >= PVR_ARCH_207)
+       if (kvmppc_get_arch_compat(vcpu) >= PVR_ARCH_207)
                return true;
-       if ((!vcpu->arch.vcore->arch_compat) &&
+       if ((!kvmppc_get_arch_compat(vcpu)) &&
            cpu_has_feature(CPU_FTR_ARCH_207S))
                return true;
        return false;
@@ -2283,7 +2283,7 @@ static int kvmppc_get_one_reg_hv(struct kvm_vcpu *vcpu, u64 id,
                        *val = get_reg_val(id, vcpu->arch.vcore->dpdes);
                break;
        case KVM_REG_PPC_VTB:
-               *val = get_reg_val(id, vcpu->arch.vcore->vtb);
+               *val = get_reg_val(id, kvmppc_get_vtb(vcpu));
                break;
        case KVM_REG_PPC_DAWR:
                *val = get_reg_val(id, vcpu->arch.dawr0);
@@ -2342,11 +2342,11 @@ static int kvmppc_get_one_reg_hv(struct kvm_vcpu *vcpu, u64 id,
                spin_unlock(&vcpu->arch.vpa_update_lock);
                break;
        case KVM_REG_PPC_TB_OFFSET:
-               *val = get_reg_val(id, vcpu->arch.vcore->tb_offset);
+               *val = get_reg_val(id, kvmppc_get_tb_offset(vcpu));
                break;
        case KVM_REG_PPC_LPCR:
        case KVM_REG_PPC_LPCR_64:
-               *val = get_reg_val(id, vcpu->arch.vcore->lpcr);
+               *val = get_reg_val(id, kvmppc_get_lpcr(vcpu));
                break;
        case KVM_REG_PPC_PPR:
                *val = get_reg_val(id, vcpu->arch.ppr);
@@ -2418,7 +2418,7 @@ static int kvmppc_get_one_reg_hv(struct kvm_vcpu *vcpu, u64 id,
                break;
 #endif
        case KVM_REG_PPC_ARCH_COMPAT:
-               *val = get_reg_val(id, vcpu->arch.vcore->arch_compat);
+               *val = get_reg_val(id, kvmppc_get_arch_compat(vcpu));
                break;
        case KVM_REG_PPC_DEC_EXPIRY:
                *val = get_reg_val(id, kvmppc_get_dec_expires(vcpu));
@@ -2523,7 +2523,7 @@ static int kvmppc_set_one_reg_hv(struct kvm_vcpu *vcpu, u64 id,
                        vcpu->arch.vcore->dpdes = set_reg_val(id, *val);
                break;
        case KVM_REG_PPC_VTB:
-               vcpu->arch.vcore->vtb = set_reg_val(id, *val);
+               kvmppc_set_vtb(vcpu, set_reg_val(id, *val));
                break;
        case KVM_REG_PPC_DAWR:
                vcpu->arch.dawr0 = set_reg_val(id, *val);
@@ -2606,10 +2606,11 @@ static int kvmppc_set_one_reg_hv(struct kvm_vcpu *vcpu, u64 id,
                 * decrementer, which is better than a large one that
                 * causes a hang.
                 */
+               kvmppc_set_tb_offset(vcpu, tb_offset);
                if (!kvmppc_get_dec_expires(vcpu) && tb_offset)
                        kvmppc_set_dec_expires(vcpu, get_tb() + tb_offset);
 
-               vcpu->arch.vcore->tb_offset = tb_offset;
+               kvmppc_set_tb_offset(vcpu, tb_offset);
                break;
        }
        case KVM_REG_PPC_LPCR:
@@ -4042,7 +4043,6 @@ static void vcpu_vpa_increment_dispatch(struct kvm_vcpu *vcpu)
 /* call our hypervisor to load up HV regs and go */
 static int kvmhv_vcpu_entry_p9_nested(struct kvm_vcpu *vcpu, u64 time_limit, unsigned long lpcr, u64 *tb)
 {
-       struct kvmppc_vcore *vc = vcpu->arch.vcore;
        unsigned long host_psscr;
        unsigned long msr;
        struct hv_guest_state hvregs;
@@ -4122,7 +4122,7 @@ static int kvmhv_vcpu_entry_p9_nested(struct kvm_vcpu *vcpu, u64 time_limit, uns
        if (!(lpcr & LPCR_LD)) /* Sign extend if not using large decrementer */
                dec = (s32) dec;
        *tb = mftb();
-       vcpu->arch.dec_expires = dec + (*tb + vc->tb_offset);
+       vcpu->arch.dec_expires = dec + (*tb + kvmppc_get_tb_offset(vcpu));
 
        timer_rearm_host_dec(*tb);
 
@@ -4681,7 +4681,7 @@ int kvmhv_run_single_vcpu(struct kvm_vcpu *vcpu, u64 time_limit,
 
        tb = mftb();
 
-       kvmppc_update_vpa_dispatch_p9(vcpu, vc, tb + vc->tb_offset);
+       kvmppc_update_vpa_dispatch_p9(vcpu, vc, tb + kvmppc_get_tb_offset(vcpu));
 
        trace_kvm_guest_enter(vcpu);
 

diff --git a/arch/powerpc/kvm/book3s_hv_ras.c b/arch/powerpc/kvm/book3s_hv_ras.c
index 82be6d87514b7aacf2858b8b380674abfb8c8b42..9012acadbca8e50d61c70498d6c0084a6fd20184 100644 (file)
--- a/arch/powerpc/kvm/book3s_hv_ras.c
+++ b/arch/powerpc/kvm/book3s_hv_ras.c
@@ -174,14 +174,14 @@ long kvmppc_p9_realmode_hmi_handler(struct kvm_vcpu *vcpu)
                ppc_md.hmi_exception_early(NULL);
 
 out:
-       if (vc->tb_offset) {
+       if (kvmppc_get_tb_offset(vcpu)) {
                u64 new_tb = mftb() + vc->tb_offset;
                mtspr(SPRN_TBU40, new_tb);
                if ((mftb() & 0xffffff) < (new_tb & 0xffffff)) {
                        new_tb += 0x1000000;
                        mtspr(SPRN_TBU40, new_tb);
                }
-               vc->tb_offset_applied = vc->tb_offset;
+               vc->tb_offset_applied = kvmppc_get_tb_offset(vcpu);
        }
 
        return ret;

diff --git a/arch/powerpc/kvm/book3s_xive.c b/arch/powerpc/kvm/book3s_xive.c
index 48d11baf1f16aa457a9b3b518021516b4d205bb0..24d8378824a2b3b581f8ff2b549226f57b314026 100644 (file)
--- a/arch/powerpc/kvm/book3s_xive.c
+++ b/arch/powerpc/kvm/book3s_xive.c
@@ -2779,8 +2779,6 @@ static int kvmppc_xive_create(struct kvm_device *dev, u32 type)
 
 int kvmppc_xive_xics_hcall(struct kvm_vcpu *vcpu, u32 req)
 {
-       struct kvmppc_vcore *vc = vcpu->arch.vcore;
-
        /* The VM should have configured XICS mode before doing XICS hcalls. */
        if (!kvmppc_xics_enabled(vcpu))
                return H_TOO_HARD;
@@ -2799,7 +2797,7 @@ int kvmppc_xive_xics_hcall(struct kvm_vcpu *vcpu, u32 req)
                return xive_vm_h_ipoll(vcpu, kvmppc_get_gpr(vcpu, 4));
        case H_XIRR_X:
                xive_vm_h_xirr(vcpu);
-               kvmppc_set_gpr(vcpu, 5, get_tb() + vc->tb_offset);
+               kvmppc_set_gpr(vcpu, 5, get_tb() + kvmppc_get_tb_offset(vcpu));
                return H_SUCCESS;
        }