OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

linux-user: Access correct register for get/set_tls syscalls on ARM TZ CPUs

Browse Source 
When support was added for TrustZone to ARM CPU emulation, we failed
to correctly update the support for the linux-user implementation of
the get/set_tls syscalls. This meant that accesses to the TPIDRURO
register via the syscalls were always using the non-secure copy of
the register even if native MRC/MCR accesses were using the secure
register. This inconsistency caused most binaries to segfault on startup
if the CPU type was explicitly set to one of the TZ-enabled ones like
cortex-a15. (The default "any" CPU doesn't have TZ enabled and so is
not affected.)

Use access_secure_reg() to determine whether we should be using
the secure or the nonsecure copy of TPIDRURO when emulating these
syscalls.

Signed-off-by: Mikhail Ilyin <m.ilin@samsung.com>
Message-id: 1426505198-2411-1-git-send-email-m.ilin@samsung.com
[PMM: rewrote commit message to more clearly explain the issue
 and its consequences.]
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Mikhail Ilyin 2015-03-16 12:30:47 +00:00 committed by Peter Maydell
parent fcf83ab103
commit b8d43285a4
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
linux-user/arm/target_cpu.h
View File

@ -29,7 +29,20 @@ static inline void cpu_clone_regs(CPUARMState *env, target_ulong newsp)
static inline void cpu_set_tls(CPUARMState *env, target_ulong newtls) static inline void cpu_set_tls(CPUARMState *env, target_ulong newtls)
{ {
if (access_secure_reg(env)) {
env->cp15.tpidruro_s = newtls;
} else {
env->cp15.tpidrro_el[0] = newtls; env->cp15.tpidrro_el[0] = newtls;
} }
}
static inline target_ulong cpu_get_tls(CPUARMState *env)
{
if (access_secure_reg(env)) {
return env->cp15.tpidruro_s;
} else {
return env->cp15.tpidrro_el[0];
}
}
#endif #endif

2
linux-user/main.c
View File

@ -566,7 +566,7 @@ do_kernel_trap(CPUARMState *env)
end_exclusive(); end_exclusive();
break; break;
case 0xffff0fe0: /* __kernel_get_tls */ case 0xffff0fe0: /* __kernel_get_tls */
env->regs[0] = env->cp15.tpidrro_el[0]; env->regs[0] = cpu_get_tls(env);
break; break;
case 0xffff0f60: /* __kernel_cmpxchg64 */ case 0xffff0f60: /* __kernel_cmpxchg64 */
arm_kernel_cmpxchg64_helper(env); arm_kernel_cmpxchg64_helper(env);