Commit c2a8dab5 authored by Marc Zyngier's avatar Marc Zyngier
Browse files

ARM: KVM: Move GP registers into the CPU context structure 



Continuing our rework of the CPU context, we now move the GP
registers into the CPU context structure.

Reviewed-by: default avatarChristoffer Dall <christoffer.dall@linaro.org>
Signed-off-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
parent fb32a52a

arch/arm/include/asm/kvm_emulate.h

+4 −4
Original line number Diff line number Diff line
@@ -68,12 +68,12 @@ static inline bool vcpu_mode_is_32bit(struct kvm_vcpu *vcpu) 


static inline unsigned long *vcpu_pc(struct kvm_vcpu *vcpu)

{

	return &vcpu->arch.regs.usr_regs.ARM_pc;

	return &vcpu->arch.ctxt.gp_regs.usr_regs.ARM_pc;

}



static inline unsigned long *vcpu_cpsr(struct kvm_vcpu *vcpu)

{

	return &vcpu->arch.regs.usr_regs.ARM_cpsr;

	return &vcpu->arch.ctxt.gp_regs.usr_regs.ARM_cpsr;

}



static inline void vcpu_set_thumb(struct kvm_vcpu *vcpu)
@@ -83,13 +83,13 @@ static inline void vcpu_set_thumb(struct kvm_vcpu *vcpu) 


static inline bool mode_has_spsr(struct kvm_vcpu *vcpu)

{

	unsigned long cpsr_mode = vcpu->arch.regs.usr_regs.ARM_cpsr & MODE_MASK;

	unsigned long cpsr_mode = vcpu->arch.ctxt.gp_regs.usr_regs.ARM_cpsr & MODE_MASK;

	return (cpsr_mode > USR_MODE && cpsr_mode < SYSTEM_MODE);

}



static inline bool vcpu_mode_priv(struct kvm_vcpu *vcpu)

{

	unsigned long cpsr_mode = vcpu->arch.regs.usr_regs.ARM_cpsr & MODE_MASK;

	unsigned long cpsr_mode = vcpu->arch.ctxt.gp_regs.usr_regs.ARM_cpsr & MODE_MASK;

	return cpsr_mode > USR_MODE;;

}

arch/arm/include/asm/kvm_host.h

+1 −2
Original line number Diff line number Diff line
@@ -89,6 +89,7 @@ struct kvm_vcpu_fault_info { 
};



struct kvm_cpu_context {

	struct kvm_regs	gp_regs;

	struct vfp_hard_struct vfp;

	u32 cp15[NR_CP15_REGS];

};
@@ -98,8 +99,6 @@ typedef struct kvm_cpu_context kvm_cpu_context_t; 
struct kvm_vcpu_arch {

	struct kvm_cpu_context ctxt;



	struct kvm_regs regs;



	int target; /* Processor target */

	DECLARE_BITMAP(features, KVM_VCPU_MAX_FEATURES);

arch/arm/kernel/asm-offsets.c

+9 −9
Original line number Diff line number Diff line
@@ -176,15 +176,15 @@ int main(void) 
  DEFINE(VCPU_HOST_CTXT,	offsetof(struct kvm_vcpu, arch.host_cpu_context));

  DEFINE(CPU_CTXT_VFP,		offsetof(struct kvm_cpu_context, vfp));

  DEFINE(CPU_CTXT_CP15,		offsetof(struct kvm_cpu_context, cp15));

  DEFINE(VCPU_REGS,		offsetof(struct kvm_vcpu, arch.regs));

  DEFINE(VCPU_USR_REGS,		offsetof(struct kvm_vcpu, arch.regs.usr_regs));

  DEFINE(VCPU_SVC_REGS,		offsetof(struct kvm_vcpu, arch.regs.svc_regs));

  DEFINE(VCPU_ABT_REGS,		offsetof(struct kvm_vcpu, arch.regs.abt_regs));

  DEFINE(VCPU_UND_REGS,		offsetof(struct kvm_vcpu, arch.regs.und_regs));

  DEFINE(VCPU_IRQ_REGS,		offsetof(struct kvm_vcpu, arch.regs.irq_regs));

  DEFINE(VCPU_FIQ_REGS,		offsetof(struct kvm_vcpu, arch.regs.fiq_regs));

  DEFINE(VCPU_PC,		offsetof(struct kvm_vcpu, arch.regs.usr_regs.ARM_pc));

