yuzu-emu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn.git synced 2024-10-20 10:08:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

target-mips: Fix RDHWR exception host PC

Browse Source 
Commit b00c72180c36 ("target-mips: add PC, XNP reg numbers to RDHWR")
changed the rdhwr helpers to use check_hwrena() to check the register
being accessed is enabled in CP0_HWREna when used from user mode. If
that check fails an EXCP_RI exception is raised at the host PC
calculated with GETPC().

However check_hwrena() may not be fully inlined as the
do_raise_exception() part of it is common regardless of the arguments.
This causes GETPC() to calculate the address in the call in the helper
instead of the generated code calling the helper. No TB will be found
and the EPC reported with the resulting guest RI exception points to the
beginning of the TB instead of the RDHWR instruction.

We can't reliably force check_hwrena() to be inlined, and converting it
to a macro would be ugly, so instead pass the host PC in as an argument,
with each rdhwr helper passing GETPC(). This should avoid any dependence
on compiler behaviour, and in practice seems to ensure the full inlining
of check_hwrena() on x86_64.

This issue causes failures when running a MIPS KVM (trap & emulate)
guest in a MIPS QEMU TCG guest, as the inner guest kernel will do a
RDHWR of counter, which is disabled in the outer guest's CP0_HWREna by
KVM so it can emulate the inner guest's counter. The emulation fails and
the RI exception is passed to the inner guest.

Backports commit d96391c1ffeb30a0afa695c86579517c69d9a889 from qemu
This commit is contained in:
James Hogan 2018-02-23 13:59:27 -05:00 committed by Lioncash
parent 6180cbd477
commit e4903fc5f2
No known key found for this signature in database
GPG Key ID: 4E3C3CC1031BA9C7
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
qemu/target-mips/op_helper.c
View File

@ -2281,29 +2281,29 @@ void helper_deret(CPUMIPSState *env)
} }
#endif /* !CONFIG_USER_ONLY */ #endif /* !CONFIG_USER_ONLY */
static inline void check_hwrena(CPUMIPSState *env, int reg) static inline void check_hwrena(CPUMIPSState *env, int reg, uintptr_t pc)
{ {
if ((env->hflags & MIPS_HFLAG_CP0) || (env->CP0_HWREna & (1 << reg))) { if ((env->hflags & MIPS_HFLAG_CP0) || (env->CP0_HWREna & (1 << reg))) {
return; return;
} }
do_raise_exception(env, EXCP_RI, GETPC()); do_raise_exception(env, EXCP_RI, pc);
} }
target_ulong helper_rdhwr_cpunum(CPUMIPSState *env) target_ulong helper_rdhwr_cpunum(CPUMIPSState *env)
{ {
check_hwrena(env, 0); check_hwrena(env, 0, GETPC());
return env->CP0_EBase & 0x3ff; return env->CP0_EBase & 0x3ff;
} }
target_ulong helper_rdhwr_synci_step(CPUMIPSState *env) target_ulong helper_rdhwr_synci_step(CPUMIPSState *env)
{ {
check_hwrena(env, 1); check_hwrena(env, 1, GETPC());
return env->SYNCI_Step; return env->SYNCI_Step;
} }
target_ulong helper_rdhwr_cc(CPUMIPSState *env) target_ulong helper_rdhwr_cc(CPUMIPSState *env)
{ {
check_hwrena(env, 2); check_hwrena(env, 2, GETPC());
#ifdef CONFIG_USER_ONLY #ifdef CONFIG_USER_ONLY
return env->CP0_Count; return env->CP0_Count;
#else #else
@ -2313,19 +2313,19 @@ target_ulong helper_rdhwr_cc(CPUMIPSState *env)
target_ulong helper_rdhwr_ccres(CPUMIPSState *env) target_ulong helper_rdhwr_ccres(CPUMIPSState *env)
{ {
check_hwrena(env, 3); check_hwrena(env, 3, GETPC());
return env->CCRes; return env->CCRes;
} }
target_ulong helper_rdhwr_performance(CPUMIPSState *env) target_ulong helper_rdhwr_performance(CPUMIPSState *env)
{ {
check_hwrena(env, 4); check_hwrena(env, 4, GETPC());
return env->CP0_Performance0; return env->CP0_Performance0;
} }
target_ulong helper_rdhwr_xnp(CPUMIPSState *env) target_ulong helper_rdhwr_xnp(CPUMIPSState *env)
{ {
check_hwrena(env, 5); check_hwrena(env, 5, GETPC());
return (env->CP0_Config5 >> CP0C5_XNP) & 1; return (env->CP0_Config5 >> CP0C5_XNP) & 1;
} }