target/s390x: Implement s390x_cpu_record_sigbus
For s390x, the only unaligned accesses that are signaled are atomic, and we don't actually want to raise SIGBUS for those, but instead raise a SPECIFICATION error, which the kernel will report as SIGILL. Split out a do_unaligned_access function to share between the user-only s390x_cpu_record_sigbus and the sysemu s390x_do_unaligned_access. Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
parent
5057ae5636
commit
5bcbf3561f
|
@ -269,6 +269,7 @@ static const struct TCGCPUOps s390_tcg_ops = {
|
||||||
|
|
||||||
#ifdef CONFIG_USER_ONLY
|
#ifdef CONFIG_USER_ONLY
|
||||||
.record_sigsegv = s390_cpu_record_sigsegv,
|
.record_sigsegv = s390_cpu_record_sigsegv,
|
||||||
|
.record_sigbus = s390_cpu_record_sigbus,
|
||||||
#else
|
#else
|
||||||
.tlb_fill = s390_cpu_tlb_fill,
|
.tlb_fill = s390_cpu_tlb_fill,
|
||||||
.cpu_exec_interrupt = s390_cpu_exec_interrupt,
|
.cpu_exec_interrupt = s390_cpu_exec_interrupt,
|
||||||
|
|
|
@ -270,18 +270,20 @@ ObjectClass *s390_cpu_class_by_name(const char *name);
|
||||||
void s390x_cpu_debug_excp_handler(CPUState *cs);
|
void s390x_cpu_debug_excp_handler(CPUState *cs);
|
||||||
void s390_cpu_do_interrupt(CPUState *cpu);
|
void s390_cpu_do_interrupt(CPUState *cpu);
|
||||||
bool s390_cpu_exec_interrupt(CPUState *cpu, int int_req);
|
bool s390_cpu_exec_interrupt(CPUState *cpu, int int_req);
|
||||||
void s390x_cpu_do_unaligned_access(CPUState *cs, vaddr addr,
|
|
||||||
MMUAccessType access_type, int mmu_idx,
|
|
||||||
uintptr_t retaddr) QEMU_NORETURN;
|
|
||||||
|
|
||||||
#ifdef CONFIG_USER_ONLY
|
#ifdef CONFIG_USER_ONLY
|
||||||
void s390_cpu_record_sigsegv(CPUState *cs, vaddr address,
|
void s390_cpu_record_sigsegv(CPUState *cs, vaddr address,
|
||||||
MMUAccessType access_type,
|
MMUAccessType access_type,
|
||||||
bool maperr, uintptr_t retaddr);
|
bool maperr, uintptr_t retaddr);
|
||||||
|
void s390_cpu_record_sigbus(CPUState *cs, vaddr address,
|
||||||
|
MMUAccessType access_type, uintptr_t retaddr);
|
||||||
#else
|
#else
|
||||||
bool s390_cpu_tlb_fill(CPUState *cs, vaddr address, int size,
|
bool s390_cpu_tlb_fill(CPUState *cs, vaddr address, int size,
|
||||||
MMUAccessType access_type, int mmu_idx,
|
MMUAccessType access_type, int mmu_idx,
|
||||||
bool probe, uintptr_t retaddr);
|
bool probe, uintptr_t retaddr);
|
||||||
|
void s390x_cpu_do_unaligned_access(CPUState *cs, vaddr addr,
|
||||||
|
MMUAccessType access_type, int mmu_idx,
|
||||||
|
uintptr_t retaddr) QEMU_NORETURN;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -82,6 +82,19 @@ void HELPER(data_exception)(CPUS390XState *env, uint32_t dxc)
|
||||||
tcg_s390_data_exception(env, dxc, GETPC());
|
tcg_s390_data_exception(env, dxc, GETPC());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Unaligned accesses are only diagnosed with MO_ALIGN. At the moment,
|
||||||
|
* this is only for the atomic operations, for which we want to raise a
|
||||||
|
* specification exception.
|
||||||
|
*/
|
||||||
|
static void QEMU_NORETURN do_unaligned_access(CPUState *cs, uintptr_t retaddr)
|
||||||
|
{
|
||||||
|
S390CPU *cpu = S390_CPU(cs);
|
||||||
|
CPUS390XState *env = &cpu->env;
|
||||||
|
|
||||||
|
tcg_s390_program_interrupt(env, PGM_SPECIFICATION, retaddr);
|
||||||
|
}
|
||||||
|
|
||||||
#if defined(CONFIG_USER_ONLY)
|
#if defined(CONFIG_USER_ONLY)
|
||||||
|
|
||||||
void s390_cpu_do_interrupt(CPUState *cs)
|
void s390_cpu_do_interrupt(CPUState *cs)
|
||||||
|
@ -106,6 +119,12 @@ void s390_cpu_record_sigsegv(CPUState *cs, vaddr address,
|
||||||
cpu_loop_exit_restore(cs, retaddr);
|
cpu_loop_exit_restore(cs, retaddr);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void s390_cpu_record_sigbus(CPUState *cs, vaddr address,
|
||||||
|
MMUAccessType access_type, uintptr_t retaddr)
|
||||||
|
{
|
||||||
|
do_unaligned_access(cs, retaddr);
|
||||||
|
}
|
||||||
|
|
||||||
#else /* !CONFIG_USER_ONLY */
|
#else /* !CONFIG_USER_ONLY */
|
||||||
|
|
||||||
static inline uint64_t cpu_mmu_idx_to_asc(int mmu_idx)
|
static inline uint64_t cpu_mmu_idx_to_asc(int mmu_idx)
|
||||||
|
@ -593,17 +612,11 @@ void s390x_cpu_debug_excp_handler(CPUState *cs)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Unaligned accesses are only diagnosed with MO_ALIGN. At the moment,
|
|
||||||
this is only for the atomic operations, for which we want to raise a
|
|
||||||
specification exception. */
|
|
||||||
void s390x_cpu_do_unaligned_access(CPUState *cs, vaddr addr,
|
void s390x_cpu_do_unaligned_access(CPUState *cs, vaddr addr,
|
||||||
MMUAccessType access_type,
|
MMUAccessType access_type,
|
||||||
int mmu_idx, uintptr_t retaddr)
|
int mmu_idx, uintptr_t retaddr)
|
||||||
{
|
{
|
||||||
S390CPU *cpu = S390_CPU(cs);
|
do_unaligned_access(cs, retaddr);
|
||||||
CPUS390XState *env = &cpu->env;
|
|
||||||
|
|
||||||
tcg_s390_program_interrupt(env, PGM_SPECIFICATION, retaddr);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void QEMU_NORETURN monitor_event(CPUS390XState *env,
|
static void QEMU_NORETURN monitor_event(CPUS390XState *env,
|
||||||
|
|
Loading…
Reference in New Issue