Commit fecd903c authored by Bibo Mao's avatar Bibo Mao Committed by Huacai Chen
Browse files

LoongArch: KVM: Add ecode parameter for exception handlers 



For some KVM exception types, they share the same exception handler. To
show the difference, ecode (exception code) is added as a new parameter
in exception handlers.

Signed-off-by: default avatarBibo Mao <maobibo@loongson.cn>
Signed-off-by: default avatarHuacai Chen <chenhuacai@loongson.cn>
parent a5806cd5

arch/loongarch/include/asm/kvm_vcpu.h

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ 
#define KVM_LOONGSON_IRQ_NUM_MASK	0xffff



typedef union loongarch_instruction  larch_inst;

typedef int (*exit_handle_fn)(struct kvm_vcpu *);

typedef int (*exit_handle_fn)(struct kvm_vcpu *, int);



int  kvm_emu_mmio_read(struct kvm_vcpu *vcpu, larch_inst inst);

int  kvm_emu_mmio_write(struct kvm_vcpu *vcpu, larch_inst inst);

arch/loongarch/kvm/exit.c

+15 −14
Original line number Diff line number Diff line
@@ -341,7 +341,7 @@ static int kvm_trap_handle_gspr(struct kvm_vcpu *vcpu) 
 * 2) Execute CACOP/IDLE instructions;

 * 3) Access to unimplemented CSRs/IOCSRs.

 */

static int kvm_handle_gspr(struct kvm_vcpu *vcpu)

static int kvm_handle_gspr(struct kvm_vcpu *vcpu, int ecode)

{

	int ret = RESUME_GUEST;

	enum emulation_result er = EMULATE_DONE;
@@ -705,12 +705,12 @@ static int kvm_handle_rdwr_fault(struct kvm_vcpu *vcpu, bool write) 
	return ret;

}



static int kvm_handle_read_fault(struct kvm_vcpu *vcpu)

static int kvm_handle_read_fault(struct kvm_vcpu *vcpu, int ecode)

{

	return kvm_handle_rdwr_fault(vcpu, false);

}



static int kvm_handle_write_fault(struct kvm_vcpu *vcpu)

static int kvm_handle_write_fault(struct kvm_vcpu *vcpu, int ecode)

{

	return kvm_handle_rdwr_fault(vcpu, true);

}
@@ -726,11 +726,12 @@ int kvm_complete_user_service(struct kvm_vcpu *vcpu, struct kvm_run *run) 
/**

 * kvm_handle_fpu_disabled() - Guest used fpu however it is disabled at host

 * @vcpu:	Virtual CPU context.

 * @ecode:	Exception code.

 *

 * Handle when the guest attempts to use fpu which hasn't been allowed

 * by the root context.

 */

static int kvm_handle_fpu_disabled(struct kvm_vcpu *vcpu)

static int kvm_handle_fpu_disabled(struct kvm_vcpu *vcpu, int ecode)

{

	struct kvm_run *run = vcpu->run;
@@ -783,11 +784,12 @@ static long kvm_save_notify(struct kvm_vcpu *vcpu) 
/*

 * kvm_handle_lsx_disabled() - Guest used LSX while disabled in root.

 * @vcpu:      Virtual CPU context.

 * @ecode:	Exception code.

 *

 * Handle when the guest attempts to use LSX when it is disabled in the root

 * context.

 */

static int kvm_handle_lsx_disabled(struct kvm_vcpu *vcpu)

static int kvm_handle_lsx_disabled(struct kvm_vcpu *vcpu, int ecode)

{

	if (kvm_own_lsx(vcpu))

		kvm_queue_exception(vcpu, EXCCODE_INE, 0);
@@ -798,11 +800,12 @@ static int kvm_handle_lsx_disabled(struct kvm_vcpu *vcpu) 
/*

 * kvm_handle_lasx_disabled() - Guest used LASX while disabled in root.

 * @vcpu:	Virtual CPU context.

 * @ecode:	Exception code.

 *

 * Handle when the guest attempts to use LASX when it is disabled in the root

 * context.

 */

static int kvm_handle_lasx_disabled(struct kvm_vcpu *vcpu)

static int kvm_handle_lasx_disabled(struct kvm_vcpu *vcpu, int ecode)

{

	if (kvm_own_lasx(vcpu))

		kvm_queue_exception(vcpu, EXCCODE_INE, 0);
@@ -810,7 +813,7 @@ static int kvm_handle_lasx_disabled(struct kvm_vcpu *vcpu) 
	return RESUME_GUEST;

}



static int kvm_handle_lbt_disabled(struct kvm_vcpu *vcpu)

static int kvm_handle_lbt_disabled(struct kvm_vcpu *vcpu, int ecode)

{

	if (kvm_own_lbt(vcpu))

		kvm_queue_exception(vcpu, EXCCODE_INE, 0);
@@ -872,7 +875,7 @@ static void kvm_handle_service(struct kvm_vcpu *vcpu) 
	kvm_write_reg(vcpu, LOONGARCH_GPR_A0, ret);

}



static int kvm_handle_hypercall(struct kvm_vcpu *vcpu)

static int kvm_handle_hypercall(struct kvm_vcpu *vcpu, int ecode)

{

	int ret;

	larch_inst inst;
@@ -932,16 +935,14 @@ static int kvm_handle_hypercall(struct kvm_vcpu *vcpu) 
/*

 * LoongArch KVM callback handling for unimplemented guest exiting

 */

static int kvm_fault_ni(struct kvm_vcpu *vcpu)

static int kvm_fault_ni(struct kvm_vcpu *vcpu, int ecode)

{

	unsigned int ecode, inst;

	unsigned long estat, badv;

	unsigned int inst;

	unsigned long badv;



	/* Fetch the instruction */

	inst = vcpu->arch.badi;

	badv = vcpu->arch.badv;

	estat = vcpu->arch.host_estat;

	ecode = (estat & CSR_ESTAT_EXC) >> CSR_ESTAT_EXC_SHIFT;

	kvm_err("ECode: %d PC=%#lx Inst=0x%08x BadVaddr=%#lx ESTAT=%#lx\n",

			ecode, vcpu->arch.pc, inst, badv, read_gcsr_estat());

	kvm_arch_vcpu_dump_regs(vcpu);
@@ -966,5 +967,5 @@ static exit_handle_fn kvm_fault_tables[EXCCODE_INT_START] = { 


int kvm_handle_fault(struct kvm_vcpu *vcpu, int fault)

{

	return kvm_fault_tables[fault](vcpu);

	return kvm_fault_tables[fault](vcpu, fault);

}