Commit b86ecb37 authored by James Hogan's avatar James Hogan
Browse files

MIPS: KVM: Add vcpu_get_regs/vcpu_set_regs callback 



Add a vcpu_get_regs() and vcpu_set_regs() callbacks for loading and
restoring context which may be in hardware registers. This may include
floating point and MIPS SIMD Architecture (MSA) state which may be
accessed directly by the guest (but restored lazily by the hypervisor),
and also dedicated guest registers as provided by the VZ ASE.

Signed-off-by: default avatarJames Hogan <james.hogan@imgtec.com>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Gleb Natapov <gleb@kernel.org>
Cc: linux-mips@linux-mips.org
Cc: kvm@vger.kernel.org
parent c771607a

arch/mips/include/asm/kvm_host.h

+2 −0
Original line number Diff line number Diff line
@@ -585,6 +585,8 @@ struct kvm_mips_callbacks { 
			   const struct kvm_one_reg *reg, s64 *v);

	int (*set_one_reg)(struct kvm_vcpu *vcpu,

			   const struct kvm_one_reg *reg, s64 v);

	int (*vcpu_get_regs)(struct kvm_vcpu *vcpu);

	int (*vcpu_set_regs)(struct kvm_vcpu *vcpu);

};

extern struct kvm_mips_callbacks *kvm_mips_callbacks;

int kvm_mips_emulation_init(struct kvm_mips_callbacks **install_callbacks);

arch/mips/kvm/tlb.c

+6 −0
Original line number Diff line number Diff line
@@ -733,6 +733,9 @@ void kvm_arch_vcpu_load(struct kvm_vcpu *vcpu, int cpu) 
		}

	}



	/* restore guest state to registers */

	kvm_mips_callbacks->vcpu_set_regs(vcpu);



	local_irq_restore(flags);



}
@@ -751,6 +754,9 @@ void kvm_arch_vcpu_put(struct kvm_vcpu *vcpu) 
	vcpu->arch.preempt_entryhi = read_c0_entryhi();

	vcpu->arch.last_sched_cpu = cpu;



	/* save guest state in registers */

	kvm_mips_callbacks->vcpu_get_regs(vcpu);



	if (((cpu_context(cpu, current->mm) ^ asid_cache(cpu)) &

	     ASID_VERSION_MASK)) {

		kvm_debug("%s: Dropping MMU Context:  %#lx\n", __func__,

arch/mips/kvm/trap_emul.c

+12 −0
Original line number Diff line number Diff line
@@ -552,6 +552,16 @@ static int kvm_trap_emul_set_one_reg(struct kvm_vcpu *vcpu, 
	return ret;

}



static int kvm_trap_emul_vcpu_get_regs(struct kvm_vcpu *vcpu)

{

	return 0;

}



static int kvm_trap_emul_vcpu_set_regs(struct kvm_vcpu *vcpu)

{

	return 0;

}



static struct kvm_mips_callbacks kvm_trap_emul_callbacks = {

	/* exit handlers */

	.handle_cop_unusable = kvm_trap_emul_handle_cop_unusable,
@@ -578,6 +588,8 @@ static struct kvm_mips_callbacks kvm_trap_emul_callbacks = { 
	.irq_clear = kvm_mips_irq_clear_cb,

	.get_one_reg = kvm_trap_emul_get_one_reg,

	.set_one_reg = kvm_trap_emul_set_one_reg,

	.vcpu_get_regs = kvm_trap_emul_vcpu_get_regs,

	.vcpu_set_regs = kvm_trap_emul_vcpu_set_regs,

};



int kvm_mips_emulation_init(struct kvm_mips_callbacks **install_callbacks)

CRA Git | Maintained and supported by SUSTech CRA and CCSE