Skip to content

L
linux
Commit 16d100db authored by James Hogan's avatar James Hogan Committed by Ralf Baechle
Browse files
Options

MIPS: Move Cause.ExcCode trap codes to mipsregs.h 

Move the Cause.ExcCode trap code definitions from kvm_host.h to
mipsregs.h, since they describe architectural bits rather than KVM
specific constants, and change the prefix from T_ to EXCCODE_.
Signed-off-by: default avatarJames Hogan <james.hogan@imgtec.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Gleb Natapov <gleb@kernel.org>
Cc: linux-mips@linux-mips.org
Cc: kvm@vger.kernel.org
Patchwork: https://patchwork.linux-mips.org/patch/11891/Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 2db9d233
Show whitespace changes
Inline Side-by-side
Showing with 80 additions and 83 deletions
arch/mips/include/asm/kvm_host.h
View file @ 16d100db
...@@ -281,34 +281,6 @@ enum mips_mmu_types { ...@@ -281,34 +281,6 @@ enum mips_mmu_types {
MMU_TYPE_R8000 MMU_TYPE_R8000
}; };
/*
* Trap codes
*/
#define T_INT 0 /* Interrupt pending */
#define T_TLB_MOD 1 /* TLB modified fault */
#define T_TLB_LD_MISS 2 /* TLB miss on load or ifetch */
#define T_TLB_ST_MISS 3 /* TLB miss on a store */
#define T_ADDR_ERR_LD 4 /* Address error on a load or ifetch */
#define T_ADDR_ERR_ST 5 /* Address error on a store */
#define T_BUS_ERR_IFETCH 6 /* Bus error on an ifetch */
#define T_BUS_ERR_LD_ST 7 /* Bus error on a load or store */
#define T_SYSCALL 8 /* System call */
#define T_BREAK 9 /* Breakpoint */
#define T_RES_INST 10 /* Reserved instruction exception */
#define T_COP_UNUSABLE 11 /* Coprocessor unusable */
#define T_OVFLOW 12 /* Arithmetic overflow */
/*
* Trap definitions added for r4000 port.
*/
#define T_TRAP 13 /* Trap instruction */
#define T_VCEI 14 /* Virtual coherency exception */
#define T_MSAFPE 14 /* MSA floating point exception */
#define T_FPE 15 /* Floating point exception */
#define T_MSADIS 21 /* MSA disabled exception */
#define T_WATCH 23 /* Watch address reference */
#define T_VCED 31 /* Virtual coherency data */
/* Resume Flags */ /* Resume Flags */
#define RESUME_FLAG_DR (1<<0) /* Reload guest nonvolatile state? */ #define RESUME_FLAG_DR (1<<0) /* Reload guest nonvolatile state? */
#define RESUME_FLAG_HOST (1<<1) /* Resume host? */ #define RESUME_FLAG_HOST (1<<1) /* Resume host? */
......
arch/mips/include/asm/mipsregs.h
View file @ 16d100db
...@@ -403,6 +403,30 @@ ...@@ -403,6 +403,30 @@
#define CAUSEB_BD 31 #define CAUSEB_BD 31
#define CAUSEF_BD (_ULCAST_(1) << 31) #define CAUSEF_BD (_ULCAST_(1) << 31)
/*
* Cause.ExcCode trap codes.
*/
#define EXCCODE_INT 0 /* Interrupt pending */
#define EXCCODE_MOD 1 /* TLB modified fault */
#define EXCCODE_TLBL 2 /* TLB miss on load or ifetch */
#define EXCCODE_TLBS 3 /* TLB miss on a store */
#define EXCCODE_ADEL 4 /* Address error on a load or ifetch */
#define EXCCODE_ADES 5 /* Address error on a store */
#define EXCCODE_IBE 6 /* Bus error on an ifetch */
#define EXCCODE_DBE 7 /* Bus error on a load or store */
#define EXCCODE_SYS 8 /* System call */
#define EXCCODE_BP 9 /* Breakpoint */
#define EXCCODE_RI 10 /* Reserved instruction exception */
#define EXCCODE_CPU 11 /* Coprocessor unusable */
#define EXCCODE_OV 12 /* Arithmetic overflow */
#define EXCCODE_TR 13 /* Trap instruction */
#define EXCCODE_VCEI 14 /* Virtual coherency exception */
#define EXCCODE_MSAFPE 14 /* MSA floating point exception */
#define EXCCODE_FPE 15 /* Floating point exception */
#define EXCCODE_MSADIS 21 /* MSA disabled exception */
#define EXCCODE_WATCH 23 /* Watch address reference */
#define EXCCODE_VCED 31 /* Virtual coherency data */
/* /*
* Bits in the coprocessor 0 config register. * Bits in the coprocessor 0 config register.
*/ */
......
arch/mips/kvm/emulate.c
View file @ 16d100db
...@@ -1780,7 +1780,7 @@ enum emulation_result kvm_mips_emulate_syscall(unsigned long cause, ...@@ -1780,7 +1780,7 @@ enum emulation_result kvm_mips_emulate_syscall(unsigned long cause,
kvm_debug("Delivering SYSCALL @ pc %#lx\n", arch->pc); kvm_debug("Delivering SYSCALL @ pc %#lx\n", arch->pc);
kvm_change_c0_guest_cause(cop0, (0xff), kvm_change_c0_guest_cause(cop0, (0xff),
(T_SYSCALL << CAUSEB_EXCCODE)); (EXCCODE_SYS << CAUSEB_EXCCODE));
/* Set PC to the exception entry point */ /* Set PC to the exception entry point */
arch->pc = KVM_GUEST_KSEG0 + 0x180; arch->pc = KVM_GUEST_KSEG0 + 0x180;
...@@ -1827,7 +1827,7 @@ enum emulation_result kvm_mips_emulate_tlbmiss_ld(unsigned long cause, ...@@ -1827,7 +1827,7 @@ enum emulation_result kvm_mips_emulate_tlbmiss_ld(unsigned long cause,
} }
kvm_change_c0_guest_cause(cop0, (0xff), kvm_change_c0_guest_cause(cop0, (0xff),
(T_TLB_LD_MISS << CAUSEB_EXCCODE)); (EXCCODE_TLBL << CAUSEB_EXCCODE));
/* setup badvaddr, context and entryhi registers for the guest */ /* setup badvaddr, context and entryhi registers for the guest */
kvm_write_c0_guest_badvaddr(cop0, vcpu->arch.host_cp0_badvaddr); kvm_write_c0_guest_badvaddr(cop0, vcpu->arch.host_cp0_badvaddr);
...@@ -1873,7 +1873,7 @@ enum emulation_result kvm_mips_emulate_tlbinv_ld(unsigned long cause, ...@@ -1873,7 +1873,7 @@ enum emulation_result kvm_mips_emulate_tlbinv_ld(unsigned long cause,
} }
kvm_change_c0_guest_cause(cop0, (0xff), kvm_change_c0_guest_cause(cop0, (0xff),
(T_TLB_LD_MISS << CAUSEB_EXCCODE)); (EXCCODE_TLBL << CAUSEB_EXCCODE));
/* setup badvaddr, context and entryhi registers for the guest */ /* setup badvaddr, context and entryhi registers for the guest */
kvm_write_c0_guest_badvaddr(cop0, vcpu->arch.host_cp0_badvaddr); kvm_write_c0_guest_badvaddr(cop0, vcpu->arch.host_cp0_badvaddr);
...@@ -1917,7 +1917,7 @@ enum emulation_result kvm_mips_emulate_tlbmiss_st(unsigned long cause, ...@@ -1917,7 +1917,7 @@ enum emulation_result kvm_mips_emulate_tlbmiss_st(unsigned long cause,
} }
kvm_change_c0_guest_cause(cop0, (0xff), kvm_change_c0_guest_cause(cop0, (0xff),
(T_TLB_ST_MISS << CAUSEB_EXCCODE)); (EXCCODE_TLBS << CAUSEB_EXCCODE));
/* setup badvaddr, context and entryhi registers for the guest */ /* setup badvaddr, context and entryhi registers for the guest */
kvm_write_c0_guest_badvaddr(cop0, vcpu->arch.host_cp0_badvaddr); kvm_write_c0_guest_badvaddr(cop0, vcpu->arch.host_cp0_badvaddr);
...@@ -1961,7 +1961,7 @@ enum emulation_result kvm_mips_emulate_tlbinv_st(unsigned long cause, ...@@ -1961,7 +1961,7 @@ enum emulation_result kvm_mips_emulate_tlbinv_st(unsigned long cause,
} }
kvm_change_c0_guest_cause(cop0, (0xff), kvm_change_c0_guest_cause(cop0, (0xff),
(T_TLB_ST_MISS << CAUSEB_EXCCODE)); (EXCCODE_TLBS << CAUSEB_EXCCODE));
/* setup badvaddr, context and entryhi registers for the guest */ /* setup badvaddr, context and entryhi registers for the guest */
kvm_write_c0_guest_badvaddr(cop0, vcpu->arch.host_cp0_badvaddr); kvm_write_c0_guest_badvaddr(cop0, vcpu->arch.host_cp0_badvaddr);
...@@ -2032,7 +2032,8 @@ enum emulation_result kvm_mips_emulate_tlbmod(unsigned long cause, ...@@ -2032,7 +2032,8 @@ enum emulation_result kvm_mips_emulate_tlbmod(unsigned long cause,
arch->pc = KVM_GUEST_KSEG0 + 0x180; arch->pc = KVM_GUEST_KSEG0 + 0x180;
} }
kvm_change_c0_guest_cause(cop0, (0xff), (T_TLB_MOD << CAUSEB_EXCCODE)); kvm_change_c0_guest_cause(cop0, (0xff),
(EXCCODE_MOD << CAUSEB_EXCCODE));
/* setup badvaddr, context and entryhi registers for the guest */ /* setup badvaddr, context and entryhi registers for the guest */
kvm_write_c0_guest_badvaddr(cop0, vcpu->arch.host_cp0_badvaddr); kvm_write_c0_guest_badvaddr(cop0, vcpu->arch.host_cp0_badvaddr);
...@@ -2067,7 +2068,7 @@ enum emulation_result kvm_mips_emulate_fpu_exc(unsigned long cause, ...@@ -2067,7 +2068,7 @@ enum emulation_result kvm_mips_emulate_fpu_exc(unsigned long cause,
arch->pc = KVM_GUEST_KSEG0 + 0x180; arch->pc = KVM_GUEST_KSEG0 + 0x180;
kvm_change_c0_guest_cause(cop0, (0xff), kvm_change_c0_guest_cause(cop0, (0xff),
(T_COP_UNUSABLE << CAUSEB_EXCCODE)); (EXCCODE_CPU << CAUSEB_EXCCODE));
kvm_change_c0_guest_cause(cop0, (CAUSEF_CE), (0x1 << CAUSEB_CE)); kvm_change_c0_guest_cause(cop0, (CAUSEF_CE), (0x1 << CAUSEB_CE));
return EMULATE_DONE; return EMULATE_DONE;
...@@ -2095,7 +2096,7 @@ enum emulation_result kvm_mips_emulate_ri_exc(unsigned long cause, ...@@ -2095,7 +2096,7 @@ enum emulation_result kvm_mips_emulate_ri_exc(unsigned long cause,
kvm_debug("Delivering RI @ pc %#lx\n", arch->pc); kvm_debug("Delivering RI @ pc %#lx\n", arch->pc);
kvm_change_c0_guest_cause(cop0, (0xff), kvm_change_c0_guest_cause(cop0, (0xff),
(T_RES_INST << CAUSEB_EXCCODE)); (EXCCODE_RI << CAUSEB_EXCCODE));
/* Set PC to the exception entry point */ /* Set PC to the exception entry point */
arch->pc = KVM_GUEST_KSEG0 + 0x180; arch->pc = KVM_GUEST_KSEG0 + 0x180;
...@@ -2130,7 +2131,7 @@ enum emulation_result kvm_mips_emulate_bp_exc(unsigned long cause, ...@@ -2130,7 +2131,7 @@ enum emulation_result kvm_mips_emulate_bp_exc(unsigned long cause,
kvm_debug("Delivering BP @ pc %#lx\n", arch->pc); kvm_debug("Delivering BP @ pc %#lx\n", arch->pc);
kvm_change_c0_guest_cause(cop0, (0xff), kvm_change_c0_guest_cause(cop0, (0xff),
(T_BREAK << CAUSEB_EXCCODE)); (EXCCODE_BP << CAUSEB_EXCCODE));
/* Set PC to the exception entry point */ /* Set PC to the exception entry point */
arch->pc = KVM_GUEST_KSEG0 + 0x180; arch->pc = KVM_GUEST_KSEG0 + 0x180;
...@@ -2165,7 +2166,7 @@ enum emulation_result kvm_mips_emulate_trap_exc(unsigned long cause, ...@@ -2165,7 +2166,7 @@ enum emulation_result kvm_mips_emulate_trap_exc(unsigned long cause,
kvm_debug("Delivering TRAP @ pc %#lx\n", arch->pc); kvm_debug("Delivering TRAP @ pc %#lx\n", arch->pc);
kvm_change_c0_guest_cause(cop0, (0xff), kvm_change_c0_guest_cause(cop0, (0xff),
(T_TRAP << CAUSEB_EXCCODE)); (EXCCODE_TR << CAUSEB_EXCCODE));
/* Set PC to the exception entry point */ /* Set PC to the exception entry point */
arch->pc = KVM_GUEST_KSEG0 + 0x180; arch->pc = KVM_GUEST_KSEG0 + 0x180;
...@@ -2200,7 +2201,7 @@ enum emulation_result kvm_mips_emulate_msafpe_exc(unsigned long cause, ...@@ -2200,7 +2201,7 @@ enum emulation_result kvm_mips_emulate_msafpe_exc(unsigned long cause,
kvm_debug("Delivering MSAFPE @ pc %#lx\n", arch->pc); kvm_debug("Delivering MSAFPE @ pc %#lx\n", arch->pc);
kvm_change_c0_guest_cause(cop0, (0xff), kvm_change_c0_guest_cause(cop0, (0xff),
(T_MSAFPE << CAUSEB_EXCCODE)); (EXCCODE_MSAFPE << CAUSEB_EXCCODE));
/* Set PC to the exception entry point */ /* Set PC to the exception entry point */
arch->pc = KVM_GUEST_KSEG0 + 0x180; arch->pc = KVM_GUEST_KSEG0 + 0x180;
...@@ -2235,7 +2236,7 @@ enum emulation_result kvm_mips_emulate_fpe_exc(unsigned long cause, ...@@ -2235,7 +2236,7 @@ enum emulation_result kvm_mips_emulate_fpe_exc(unsigned long cause,
kvm_debug("Delivering FPE @ pc %#lx\n", arch->pc); kvm_debug("Delivering FPE @ pc %#lx\n", arch->pc);
kvm_change_c0_guest_cause(cop0, (0xff), kvm_change_c0_guest_cause(cop0, (0xff),
(T_FPE << CAUSEB_EXCCODE)); (EXCCODE_FPE << CAUSEB_EXCCODE));
/* Set PC to the exception entry point */ /* Set PC to the exception entry point */
arch->pc = KVM_GUEST_KSEG0 + 0x180; arch->pc = KVM_GUEST_KSEG0 + 0x180;
...@@ -2270,7 +2271,7 @@ enum emulation_result kvm_mips_emulate_msadis_exc(unsigned long cause, ...@@ -2270,7 +2271,7 @@ enum emulation_result kvm_mips_emulate_msadis_exc(unsigned long cause,
kvm_debug("Delivering MSADIS @ pc %#lx\n", arch->pc); kvm_debug("Delivering MSADIS @ pc %#lx\n", arch->pc);
kvm_change_c0_guest_cause(cop0, (0xff), kvm_change_c0_guest_cause(cop0, (0xff),
(T_MSADIS << CAUSEB_EXCCODE)); (EXCCODE_MSADIS << CAUSEB_EXCCODE));
/* Set PC to the exception entry point */ /* Set PC to the exception entry point */
arch->pc = KVM_GUEST_KSEG0 + 0x180; arch->pc = KVM_GUEST_KSEG0 + 0x180;
...@@ -2479,25 +2480,25 @@ enum emulation_result kvm_mips_check_privilege(unsigned long cause, ...@@ -2479,25 +2480,25 @@ enum emulation_result kvm_mips_check_privilege(unsigned long cause,
if (usermode) { if (usermode) {
switch (exccode) { switch (exccode) {
case T_INT: case EXCCODE_INT:
case T_SYSCALL: case EXCCODE_SYS:
case T_BREAK: case EXCCODE_BP:
case T_RES_INST: case EXCCODE_RI:
case T_TRAP: case EXCCODE_TR:
case T_MSAFPE: case EXCCODE_MSAFPE:
case T_FPE: case EXCCODE_FPE:
case T_MSADIS: case EXCCODE_MSADIS:
break; break;
case T_COP_UNUSABLE: case EXCCODE_CPU:
if (((cause & CAUSEF_CE) >> CAUSEB_CE) == 0) if (((cause & CAUSEF_CE) >> CAUSEB_CE) == 0)
er = EMULATE_PRIV_FAIL; er = EMULATE_PRIV_FAIL;
break; break;
case T_TLB_MOD: case EXCCODE_MOD:
break; break;
case T_TLB_LD_MISS: case EXCCODE_TLBL:
/* /*
* We we are accessing Guest kernel space, then send an * We we are accessing Guest kernel space, then send an
* address error exception to the guest * address error exception to the guest
...@@ -2506,12 +2507,12 @@ enum emulation_result kvm_mips_check_privilege(unsigned long cause, ...@@ -2506,12 +2507,12 @@ enum emulation_result kvm_mips_check_privilege(unsigned long cause,
kvm_debug("%s: LD MISS @ %#lx\n", __func__, kvm_debug("%s: LD MISS @ %#lx\n", __func__,
badvaddr); badvaddr);
cause &= ~0xff; cause &= ~0xff;
cause |= (T_ADDR_ERR_LD << CAUSEB_EXCCODE); cause |= (EXCCODE_ADEL << CAUSEB_EXCCODE);
er = EMULATE_PRIV_FAIL; er = EMULATE_PRIV_FAIL;
} }
break; break;
case T_TLB_ST_MISS: case EXCCODE_TLBS:
/* /*
* We we are accessing Guest kernel space, then send an * We we are accessing Guest kernel space, then send an
* address error exception to the guest * address error exception to the guest
...@@ -2520,26 +2521,26 @@ enum emulation_result kvm_mips_check_privilege(unsigned long cause, ...@@ -2520,26 +2521,26 @@ enum emulation_result kvm_mips_check_privilege(unsigned long cause,
kvm_debug("%s: ST MISS @ %#lx\n", __func__, kvm_debug("%s: ST MISS @ %#lx\n", __func__,
badvaddr); badvaddr);
cause &= ~0xff; cause &= ~0xff;
cause |= (T_ADDR_ERR_ST << CAUSEB_EXCCODE); cause |= (EXCCODE_ADES << CAUSEB_EXCCODE);
er = EMULATE_PRIV_FAIL; er = EMULATE_PRIV_FAIL;
} }
break; break;
case T_ADDR_ERR_ST: case EXCCODE_ADES:
kvm_debug("%s: address error ST @ %#lx\n", __func__, kvm_debug("%s: address error ST @ %#lx\n", __func__,
badvaddr); badvaddr);
if ((badvaddr & PAGE_MASK) == KVM_GUEST_COMMPAGE_ADDR) { if ((badvaddr & PAGE_MASK) == KVM_GUEST_COMMPAGE_ADDR) {
cause &= ~0xff; cause &= ~0xff;
cause |= (T_TLB_ST_MISS << CAUSEB_EXCCODE); cause |= (EXCCODE_TLBS << CAUSEB_EXCCODE);
} }
er = EMULATE_PRIV_FAIL; er = EMULATE_PRIV_FAIL;
break; break;
case T_ADDR_ERR_LD: case EXCCODE_ADEL:
kvm_debug("%s: address error LD @ %#lx\n", __func__, kvm_debug("%s: address error LD @ %#lx\n", __func__,
badvaddr); badvaddr);
if ((badvaddr & PAGE_MASK) == KVM_GUEST_COMMPAGE_ADDR) { if ((badvaddr & PAGE_MASK) == KVM_GUEST_COMMPAGE_ADDR) {
cause &= ~0xff; cause &= ~0xff;
cause |= (T_TLB_LD_MISS << CAUSEB_EXCCODE); cause |= (EXCCODE_TLBL << CAUSEB_EXCCODE);
} }
er = EMULATE_PRIV_FAIL; er = EMULATE_PRIV_FAIL;
break; break;
...@@ -2585,9 +2586,9 @@ enum emulation_result kvm_mips_handle_tlbmiss(unsigned long cause, ...@@ -2585,9 +2586,9 @@ enum emulation_result kvm_mips_handle_tlbmiss(unsigned long cause,
(va & VPN2_MASK) | (va & VPN2_MASK) |
(kvm_read_c0_guest_entryhi(vcpu->arch.cop0) & ASID_MASK)); (kvm_read_c0_guest_entryhi(vcpu->arch.cop0) & ASID_MASK));
if (index < 0) { if (index < 0) {
if (exccode == T_TLB_LD_MISS) { if (exccode == EXCCODE_TLBL) {
er = kvm_mips_emulate_tlbmiss_ld(cause, opc, run, vcpu); er = kvm_mips_emulate_tlbmiss_ld(cause, opc, run, vcpu);
} else if (exccode == T_TLB_ST_MISS) { } else if (exccode == EXCCODE_TLBS) {
er = kvm_mips_emulate_tlbmiss_st(cause, opc, run, vcpu); er = kvm_mips_emulate_tlbmiss_st(cause, opc, run, vcpu);
} else { } else {
kvm_err("%s: invalid exc code: %d\n", __func__, kvm_err("%s: invalid exc code: %d\n", __func__,
...@@ -2602,10 +2603,10 @@ enum emulation_result kvm_mips_handle_tlbmiss(unsigned long cause, ...@@ -2602,10 +2603,10 @@ enum emulation_result kvm_mips_handle_tlbmiss(unsigned long cause,
* exception to the guest * exception to the guest
*/ */
if (!TLB_IS_VALID(*tlb, va)) { if (!TLB_IS_VALID(*tlb, va)) {
if (exccode == T_TLB_LD_MISS) { if (exccode == EXCCODE_TLBL) {
er = kvm_mips_emulate_tlbinv_ld(cause, opc, run, er = kvm_mips_emulate_tlbinv_ld(cause, opc, run,
vcpu); vcpu);
} else if (exccode == T_TLB_ST_MISS) { } else if (exccode == EXCCODE_TLBS) {
er = kvm_mips_emulate_tlbinv_st(cause, opc, run, er = kvm_mips_emulate_tlbinv_st(cause, opc, run,
vcpu); vcpu);
} else { } else {
......
arch/mips/kvm/interrupt.c
View file @ 16d100db
...@@ -128,7 +128,7 @@ int kvm_mips_irq_deliver_cb(struct kvm_vcpu *vcpu, unsigned int priority, ...@@ -128,7 +128,7 @@ int kvm_mips_irq_deliver_cb(struct kvm_vcpu *vcpu, unsigned int priority,
&& (!(kvm_read_c0_guest_status(cop0) & (ST0_EXL | ST0_ERL))) && (!(kvm_read_c0_guest_status(cop0) & (ST0_EXL | ST0_ERL)))
&& (kvm_read_c0_guest_status(cop0) & IE_IRQ5)) { && (kvm_read_c0_guest_status(cop0) & IE_IRQ5)) {
allowed = 1; allowed = 1;
exccode = T_INT; exccode = EXCCODE_INT;
} }
break; break;
...@@ -137,7 +137,7 @@ int kvm_mips_irq_deliver_cb(struct kvm_vcpu *vcpu, unsigned int priority, ...@@ -137,7 +137,7 @@ int kvm_mips_irq_deliver_cb(struct kvm_vcpu *vcpu, unsigned int priority,
&& (!(kvm_read_c0_guest_status(cop0) & (ST0_EXL | ST0_ERL))) && (!(kvm_read_c0_guest_status(cop0) & (ST0_EXL | ST0_ERL)))
&& (kvm_read_c0_guest_status(cop0) & IE_IRQ0)) { && (kvm_read_c0_guest_status(cop0) & IE_IRQ0)) {
allowed = 1; allowed = 1;
exccode = T_INT; exccode = EXCCODE_INT;
} }
break; break;
...@@ -146,7 +146,7 @@ int kvm_mips_irq_deliver_cb(struct kvm_vcpu *vcpu, unsigned int priority, ...@@ -146,7 +146,7 @@ int kvm_mips_irq_deliver_cb(struct kvm_vcpu *vcpu, unsigned int priority,
&& (!(kvm_read_c0_guest_status(cop0) & (ST0_EXL | ST0_ERL))) && (!(kvm_read_c0_guest_status(cop0) & (ST0_EXL | ST0_ERL)))
&& (kvm_read_c0_guest_status(cop0) & IE_IRQ1)) { && (kvm_read_c0_guest_status(cop0) & IE_IRQ1)) {
allowed = 1; allowed = 1;
exccode = T_INT; exccode = EXCCODE_INT;
} }
break; break;
...@@ -155,7 +155,7 @@ int kvm_mips_irq_deliver_cb(struct kvm_vcpu *vcpu, unsigned int priority, ...@@ -155,7 +155,7 @@ int kvm_mips_irq_deliver_cb(struct kvm_vcpu *vcpu, unsigned int priority,
&& (!(kvm_read_c0_guest_status(cop0) & (ST0_EXL | ST0_ERL))) && (!(kvm_read_c0_guest_status(cop0) & (ST0_EXL | ST0_ERL)))
&& (kvm_read_c0_guest_status(cop0) & IE_IRQ2)) { && (kvm_read_c0_guest_status(cop0) & IE_IRQ2)) {
allowed = 1; allowed = 1;
exccode = T_INT; exccode = EXCCODE_INT;
} }
break; break;
......
arch/mips/kvm/mips.c
View file @ 16d100db
...@@ -1264,8 +1264,8 @@ int kvm_mips_handle_exit(struct kvm_run *run, struct kvm_vcpu *vcpu) ...@@ -1264,8 +1264,8 @@ int kvm_mips_handle_exit(struct kvm_run *run, struct kvm_vcpu *vcpu)
} }
switch (exccode) { switch (exccode) {
case T_INT: case EXCCODE_INT:
kvm_debug("[%d]T_INT @ %p\n", vcpu->vcpu_id, opc); kvm_debug("[%d]EXCCODE_INT @ %p\n", vcpu->vcpu_id, opc);
++vcpu->stat.int_exits; ++vcpu->stat.int_exits;
trace_kvm_exit(vcpu, INT_EXITS); trace_kvm_exit(vcpu, INT_EXITS);
...@@ -1276,8 +1276,8 @@ int kvm_mips_handle_exit(struct kvm_run *run, struct kvm_vcpu *vcpu) ...@@ -1276,8 +1276,8 @@ int kvm_mips_handle_exit(struct kvm_run *run, struct kvm_vcpu *vcpu)
ret = RESUME_GUEST; ret = RESUME_GUEST;
break; break;
case T_COP_UNUSABLE: case EXCCODE_CPU:
kvm_debug("T_COP_UNUSABLE: @ PC: %p\n", opc); kvm_debug("EXCCODE_CPU: @ PC: %p\n", opc);
++vcpu->stat.cop_unusable_exits; ++vcpu->stat.cop_unusable_exits;
trace_kvm_exit(vcpu, COP_UNUSABLE_EXITS); trace_kvm_exit(vcpu, COP_UNUSABLE_EXITS);
...@@ -1287,13 +1287,13 @@ int kvm_mips_handle_exit(struct kvm_run *run, struct kvm_vcpu *vcpu) ...@@ -1287,13 +1287,13 @@ int kvm_mips_handle_exit(struct kvm_run *run, struct kvm_vcpu *vcpu)
ret = RESUME_HOST; ret = RESUME_HOST;
break; break;
case T_TLB_MOD: case EXCCODE_MOD:
++vcpu->stat.tlbmod_exits; ++vcpu->stat.tlbmod_exits;
trace_kvm_exit(vcpu, TLBMOD_EXITS); trace_kvm_exit(vcpu, TLBMOD_EXITS);
ret = kvm_mips_callbacks->handle_tlb_mod(vcpu); ret = kvm_mips_callbacks->handle_tlb_mod(vcpu);
break; break;
case T_TLB_ST_MISS: case EXCCODE_TLBS:
kvm_debug("TLB ST fault: cause %#x, status %#lx, PC: %p, BadVaddr: %#lx\n", kvm_debug("TLB ST fault: cause %#x, status %#lx, PC: %p, BadVaddr: %#lx\n",
cause, kvm_read_c0_guest_status(vcpu->arch.cop0), opc, cause, kvm_read_c0_guest_status(vcpu->arch.cop0), opc,
badvaddr); badvaddr);
...@@ -1303,7 +1303,7 @@ int kvm_mips_handle_exit(struct kvm_run *run, struct kvm_vcpu *vcpu) ...@@ -1303,7 +1303,7 @@ int kvm_mips_handle_exit(struct kvm_run *run, struct kvm_vcpu *vcpu)
ret = kvm_mips_callbacks->handle_tlb_st_miss(vcpu); ret = kvm_mips_callbacks->handle_tlb_st_miss(vcpu);
break; break;
case T_TLB_LD_MISS: case EXCCODE_TLBL:
kvm_debug("TLB LD fault: cause %#x, PC: %p, BadVaddr: %#lx\n", kvm_debug("TLB LD fault: cause %#x, PC: %p, BadVaddr: %#lx\n",
cause, opc, badvaddr); cause, opc, badvaddr);
...@@ -1312,55 +1312,55 @@ int kvm_mips_handle_exit(struct kvm_run *run, struct kvm_vcpu *vcpu) ...@@ -1312,55 +1312,55 @@ int kvm_mips_handle_exit(struct kvm_run *run, struct kvm_vcpu *vcpu)
ret = kvm_mips_callbacks->handle_tlb_ld_miss(vcpu); ret = kvm_mips_callbacks->handle_tlb_ld_miss(vcpu);
break; break;
case T_ADDR_ERR_ST: case EXCCODE_ADES:
++vcpu->stat.addrerr_st_exits; ++vcpu->stat.addrerr_st_exits;
trace_kvm_exit(vcpu, ADDRERR_ST_EXITS); trace_kvm_exit(vcpu, ADDRERR_ST_EXITS);
ret = kvm_mips_callbacks->handle_addr_err_st(vcpu); ret = kvm_mips_callbacks->handle_addr_err_st(vcpu);
break; break;
case T_ADDR_ERR_LD: case EXCCODE_ADEL:
++vcpu->stat.addrerr_ld_exits; ++vcpu->stat.addrerr_ld_exits;
trace_kvm_exit(vcpu, ADDRERR_LD_EXITS); trace_kvm_exit(vcpu, ADDRERR_LD_EXITS);
ret = kvm_mips_callbacks->handle_addr_err_ld(vcpu); ret = kvm_mips_callbacks->handle_addr_err_ld(vcpu);
break; break;
case T_SYSCALL: case EXCCODE_SYS:
++vcpu->stat.syscall_exits; ++vcpu->stat.syscall_exits;
trace_kvm_exit(vcpu, SYSCALL_EXITS); trace_kvm_exit(vcpu, SYSCALL_EXITS);
ret = kvm_mips_callbacks->handle_syscall(vcpu); ret = kvm_mips_callbacks->handle_syscall(vcpu);
break; break;
case T_RES_INST: case EXCCODE_RI:
++vcpu->stat.resvd_inst_exits; ++vcpu->stat.resvd_inst_exits;
trace_kvm_exit(vcpu, RESVD_INST_EXITS); trace_kvm_exit(vcpu, RESVD_INST_EXITS);
ret = kvm_mips_callbacks->handle_res_inst(vcpu); ret = kvm_mips_callbacks->handle_res_inst(vcpu);
break; break;
case T_BREAK: case EXCCODE_BP:
++vcpu->stat.break_inst_exits; ++vcpu->stat.break_inst_exits;
trace_kvm_exit(vcpu, BREAK_INST_EXITS); trace_kvm_exit(vcpu, BREAK_INST_EXITS);
ret = kvm_mips_callbacks->handle_break(vcpu); ret = kvm_mips_callbacks->handle_break(vcpu);
break; break;
case T_TRAP: case EXCCODE_TR:
++vcpu->stat.trap_inst_exits; ++vcpu->stat.trap_inst_exits;
trace_kvm_exit(vcpu, TRAP_INST_EXITS); trace_kvm_exit(vcpu, TRAP_INST_EXITS);
ret = kvm_mips_callbacks->handle_trap(vcpu); ret = kvm_mips_callbacks->handle_trap(vcpu);
break; break;
case T_MSAFPE: case EXCCODE_MSAFPE:
++vcpu->stat.msa_fpe_exits; ++vcpu->stat.msa_fpe_exits;
trace_kvm_exit(vcpu, MSA_FPE_EXITS); trace_kvm_exit(vcpu, MSA_FPE_EXITS);
ret = kvm_mips_callbacks->handle_msa_fpe(vcpu); ret = kvm_mips_callbacks->handle_msa_fpe(vcpu);
break; break;
case T_FPE: case EXCCODE_FPE:
++vcpu->stat.fpe_exits; ++vcpu->stat.fpe_exits;
trace_kvm_exit(vcpu, FPE_EXITS); trace_kvm_exit(vcpu, FPE_EXITS);
ret = kvm_mips_callbacks->handle_fpe(vcpu); ret = kvm_mips_callbacks->handle_fpe(vcpu);
break; break;
case T_MSADIS: case EXCCODE_MSADIS:
++vcpu->stat.msa_disabled_exits; ++vcpu->stat.msa_disabled_exits;
trace_kvm_exit(vcpu, MSA_DISABLED_EXITS); trace_kvm_exit(vcpu, MSA_DISABLED_EXITS);
ret = kvm_mips_callbacks->handle_msa_disabled(vcpu); ret = kvm_mips_callbacks->handle_msa_disabled(vcpu);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7