s390x: Improvements to SIGP handling [QEMU]
v5 cover s390x: Improvements to SIGP handling [QEMU]
Here is an update to the SIGP handling series, to correspond to version 5 of the KVM series [1].
Unlike earlier versions, there is no new interface to exploit. So this simply rearranges processing to mirror expectations on the kernel side.
[1] https://lore.kernel.org/r/[email protected]/
Previous RFCs:
v1: https://lore.kernel.org/r/[email protected]/
v2: https://lore.kernel.org/r/[email protected]/
v3: https://lore.kernel.org/r/[email protected]/
v4: https://lore.kernel.org/r/[email protected]/
Eric Farman (1):
s390x: sigp: Reorder the SIGP STOP code
target/s390x/sigp.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
Signature · 1 line
2.32.0
RFC PATCH v5 1/1 s390x: sigp: Reorder the SIGP STOP code
Let's wait to mark the VCPU STOPPED until the possible STORE STATUS operation is completed, so that we know the CPU is fully stopped and done doing anything. (When we also clear the possible sigp_order field for STOP orders.)
--- target/s390x/sigp.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
target/s390x/sigp.c +8 -4
@@ -139,7 +139,7 @@ static void sigp_stop_and_store_status(CPUState *cs, run_on_cpu_data arg)case S390_CPU_STATE_OPERATING : cpu->env.sigp_order =SIGP_STOP_STORE_STATUS ;cpu_inject_stop (cpu); -/* store will be performed in do_stop_interrup() */ +/* store will be performed in do_stop_interrupt() */ break ;case S390_CPU_STATE_STOPPED :/* already stopped, just store the status */
@@ -479,13 +479,17 @@ void do_stop_interrupt(CPUS390XState *env) {S390CPU *cpu =env_archcpu (env); -if (s390_cpu_set_state (S390_CPU_STATE_STOPPED , cpu) ==0 ) { -qemu_system_shutdown_request (SHUTDOWN_CAUSE_GUEST_SHUTDOWN ); - } +/* +* Complete the STOP operation before exposing the CPU as +* STOPPED to the system. +*/ if (cpu->env.sigp_order ==SIGP_STOP_STORE_STATUS ) {s390_store_status (cpu,S390_STORE_STATUS_DEF_ADDR , true); } env->sigp_order =0 ; +if (s390_cpu_set_state (S390_CPU_STATE_STOPPED , cpu) ==0 ) { +qemu_system_shutdown_request (SHUTDOWN_CAUSE_GUEST_SHUTDOWN ); + } env->pending_int &= ~INTERRUPT_STOP ; }
Signature · 1 line
2.32.0
Re: [RFC PATCH v5 1/1] s390x: sigp: Reorder the SIGP STOP code
Quoted 35 lines · Eric Farman
Let's wait to mark the VCPU STOPPED until the possible STORE STATUS operation is completed, so that we know the CPU is fully stopped and done doing anything. (When we also clear the possible
sigp_orderfield for STOP orders.)Suggested-by David Hildenbrand <[email protected]>Signed-off-by Eric Farman <[email protected]>--- target/s390x/sigp.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)target/s390x/sigp.c +5
-4@@ -139,7 +139,7 @@ static void sigp_stop_and_store_status(CPUState *cs, run_on_cpu_data arg)case S390_CPU_STATE_OPERATING : cpu->env.sigp_order =SIGP_STOP_STORE_STATUS ;cpu_inject_stop (cpu); -/* store will be performed in do_stop_interrup() */ +/* store will be performed in do_stop_interrupt() */ break ;case S390_CPU_STATE_STOPPED :/* already stopped, just store the status */ @@ -479,13 +479,17 @@ void do_stop_interrupt(CPUS390XState *env) {S390CPU *cpu =env_archcpu (env); -if (s390_cpu_set_state (S390_CPU_STATE_STOPPED , cpu) ==0 ) { -qemu_system_shutdown_request (SHUTDOWN_CAUSE_GUEST_SHUTDOWN ); - } +/* +* Complete the STOP operation before exposing the CPU as +* STOPPED to the system. +*/
target/s390x/sigp.c void do_stop_interrupt(CPUS390XState *env) · line 495
Quoted 10 lines
target/s390x/sigp.c +3
-0if (cpu->env.sigp_order ==SIGP_STOP_STORE_STATUS ) {s390_store_status (cpu,S390_STORE_STATUS_DEF_ADDR , true); } env->sigp_order =0 ; +if (s390_cpu_set_state (S390_CPU_STATE_STOPPED , cpu) ==0 ) { +qemu_system_shutdown_request (SHUTDOWN_CAUSE_GUEST_SHUTDOWN ); + } env->pending_int &= ~INTERRUPT_STOP ; }
Signature · 3 lines
Thanks, David / dhildenb
Re: [RFC PATCH v5 1/1] s390x: sigp: Reorder the SIGP STOP code
Quoted 40 lines · David Hildenbrand
Quoted 39 lines · Eric Farman
Let's wait to mark the VCPU STOPPED until the possible STORE STATUS operation is completed, so that we know the CPU is fully stopped and done doing anything. (When we also clear the possible
sigp_orderfield for STOP orders.)Suggested-by David Hildenbrand <[email protected]>Signed-off-by Eric Farman <[email protected]>--- target/s390x/sigp.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)target/s390x/sigp.c +5
-4@@ -139,7 +139,7 @@ static void sigp_stop_and_store_status(CPUState *cs, run_on_cpu_data arg)case S390_CPU_STATE_OPERATING : cpu->env.sigp_order =SIGP_STOP_STORE_STATUS ;cpu_inject_stop (cpu); -/* store will be performed in do_stop_interrup() */ +/* store will be performed in do_stop_interrupt() */ break ;case S390_CPU_STATE_STOPPED :/* already stopped, just store the status */ @@ -479,13 +479,17 @@ void do_stop_interrupt(CPUS390XState *env) {S390CPU *cpu =env_archcpu (env); -if (s390_cpu_set_state (S390_CPU_STATE_STOPPED , cpu) ==0 ) { -qemu_system_shutdown_request (SHUTDOWN_CAUSE_GUEST_SHUTDOWN ); - } +/* +* Complete the STOP operation before exposing the CPU as +* STOPPED to the system. +*/ if (cpu->env.sigp_order ==SIGP_STOP_STORE_STATUS ) {s390_store_status (cpu,S390_STORE_STATUS_DEF_ADDR , true); } env->sigp_order =0 ;
Quoted 9 lines
target/s390x/sigp.c void do_stop_interrupt(CPUS390XState *env) · line 495
Quoted 6 lines
target/s390x/sigp.c +3
-0+if (s390_cpu_set_state (S390_CPU_STATE_STOPPED , cpu) ==0 ) { +qemu_system_shutdown_request (SHUTDOWN_CAUSE_GUEST_SHUTDOWN ); + } env->pending_int &= ~INTERRUPT_STOP ; }Reviewed-by David Hildenbrand <[email protected]>
Thanks, queued to my s390x-next branch now:
https://gitlab.com/thuth/qemu/-/commits/s390x-next/
Thomas