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

linux-user/arm: Implement __kernel_cmpxchg64 with host atomics 

If CONFIG_ATOMIC64, we can use a host cmpxchg and provide
atomicity across processes; otherwise we have no choice but
to continue using start/end_exclusive.

Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20220323005839.94327-4-richard.henderson@linaro.org>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
This commit is contained in:
Richard Henderson 2022-03-22 17:58:39 -07:00 committed by Laurent Vivier
parent 7f4f0d9ea8
commit 330ea9d1d8
1 changed files with 38 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
linux-user/arm/cpu_loop.c
View File

@ -138,7 +138,7 @@ static void arm_kernel_cmpxchg32_helper(CPUARMState *env)
} }
/* /*
* See the Linux kernel's Documentation/arm/kernel_user_helpers.txt * See the Linux kernel's Documentation/arm/kernel_user_helpers.rst
* Input: * Input:
* r0 = pointer to oldval * r0 = pointer to oldval
* r1 = pointer to newval * r1 = pointer to newval
@ -155,57 +155,54 @@ static void arm_kernel_cmpxchg64_helper(CPUARMState *env)
{ {
uint64_t oldval, newval, val; uint64_t oldval, newval, val;
uint32_t addr, cpsr; uint32_t addr, cpsr;
uint64_t *host_addr;
/* Based on the 32 bit code in do_kernel_trap */ addr = env->regs[0];
if (get_user_u64(oldval, addr)) {
goto segv;
}
/* XXX: This only works between threads, not between processes. addr = env->regs[1];
It's probably possible to implement this with native host if (get_user_u64(newval, addr)) {
operations. However things like ldrex/strex are much harder so goto segv;
there's not much point trying. */ }
start_exclusive();
cpsr = cpsr_read(env); mmap_lock();
addr = env->regs[2]; addr = env->regs[2];
host_addr = atomic_mmu_lookup(env, addr, 8);
if (get_user_u64(oldval, env->regs[0])) { if (!host_addr) {
env->exception.vaddress = env->regs[0]; mmap_unlock();
goto segv; return;
};
if (get_user_u64(newval, env->regs[1])) {
env->exception.vaddress = env->regs[1];
goto segv;
};
if (get_user_u64(val, addr)) {
env->exception.vaddress = addr;
goto segv;
} }
#ifdef CONFIG_ATOMIC64
val = qatomic_cmpxchg__nocheck(host_addr, oldval, newval);
cpsr = (val == oldval) * CPSR_C;
#else
/*
* This only works between threads, not between processes, but since
* the host has no 64-bit cmpxchg, it is the best that we can do.
*/
start_exclusive();
val = *host_addr;
if (val == oldval) { if (val == oldval) {
val = newval; *host_addr = newval;
cpsr = CPSR_C;
if (put_user_u64(val, addr)) {
env->exception.vaddress = addr;
goto segv;
};
env->regs[0] = 0;
cpsr |= CPSR_C;
} else { } else {
env->regs[0] = -1; cpsr = 0;
cpsr &= ~CPSR_C;
} }
cpsr_write(env, cpsr, CPSR_C, CPSRWriteByInstr);
end_exclusive(); end_exclusive();
#endif
mmap_unlock();
cpsr_write(env, cpsr, CPSR_C, CPSRWriteByInstr);
env->regs[0] = cpsr ? 0 : -1;
return; return;
segv: segv:
end_exclusive(); force_sig_fault(TARGET_SIGSEGV,
/* We get the PC of the entry address - which is as good as anything, page_get_flags(addr) & PAGE_VALID ?
on a real kernel what you get depends on which mode it uses. */ TARGET_SEGV_ACCERR : TARGET_SEGV_MAPERR, addr);
/* XXX: check env->error_code */
force_sig_fault(TARGET_SIGSEGV, TARGET_SEGV_MAPERR,
env->exception.vaddress);
} }
/* Handle a jump to the kernel code page. */ /* Handle a jump to the kernel code page. */