| Message ID | 20171128203326.6062-15-david@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | s390x/tcg: cleanup and fix program interrupts | expand |
On Tue, 28 Nov 2017 21:33:24 +0100 David Hildenbrand <david@redhat.com> wrote: > All users are gone, we can finally drop it and make sure that all new > new program interrupt injections are reminded of the retaddr - as they s/new new/new/ > have to use program_interrupt_ra() now. > > Signed-off-by: David Hildenbrand <david@redhat.com> > --- > target/s390x/cpu.h | 1 - > target/s390x/interrupt.c | 22 ++++++++-------------- > 2 files changed, 8 insertions(+), 15 deletions(-) >
On 11/28/2017 08:33 PM, David Hildenbrand wrote: > -void program_interrupt(CPUS390XState *env, uint32_t code, int ilen) > +void program_interrupt_ra(CPUS390XState *env, uint32_t code, int ilen, > + uintptr_t ra) > { > S390CPU *cpu = s390_env_get_cpu(env); > > qemu_log_mask(CPU_LOG_INT, "program interrupt at %#" PRIx64 "\n", > env->psw.addr); > > +#ifdef CONFIG_TCG > + if (tcg_enabled() && ra) { > + cpu_restore_state(CPU(cpu), ra); > + } > +#endif Please move this into tcg_s390_program_interrupt by using cpu_loop_exit_restore there. r~
On 29.11.2017 19:18, Richard Henderson wrote: > On 11/28/2017 08:33 PM, David Hildenbrand wrote: >> -void program_interrupt(CPUS390XState *env, uint32_t code, int ilen) >> +void program_interrupt_ra(CPUS390XState *env, uint32_t code, int ilen, >> + uintptr_t ra) >> { >> S390CPU *cpu = s390_env_get_cpu(env); >> >> qemu_log_mask(CPU_LOG_INT, "program interrupt at %#" PRIx64 "\n", >> env->psw.addr); >> >> +#ifdef CONFIG_TCG >> + if (tcg_enabled() && ra) { >> + cpu_restore_state(CPU(cpu), ra); >> + } >> +#endif > > Please move this into tcg_s390_program_interrupt by using cpu_loop_exit_restore > there. > Indeed, good idea, thanks! > > r~ >
diff --git a/target/s390x/cpu.h b/target/s390x/cpu.h index 617f9b0148..890a25c1d6 100644 --- a/target/s390x/cpu.h +++ b/target/s390x/cpu.h @@ -719,7 +719,6 @@ void s390_io_interrupt(uint16_t subchannel_id, uint16_t subchannel_nr, uint32_t io_int_parm, uint32_t io_int_word); /* automatically detect the instruction length */ #define ILEN_AUTO 0xff -void program_interrupt(CPUS390XState *env, uint32_t code, int ilen); void program_interrupt_ra(CPUS390XState *env, uint32_t code, int ilen, uintptr_t ra); /* service interrupts are floating therefore we must not pass an cpustate */ diff --git a/target/s390x/interrupt.c b/target/s390x/interrupt.c index 6ce06bb549..c0996187ef 100644 --- a/target/s390x/interrupt.c +++ b/target/s390x/interrupt.c @@ -37,13 +37,20 @@ static void tcg_s390_program_interrupt(CPUS390XState *env, uint32_t code, #endif } -void program_interrupt(CPUS390XState *env, uint32_t code, int ilen) +void program_interrupt_ra(CPUS390XState *env, uint32_t code, int ilen, + uintptr_t ra) { S390CPU *cpu = s390_env_get_cpu(env); qemu_log_mask(CPU_LOG_INT, "program interrupt at %#" PRIx64 "\n", env->psw.addr); +#ifdef CONFIG_TCG + if (tcg_enabled() && ra) { + cpu_restore_state(CPU(cpu), ra); + } +#endif + if (kvm_enabled()) { kvm_s390_program_interrupt(cpu, code); } else if (tcg_enabled()) { @@ -53,19 +60,6 @@ void program_interrupt(CPUS390XState *env, uint32_t code, int ilen) } } -void program_interrupt_ra(CPUS390XState *env, uint32_t code, int ilen, - uintptr_t ra) -{ - S390CPU *cpu = s390_env_get_cpu(env); - -#ifdef CONFIG_TCG - if (tcg_enabled() && ra) { - cpu_restore_state(CPU(cpu), ra); - } -#endif - program_interrupt(env, code, ilen); -} - #if !defined(CONFIG_USER_ONLY) static void cpu_inject_service(S390CPU *cpu, uint32_t param) {
All users are gone, we can finally drop it and make sure that all new new program interrupt injections are reminded of the retaddr - as they have to use program_interrupt_ra() now. Signed-off-by: David Hildenbrand <david@redhat.com> --- target/s390x/cpu.h | 1 - target/s390x/interrupt.c | 22 ++++++++-------------- 2 files changed, 8 insertions(+), 15 deletions(-)