Commit 1bded23e authored Jun 28, 2019 by Marc Zyngier

KVM: arm64: Move SP_EL1 to the system register array



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

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

parent 98909e6d

arch/arm64/include/asm/kvm_host.h

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -186,6 +186,7 @@ enum vcpu_sysreg {
	APGAKEYHI_EL1,		APGAKEYHI_EL1,

	ELR_EL1,		ELR_EL1,
			SP_EL1,

	/* 32bit specific registers. Keep them at the end of the range */		/* 32bit specific registers. Keep them at the end of the range */
	DACR32_EL2, /* Domain Access Control Register */		DACR32_EL2, /* Domain Access Control Register */
	@@ -240,8 +241,6 @@ enum vcpu_sysreg {
	struct kvm_cpu_context {		struct kvm_cpu_context {
	struct user_pt_regs regs; /* sp = sp_el0 */		struct user_pt_regs regs; /* sp = sp_el0 */

	u64 sp_el1;

	u64 spsr[KVM_NR_SPSR];		u64 spsr[KVM_NR_SPSR];

	struct user_fpsimd_state fp_regs;		struct user_fpsimd_state fp_regs;

arch/arm64/kvm/guest.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -129,7 +129,7 @@ static void core_reg_addr(struct kvm_vcpu vcpu, const struct kvm_one_reg *reg)
	return &vcpu->arch.ctxt.regs.pstate;		return &vcpu->arch.ctxt.regs.pstate;

	case KVM_REG_ARM_CORE_REG(sp_el1):		case KVM_REG_ARM_CORE_REG(sp_el1):
	return &vcpu->arch.ctxt.sp_el1;		return __ctxt_sys_reg(&vcpu->arch.ctxt, SP_EL1);

	case KVM_REG_ARM_CORE_REG(elr_el1):		case KVM_REG_ARM_CORE_REG(elr_el1):
	return __ctxt_sys_reg(&vcpu->arch.ctxt, ELR_EL1);		return __ctxt_sys_reg(&vcpu->arch.ctxt, ELR_EL1);

arch/arm64/kvm/hyp/include/hyp/sysreg-sr.h

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -46,7 +46,7 @@ static inline void __sysreg_save_el1_state(struct kvm_cpu_context *ctxt)
	ctxt_sys_reg(ctxt, PAR_EL1) = read_sysreg(par_el1);		ctxt_sys_reg(ctxt, PAR_EL1) = read_sysreg(par_el1);
	ctxt_sys_reg(ctxt, TPIDR_EL1) = read_sysreg(tpidr_el1);		ctxt_sys_reg(ctxt, TPIDR_EL1) = read_sysreg(tpidr_el1);

	ctxt->sp_el1 = read_sysreg(sp_el1);		ctxt_sys_reg(ctxt, SP_EL1) = read_sysreg(sp_el1);
	ctxt_sys_reg(ctxt, ELR_EL1) = read_sysreg_el1(SYS_ELR);		ctxt_sys_reg(ctxt, ELR_EL1) = read_sysreg_el1(SYS_ELR);
	ctxt->spsr[KVM_SPSR_EL1] = read_sysreg_el1(SYS_SPSR);		ctxt->spsr[KVM_SPSR_EL1] = read_sysreg_el1(SYS_SPSR);
	}		}
	@@ -125,7 +125,7 @@ static inline void __sysreg_restore_el1_state(struct kvm_cpu_context *ctxt)
	write_sysreg_el1(ctxt_sys_reg(ctxt, TCR_EL1), SYS_TCR);		write_sysreg_el1(ctxt_sys_reg(ctxt, TCR_EL1), SYS_TCR);
	}		}

	write_sysreg(ctxt->sp_el1, sp_el1);		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_sys_reg(ctxt, ELR_EL1), SYS_ELR);
	write_sysreg_el1(ctxt->spsr[KVM_SPSR_EL1], SYS_SPSR);		write_sysreg_el1(ctxt->spsr[KVM_SPSR_EL1], SYS_SPSR);
	}		}