KVM: arm64: Move SPSR_EL1 to the system register array

SPSR_EL1 being a VNCR-capable register with ARMv8.4-NV, move it to
the sysregs array and update the accessors.

Reviewed-by: James Morse <james.morse@arm.com>
Signed-off-by: Marc Zyngier <maz@kernel.org>

diff --git a/arch/arm64/include/asm/kvm_emulate.h b/arch/arm64/include/asm/kvm_emulate.h
index 5f959fe..57f9042 100644 (file)
--- a/arch/arm64/include/asm/kvm_emulate.h
+++ b/arch/arm64/include/asm/kvm_emulate.h
@@ -176,7 +176,7 @@ static inline unsigned long vcpu_read_spsr(const struct kvm_vcpu *vcpu)
        if (vcpu->arch.sysregs_loaded_on_cpu)
                return read_sysreg_el1(SYS_SPSR);
        else
-               return vcpu->arch.ctxt.spsr_el1;
+               return __vcpu_sys_reg(vcpu, SPSR_EL1);
 }
 
 static inline void vcpu_write_spsr(struct kvm_vcpu *vcpu, unsigned long v)
@@ -189,7 +189,7 @@ static inline void vcpu_write_spsr(struct kvm_vcpu *vcpu, unsigned long v)
        if (vcpu->arch.sysregs_loaded_on_cpu)
                write_sysreg_el1(v, SYS_SPSR);
        else
-               vcpu->arch.ctxt.spsr_el1 = v;
+               __vcpu_sys_reg(vcpu, SPSR_EL1) = v;
 }
 
 /*

diff --git a/arch/arm64/include/asm/kvm_host.h b/arch/arm64/include/asm/kvm_host.h
index dfb97ed..91b1adb 100644 (file)
--- a/arch/arm64/include/asm/kvm_host.h
+++ b/arch/arm64/include/asm/kvm_host.h
@@ -187,6 +187,7 @@ enum vcpu_sysreg {
 
        ELR_EL1,
        SP_EL1,
+       SPSR_EL1,
 
        /* 32bit specific registers. Keep them at the end of the range */
        DACR32_EL2,     /* Domain Access Control Register */
@@ -241,7 +242,6 @@ enum vcpu_sysreg {
 struct kvm_cpu_context {
        struct user_pt_regs regs;       /* sp = sp_el0 */
 
-       u64     spsr_el1;               /* aka spsr_svc */
        u64     spsr_abt;
        u64     spsr_und;
        u64     spsr_irq;

diff --git a/arch/arm64/kvm/guest.c b/arch/arm64/kvm/guest.c
index 70215f3..dfb5218 100644 (file)
--- a/arch/arm64/kvm/guest.c
+++ b/arch/arm64/kvm/guest.c
@@ -135,7 +135,7 @@ static void *core_reg_addr(struct kvm_vcpu *vcpu, const struct kvm_one_reg *reg)
                return __ctxt_sys_reg(&vcpu->arch.ctxt, ELR_EL1);
 
        case KVM_REG_ARM_CORE_REG(spsr[KVM_SPSR_EL1]):
-               return &vcpu->arch.ctxt.spsr_el1;
+               return __ctxt_sys_reg(&vcpu->arch.ctxt, SPSR_EL1);
 
        case KVM_REG_ARM_CORE_REG(spsr[KVM_SPSR_ABT]):
                return &vcpu->arch.ctxt.spsr_abt;

diff --git a/arch/arm64/kvm/hyp/include/hyp/sysreg-sr.h b/arch/arm64/kvm/hyp/include/hyp/sysreg-sr.h
index fb4bc42..7a98603 100644 (file)
--- a/arch/arm64/kvm/hyp/include/hyp/sysreg-sr.h
+++ b/arch/arm64/kvm/hyp/include/hyp/sysreg-sr.h
@@ -48,7 +48,7 @@ static inline void __sysreg_save_el1_state(struct kvm_cpu_context *ctxt)
 
        ctxt_sys_reg(ctxt, SP_EL1)      = read_sysreg(sp_el1);
        ctxt_sys_reg(ctxt, ELR_EL1)     = read_sysreg_el1(SYS_ELR);
-       ctxt->spsr_el1                  = read_sysreg_el1(SYS_SPSR);
+       ctxt_sys_reg(ctxt, SPSR_EL1)    = read_sysreg_el1(SYS_SPSR);
 }
 
 static inline void __sysreg_save_el2_return_state(struct kvm_cpu_context *ctxt)
@@ -127,7 +127,7 @@ static inline void __sysreg_restore_el1_state(struct kvm_cpu_context *ctxt)
 
        write_sysreg(ctxt_sys_reg(ctxt, SP_EL1),        sp_el1);
        write_sysreg_el1(ctxt_sys_reg(ctxt, ELR_EL1),   SYS_ELR);
-       write_sysreg_el1(ctxt->spsr_el1,                SYS_SPSR);
+       write_sysreg_el1(ctxt_sys_reg(ctxt, SPSR_EL1),  SYS_SPSR);
 }
 
 static inline void __sysreg_restore_el2_return_state(struct kvm_cpu_context *ctxt)

diff --git a/arch/arm64/kvm/regmap.c b/arch/arm64/kvm/regmap.c
index 97c1108..accc1d5 100644 (file)
--- a/arch/arm64/kvm/regmap.c
+++ b/arch/arm64/kvm/regmap.c
@@ -150,7 +150,7 @@ unsigned long vcpu_read_spsr32(const struct kvm_vcpu *vcpu)
        if (!vcpu->arch.sysregs_loaded_on_cpu) {
                switch (spsr_idx) {
                case KVM_SPSR_SVC:
-                       return vcpu->arch.ctxt.spsr_el1;
+                       return __vcpu_sys_reg(vcpu, SPSR_EL1);
                case KVM_SPSR_ABT:
                        return vcpu->arch.ctxt.spsr_abt;
                case KVM_SPSR_UND:
@@ -185,7 +185,7 @@ void vcpu_write_spsr32(struct kvm_vcpu *vcpu, unsigned long v)
        if (!vcpu->arch.sysregs_loaded_on_cpu) {
                switch (spsr_idx) {
                case KVM_SPSR_SVC:
-                       vcpu->arch.ctxt.spsr_el1 = v;
+                       __vcpu_sys_reg(vcpu, SPSR_EL1) = v;
                        break;
                case KVM_SPSR_ABT:
                        vcpu->arch.ctxt.spsr_abt = v;