  DEFINE(VCPU_CPSR,		offsetof(struct kvm_vcpu, arch.regs.usr_regs.ARM_cpsr));

  DEFINE(CPU_CTXT_GP_REGS,	offsetof(struct kvm_cpu_context, gp_regs));

  DEFINE(GP_REGS_USR,		offsetof(struct kvm_regs, usr_regs));

  DEFINE(GP_REGS_SVC,		offsetof(struct kvm_regs, svc_regs));

  DEFINE(GP_REGS_ABT,		offsetof(struct kvm_regs, abt_regs));

  DEFINE(GP_REGS_UND,		offsetof(struct kvm_regs, und_regs));

  DEFINE(GP_REGS_IRQ,		offsetof(struct kvm_regs, irq_regs));

  DEFINE(GP_REGS_FIQ,		offsetof(struct kvm_regs, fiq_regs));

  DEFINE(GP_REGS_PC,		offsetof(struct kvm_regs, usr_regs.ARM_pc));

  DEFINE(GP_REGS_CPSR,		offsetof(struct kvm_regs, usr_regs.ARM_cpsr));

  DEFINE(VCPU_HCR,		offsetof(struct kvm_vcpu, arch.hcr));

  DEFINE(VCPU_IRQ_LINES,	offsetof(struct kvm_vcpu, arch.irq_lines));

  DEFINE(VCPU_HSR,		offsetof(struct kvm_vcpu, arch.fault.hsr));

arch/arm/kvm/emulate.c

+6 −6
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ static const unsigned long vcpu_reg_offsets[VCPU_NR_MODES][15] = { 
 */

unsigned long *vcpu_reg(struct kvm_vcpu *vcpu, u8 reg_num)

{

	unsigned long *reg_array = (unsigned long *)&vcpu->arch.regs;

	unsigned long *reg_array = (unsigned long *)&vcpu->arch.ctxt.gp_regs;

	unsigned long mode = *vcpu_cpsr(vcpu) & MODE_MASK;



	switch (mode) {
@@ -147,15 +147,15 @@ unsigned long *vcpu_spsr(struct kvm_vcpu *vcpu) 
	unsigned long mode = *vcpu_cpsr(vcpu) & MODE_MASK;

	switch (mode) {

	case SVC_MODE:

		return &vcpu->arch.regs.KVM_ARM_SVC_spsr;

		return &vcpu->arch.ctxt.gp_regs.KVM_ARM_SVC_spsr;

	case ABT_MODE:

		return &vcpu->arch.regs.KVM_ARM_ABT_spsr;

		return &vcpu->arch.ctxt.gp_regs.KVM_ARM_ABT_spsr;

	case UND_MODE:

		return &vcpu->arch.regs.KVM_ARM_UND_spsr;

		return &vcpu->arch.ctxt.gp_regs.KVM_ARM_UND_spsr;

	case IRQ_MODE:

		return &vcpu->arch.regs.KVM_ARM_IRQ_spsr;

		return &vcpu->arch.ctxt.gp_regs.KVM_ARM_IRQ_spsr;

	case FIQ_MODE:

		return &vcpu->arch.regs.KVM_ARM_FIQ_spsr;

		return &vcpu->arch.ctxt.gp_regs.KVM_ARM_FIQ_spsr;

	default:

		BUG();

	}

arch/arm/kvm/guest.c

+2 −2
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ static u64 core_reg_offset_from_id(u64 id) 
static int get_core_reg(struct kvm_vcpu *vcpu, const struct kvm_one_reg *reg)

{

	u32 __user *uaddr = (u32 __user *)(long)reg->addr;

	struct kvm_regs *regs = &vcpu->arch.regs;

	struct kvm_regs *regs = &vcpu->arch.ctxt.gp_regs;

	u64 off;



	if (KVM_REG_SIZE(reg->id) != 4)
@@ -72,7 +72,7 @@ static int get_core_reg(struct kvm_vcpu *vcpu, const struct kvm_one_reg *reg) 
static int set_core_reg(struct kvm_vcpu *vcpu, const struct kvm_one_reg *reg)

{

	u32 __user *uaddr = (u32 __user *)(long)reg->addr;

	struct kvm_regs *regs = &vcpu->arch.regs;

	struct kvm_regs *regs = &vcpu->arch.ctxt.gp_regs;

	u64 off, val;



	if (KVM_REG_SIZE(reg->id) != 4)