s390x: Reset cleanup
PATCH 4/4 s390x: Beautify machine reset
In reply to Janosch Frank* Add comments that tell you which diag308 subcode caused the reset
* Sort by diag308 reset subcode
--- hw/s390x/s390-virtio-ccw.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)
hw/s390x/s390-virtio-ccw.c +10 -10
@@ -330,15 +330,7 @@ static void s390_machine_reset(MachineState *machine)s390_cmma_reset ();switch (reset_type) { -case S390_RESET_EXTERNAL : -case S390_RESET_REIPL : -qemu_devices_reset (); -s390_crypto_reset (); - -/* configure and start the ipl CPU only */ -run_on_cpu (cs, s390_do_cpu_ipl,RUN_ON_CPU_NULL ); -break ; -case S390_RESET_MODIFIED_CLEAR : +case S390_RESET_MODIFIED_CLEAR :/* Subcode 0 */ CPU_FOREACH(t) {run_on_cpu (t, s390_do_cpu_full_reset,RUN_ON_CPU_NULL ); }
@@ -346,7 +338,7 @@ static void s390_machine_reset(MachineState *machine)s390_crypto_reset ();run_on_cpu (cs, s390_do_cpu_load_normal,RUN_ON_CPU_NULL );break ; -case S390_RESET_LOAD_NORMAL : +case S390_RESET_LOAD_NORMAL :/* Subcode 1 */ CPU_FOREACH(t) {if (t == cs) {continue ;
@@ -357,6 +349,14 @@ static void s390_machine_reset(MachineState *machine)run_on_cpu (cs, s390_do_cpu_initial_reset,RUN_ON_CPU_NULL );run_on_cpu (cs, s390_do_cpu_load_normal,RUN_ON_CPU_NULL );break ; +case S390_RESET_EXTERNAL :/* Externally triggered reboot */ +case S390_RESET_REIPL :/* Subcode 4 */ +qemu_devices_reset (); +s390_crypto_reset (); + +/* configure and start the ipl CPU only */ +run_on_cpu (cs, s390_do_cpu_ipl,RUN_ON_CPU_NULL ); +break ;default :g_assert_not_reached (); }
Signature · 1 line
2.20.1
PATCH 1/4 s390x: Don't do a normal reset on the initial cpu
In reply to Janosch FrankThe initiating cpu needs to be reset with an initial reset. While doing a normal reset followed by a initial reset is not wron per-se, the Ultravisor will only allow the correct reset to be performed.
--- hw/s390x/s390-virtio-ccw.c | 3 +++ 1 file changed, 3 insertions(+)
hw/s390x/s390-virtio-ccw.c +3 -0
@@ -348,6 +348,9 @@ static void s390_machine_reset(MachineState *machine)break ;case S390_RESET_LOAD_NORMAL : CPU_FOREACH(t) { +if (t == cs) { +continue ; + }run_on_cpu (t, s390_do_cpu_reset,RUN_ON_CPU_NULL ); }subsystem_reset ();
Signature · 1 line
2.20.1
PATCH 2/4 s390x: Cleanup cpu resets
In reply to Janosch FrankLet's move the resets into one function and switch by type, so we can use fallthroughs for shared reset actions.
--- target/s390x/cpu.c | 110 ++++++++++++++++++++------------------------- 1 file changed, 48 insertions(+), 62 deletions(-)
target/s390x/cpu.c +48 -62
@@ -82,67 +82,52 @@ static void s390_cpu_load_normal(CPUState *s) }#endif -/* S390CPUClass::cpu_reset() */ -static void s390_cpu_reset (CPUState *s) +typedef enum cpu_reset_type { +S390_CPU_RESET_NORMAL , +S390_CPU_RESET_INITIAL , +S390_CPU_RESET_CLEAR , +}cpu_reset_type ; + +static void s390_cpu_reset (CPUState *s,cpu_reset_type type) {S390CPU *cpu =S390_CPU (s);S390CPUClass *scc =S390_CPU_GET_CLASS (cpu);CPUS390XState *env = &cpu->env; - env->pfault_token =-1UL ; - env->bpbc = false; scc->parent_reset (s); cpu->env.sigp_order =0 ;s390_cpu_set_state (S390_CPU_STATE_STOPPED , cpu); -} -/* S390CPUClass::initial_reset() */ -static void s390_cpu_initial_reset (CPUState *s) -{ -S390CPU *cpu =S390_CPU (s); -CPUS390XState *env = &cpu->env; +/* Set initial values after clearing */ +switch (type) { +case S390_CPU_RESET_CLEAR : +memset (env,0 , offsetof(CPUS390XState , start_initial_reset_fields)); +/* Fallthrough */ +case S390_CPU_RESET_INITIAL : +memset (&env->start_initial_reset_fields,0 , + offsetof(CPUS390XState , end_reset_fields) - + offsetof(CPUS390XState , start_initial_reset_fields)); +/* architectured initial values for CR 0 and 14 */ + env->cregs[0 ] =CR0_RESET ; + env->cregs[14 ] =CR14_RESET ; -s390_cpu_reset (s); -/* initial reset does not clear everything! */ -memset (&env->start_initial_reset_fields,0 , - offsetof(CPUS390XState , end_reset_fields) - - offsetof(CPUS390XState , start_initial_reset_fields)); - -/* architectured initial values for CR 0 and 14 */ - env->cregs[0 ] =CR0_RESET ; - env->cregs[14 ] =CR14_RESET ; - -/* architectured initial value for Breaking-Event-Address register */ - env->gbea =1 ; - - env->pfault_token =-1UL ; - -/* tininess for underflow is detected before rounding */ -set_float_detect_tininess (float_tininess_before_rounding, - &env->fpu_status); +/* architectured initial value for Breaking-Event-Address register */ + env->gbea =1 ; +/* tininess for underflow is detected before rounding */ +set_float_detect_tininess (float_tininess_before_rounding, + &env->fpu_status); +/* Fallthrough */ +case S390_CPU_RESET_NORMAL : + env->pfault_token =-1UL ; + env->bpbc = false; +break ; + }/* Reset state inside the kernel that we cannot access yet from QEMU. */ -if (kvm_enabled ()) { -kvm_s390_reset_vcpu (cpu); +if (kvm_enabled () && (type ==S390_CPU_RESET_CLEAR || + type ==S390_CPU_RESET_INITIAL )) { +kvm_s390_reset_vcpu (cpu); } -} - -/* CPUClass:reset() */ -static void s390_cpu_full_reset (CPUState *s) -{ -S390CPU *cpu =S390_CPU (s); -S390CPUClass *scc =S390_CPU_GET_CLASS (cpu); -CPUS390XState *env = &cpu->env; - - scc->parent_reset (s); - cpu->env.sigp_order =0 ; -s390_cpu_set_state (S390_CPU_STATE_STOPPED , cpu); - -memset (env,0 , offsetof(CPUS390XState , end_reset_fields)); - -/* architectured initial values for CR 0 and 14 */ - env->cregs[0 ] =CR0_RESET ; - env->cregs[14 ] =CR14_RESET ;#if defined(CONFIG_USER_ONLY )/* user mode should always be allowed to use the full FPU */
@@ -151,20 +136,21 @@ static void s390_cpu_full_reset(CPUState *s) env->cregs[0] |= CR0_VECTOR; }#endif +} -/* architectured initial value for Breaking-Event-Address register */ - env->gbea =1 ; +static void s390_cpu_reset_normal (CPUState *s) +{ +return s390_cpu_reset (s,S390_CPU_RESET_NORMAL ); +} - env->pfault_token =-1UL ; +static void s390_cpu_reset_initial (CPUState *s) +{ +return s390_cpu_reset (s,S390_CPU_RESET_INITIAL ); +} -/* tininess for underflow is detected before rounding */ -set_float_detect_tininess (float_tininess_before_rounding, - &env->fpu_status); - -/* Reset state inside the kernel that we cannot access yet from QEMU. */ -if (kvm_enabled ()) { -kvm_s390_reset_vcpu (cpu); - } +static void s390_cpu_reset_clear (CPUState *s) +{ +return s390_cpu_reset (s,S390_CPU_RESET_CLEAR ); }#if !defined(CONFIG_USER_ONLY )
@@ -473,9 +459,9 @@ static void s390_cpu_class_init(ObjectClass *oc, void *data)#if !defined(CONFIG_USER_ONLY ) scc->load_normal = s390_cpu_load_normal;#endif - scc->cpu_reset = s390_cpu_reset; - scc->initial_cpu_reset = s390_cpu_initial_reset; - cc->reset = s390_cpu_full_reset; + scc->cpu_reset = s390_cpu_reset_normal; + scc->initial_cpu_reset = s390_cpu_reset_initial; + cc->reset = s390_cpu_reset_clear; cc->class_by_name = s390_cpu_class_by_name, cc->has_work = s390_cpu_has_work;#ifdef CONFIG_TCG
Signature · 1 line
2.20.1
cover s390x: Reset cleanup
Adding comments and reordering code for better readability in the diag308 and machine reset functions.
Janosch Frank (4):
s390x: Don't do a normal reset on the initial cpu
s390x: Cleanup cpu resets
s390x: Beautify diag308 handling
s390x: Beautify machine reset
hw/s390x/s390-virtio-ccw.c | 23 ++++---- target/s390x/cpu.c | 110 ++++++++++++++++--------------------- target/s390x/diag.c | 54 ++++++++++-------- 3 files changed, 93 insertions(+), 94 deletions(-)
Signature · 1 line
2.20.1
PATCH 3/4 s390x: Beautify diag308 handling
Let's improve readability by:
* Using constants for the subcodes
* Moving parameter checking into a function
* Removing subcode > 6 check as the default case catches that
--- target/s390x/diag.c | 54 +++++++++++++++++++++++++++------------------ 1 file changed, 32 insertions(+), 22 deletions(-)
target/s390x/diag.c +32 -22
@@ -53,6 +53,29 @@ int handle_diag_288(CPUS390XState *env, uint64_t r1, uint64_t r3)#define DIAG_308_RC_NO_CONF 0x0102#define DIAG_308_RC_INVALID 0x0402 +#define DIAG308_RESET_MOD_CLR 0 +#define DIAG308_RESET_LOAD_NORM 1 +#define DIAG308_LOAD_CLEAR 3 +#define DIAG308_LOAD_NORMAL_DUMP 4 +#define DIAG308_SET 5 +#define DIAG308_STORE 6 + +static int diag308_parm_check (CPUS390XState *env,uint64_t r1,uint64_t addr, +uintptr_t ra,bool write) +{ +if ((r1 &1 ) || (addr & ~TARGET_PAGE_MASK )) { +s390_program_interrupt (env,PGM_SPECIFICATION , ra); +return -1 ; + } +if (!address_space_access_valid (&address_space_memory, addr, +sizeof (IplParameterBlock), write, +MEMTXATTRS_UNSPECIFIED )) { +s390_program_interrupt (env,PGM_ADDRESSING , ra); +return -1 ; + } +return 0 ; +} +void handle_diag_308 (CPUS390XState *env,uint64_t r1,uint64_t r3,uintptr_t ra) {CPUState *cs =env_cpu (env);
@@ -65,30 +88,24 @@ void handle_diag_308(CPUS390XState *env, uint64_t r1, uint64_t r3, uintptr_t ra)return ; } -if ((subcode & ~0x0ffffULL ) || (subcode >6 )) { +if (subcode & ~0x0ffffULL ) {s390_program_interrupt (env,PGM_SPECIFICATION , ra);return ; }switch (subcode) { -case 0 : +case DIAG308_RESET_MOD_CLR :s390_ipl_reset_request (cs,S390_RESET_MODIFIED_CLEAR );break ; -case 1 : +case DIAG308_RESET_LOAD_NORM :s390_ipl_reset_request (cs,S390_RESET_LOAD_NORMAL );break ; -case 3 : +case DIAG308_LOAD_CLEAR : +/* Well we still lack the clearing bit... */ s390_ipl_reset_request (cs,S390_RESET_REIPL );break ; -case 5 : -if ((r1 &1 ) || (addr &0x0fffULL )) { -s390_program_interrupt (env,PGM_SPECIFICATION , ra); -return ; - } -if (!address_space_access_valid (&address_space_memory, addr, -sizeof (IplParameterBlock), false, -MEMTXATTRS_UNSPECIFIED )) { -s390_program_interrupt (env,PGM_ADDRESSING , ra); +case DIAG308_SET : +if (diag308_parm_check (env, r1, addr, ra, false)) {return ; } iplb =g_new0 (IplParameterBlock,1 );
@@ -110,15 +127,8 @@ void handle_diag_308(CPUS390XState *env, uint64_t r1, uint64_t r3, uintptr_t ra) out:g_free (iplb);return ; -case 6 : -if ((r1 &1 ) || (addr &0x0fffULL )) { -s390_program_interrupt (env,PGM_SPECIFICATION , ra); -return ; - } -if (!address_space_access_valid (&address_space_memory, addr, -sizeof (IplParameterBlock), true, -MEMTXATTRS_UNSPECIFIED )) { -s390_program_interrupt (env,PGM_ADDRESSING , ra); +case DIAG308_STORE : +if (diag308_parm_check (env, r1, addr, ra, true)) {return ; } iplb =s390_ipl_get_iplb ();
Signature · 1 line
2.20.1
Patchew URL: https://patchew.org/QEMU/[email protected]/
Patchew URL: https://patchew.org/QEMU/[email protected]/
Hi,
This series seems to have some coding style problems. See output below for more information:
Subject: [PATCH 0/4] s390x: Reset cleanup
Type: series
Message-id: [email protected]
=== TEST SCRIPT BEGIN ===
#!/bin/bash
git rev-parse base > /dev/null || exit 0
git config --local diff.renamelimit 0
git config --local diff.renames True
git config --local diff.algorithm histogram./scripts/checkpatch.pl --mailback base..
=== TEST SCRIPT END ===
Updating 3c8cf5a9c21ff8782164d1def7f44bd888713384 Switched to a new branch 'test'
b557dea s390x: Beautify machine reset
e5244c7 s390x: Beautify diag308 handling
288f436 s390x: Cleanup cpu resets
9f85af6 s390x: Don't do a normal reset on the initial cpu
=== OUTPUT BEGIN ===
1/4 Checking commit 9f85af68844a (s390x: Don't do a normal reset on the initial cpu) 2/4 Checking commit 288f436dc8e9 (s390x: Cleanup cpu resets)
3/4 Checking commit e5244c7edde8 (s390x: Beautify diag308 handling)
ERROR: code indent should never use tabs
#25: FILE: target/s390x/diag.c:56:
+#define DIAG308_RESET_MOD_CLR^I^I0$
ERROR: code indent should never use tabs
#26: FILE: target/s390x/diag.c:57:
+#define DIAG308_RESET_LOAD_NORM^I^I1$
ERROR: code indent should never use tabs
#27: FILE: target/s390x/diag.c:58:
+#define DIAG308_LOAD_CLEAR^I^I3$
ERROR: code indent should never use tabs
#28: FILE: target/s390x/diag.c:59:
+#define DIAG308_LOAD_NORMAL_DUMP^I4$
ERROR: code indent should never use tabs
#29: FILE: target/s390x/diag.c:60:
+#define DIAG308_SET^I^I^I5$
ERROR: code indent should never use tabs
#30: FILE: target/s390x/diag.c:61:
+#define DIAG308_STORE^I^I^I6$
total: 6 errors, 0 warnings, 83 lines checked
Patch 3/4 has style problems, please review. If any of these errors are false positives report them to the maintainer, see CHECKPATCH in MAINTAINERS.
4/4 Checking commit b557dea18bc1 (s390x: Beautify machine reset) === OUTPUT END ===
Test command exited with code: 1
The full log is available at
http://patchew.org/logs/[email protected]/testing.checkpatch/?type=message.
---
Email generated automatically by Patchew [https://patchew.org/].
Please send your feedback to [email protected]
Re: [PATCH 2/4] s390x: Cleanup cpu resets
In reply to Janosch FrankHi Janosh,
Quoted 150 lines · Janosch Frank
Let's move the resets into one function and switch by type, so we can use fallthroughs for shared reset actions.
Signed-off-by Janosch Frank <[email protected]>--- target/s390x/cpu.c | 110 ++++++++++++++++++++------------------------- 1 file changed, 48 insertions(+), 62 deletions(-)target/s390x/cpu.c +45
-59@@ -82,67 +82,52 @@ static void s390_cpu_load_normal(CPUState *s) }#endif -/* S390CPUClass::cpu_reset() */ -static void s390_cpu_reset (CPUState *s) +typedef enum cpu_reset_type { +S390_CPU_RESET_NORMAL , +S390_CPU_RESET_INITIAL , +S390_CPU_RESET_CLEAR , +}cpu_reset_type ; + +static void s390_cpu_reset (CPUState *s,cpu_reset_type type) {S390CPU *cpu =S390_CPU (s);S390CPUClass *scc =S390_CPU_GET_CLASS (cpu);CPUS390XState *env = &cpu->env; - env->pfault_token =-1UL ; - env->bpbc = false; scc->parent_reset (s); cpu->env.sigp_order =0 ;s390_cpu_set_state (S390_CPU_STATE_STOPPED , cpu); -} -/* S390CPUClass::initial_reset() */ -static void s390_cpu_initial_reset (CPUState *s) -{ -S390CPU *cpu =S390_CPU (s); -CPUS390XState *env = &cpu->env; +/* Set initial values after clearing */ +switch (type) { +case S390_CPU_RESET_CLEAR : +memset (env,0 , offsetof(CPUS390XState , start_initial_reset_fields)); +/* Fallthrough */ +case S390_CPU_RESET_INITIAL : +memset (&env->start_initial_reset_fields,0 , + offsetof(CPUS390XState , end_reset_fields) - + offsetof(CPUS390XState , start_initial_reset_fields)); +/* architectured initial values for CR 0 and 14 */ + env->cregs[0 ] =CR0_RESET ; + env->cregs[14 ] =CR14_RESET ; -s390_cpu_reset (s); -/* initial reset does not clear everything! */ -memset (&env->start_initial_reset_fields,0 , - offsetof(CPUS390XState , end_reset_fields) - - offsetof(CPUS390XState , start_initial_reset_fields)); - -/* architectured initial values for CR 0 and 14 */ - env->cregs[0 ] =CR0_RESET ; - env->cregs[14 ] =CR14_RESET ; - -/* architectured initial value for Breaking-Event-Address register */ - env->gbea =1 ; - - env->pfault_token =-1UL ; - -/* tininess for underflow is detected before rounding */ -set_float_detect_tininess (float_tininess_before_rounding, - &env->fpu_status); +/* architectured initial value for Breaking-Event-Address register */ + env->gbea =1 ; +/* tininess for underflow is detected before rounding */ +set_float_detect_tininess (float_tininess_before_rounding, + &env->fpu_status); +/* Fallthrough */ +case S390_CPU_RESET_NORMAL : + env->pfault_token =-1UL ; + env->bpbc = false; +break ; + }/* Reset state inside the kernel that we cannot access yet from QEMU. */ -if (kvm_enabled ()) { -kvm_s390_reset_vcpu (cpu); +if (kvm_enabled () && (type ==S390_CPU_RESET_CLEAR || + type ==S390_CPU_RESET_INITIAL )) { +kvm_s390_reset_vcpu (cpu); } -} - -/* CPUClass:reset() */ -static void s390_cpu_full_reset (CPUState *s) -{ -S390CPU *cpu =S390_CPU (s); -S390CPUClass *scc =S390_CPU_GET_CLASS (cpu); -CPUS390XState *env = &cpu->env; - - scc->parent_reset (s); - cpu->env.sigp_order =0 ; -s390_cpu_set_state (S390_CPU_STATE_STOPPED , cpu); - -memset (env,0 , offsetof(CPUS390XState , end_reset_fields)); - -/* architectured initial values for CR 0 and 14 */ - env->cregs[0 ] =CR0_RESET ; - env->cregs[14 ] =CR14_RESET ;#if defined(CONFIG_USER_ONLY )/* user mode should always be allowed to use the full FPU */ @@ -151,20 +136,21 @@ static void s390_cpu_full_reset(CPUState *s) env->cregs[0] |= CR0_VECTOR; }#endif +} -/* architectured initial value for Breaking-Event-Address register */ - env->gbea =1 ; +static void s390_cpu_reset_normal (CPUState *s) +{ +return s390_cpu_reset (s,S390_CPU_RESET_NORMAL ); +} - env->pfault_token =-1UL ; +static void s390_cpu_reset_initial (CPUState *s) +{ +return s390_cpu_reset (s,S390_CPU_RESET_INITIAL ); +} -/* tininess for underflow is detected before rounding */ -set_float_detect_tininess (float_tininess_before_rounding, - &env->fpu_status); - -/* Reset state inside the kernel that we cannot access yet from QEMU. */ -if (kvm_enabled ()) { -kvm_s390_reset_vcpu (cpu); - } +static void s390_cpu_reset_clear (CPUState *s) +{ +return s390_cpu_reset (s,S390_CPU_RESET_CLEAR ); }#if !defined(CONFIG_USER_ONLY )@@ -473,9 +459,9 @@ static void s390_cpu_class_init(ObjectClass *oc, void *data)#if !defined(CONFIG_USER_ONLY ) scc->load_normal = s390_cpu_load_normal;
target/s390x/cpu.c static void s390_cpu_class_init(ObjectClass *oc, void *data) · line 467
Quoted 10 lines
target/s390x/cpu.c +3
-3#endif - scc->cpu_reset = s390_cpu_reset; - scc->initial_cpu_reset = s390_cpu_initial_reset; - cc->reset = s390_cpu_full_reset; + scc->cpu_reset = s390_cpu_reset_normal; + scc->initial_cpu_reset = s390_cpu_reset_initial; + cc->reset = s390_cpu_reset_clear; cc->class_by_name = s390_cpu_class_by_name, cc->has_work = s390_cpu_has_work;#ifdef CONFIG_TCG
This is a nice cleanup, but the patch is hard to digest. Maybe you can split it in 3, one patch for each cpu_reset_type.
Regards,
Phil.
Re: [PATCH 1/4] s390x: Don't do a normal reset on the initial cpu
In reply to Janosch FrankQuoted 15 lines · Janosch Frank
The initiating cpu needs to be reset with an initial reset. While doing a normal reset followed by a initial reset is not wron per-se, the Ultravisor will only allow the correct reset to be performed.
Signed-off-by Janosch Frank <[email protected]>--- hw/s390x/s390-virtio-ccw.c | 3 +++ 1 file changed, 3 insertions(+)hw/s390x/s390-virtio-ccw.c +0
-0
hw/s390x/s390-virtio-ccw.c static void s390_machine_reset(MachineState *machine) · line 356
Quoted 9 lines
hw/s390x/s390-virtio-ccw.c +3
-0@@ -348,6 +348,9 @@ static void s390_machine_reset(MachineState *machine)break ;case S390_RESET_LOAD_NORMAL : CPU_FOREACH(t) { +if (t == cs) { +continue ; + }run_on_cpu (t, s390_do_cpu_reset,RUN_ON_CPU_NULL ); }subsystem_reset ();
Right, AFAIKS, s390_cpu_initial_reset() does a s390_cpu_reset() right no, so nothing should change.
Signature · 3 lines
Thanks, David / dhildenb
Re: [PATCH 3/4] s390x: Beautify diag308 handling
In reply to Janosch FrankQuoted 93 lines · Janosch Frank
Let's improve readability by:
* Using constants for the subcodes
* Moving parameter checking into a function
* Removing subcode > 6 check as the default case catches thatSigned-off-by Janosch Frank <[email protected]>Reviewed-by Cornelia Huck <[email protected]>Reviewed-by Thomas Huth <[email protected]>--- target/s390x/diag.c | 54 +++++++++++++++++++++++++++------------------ 1 file changed, 32 insertions(+), 22 deletions(-)target/s390x/diag.c +30
-17@@ -53,6 +53,29 @@ int handle_diag_288(CPUS390XState *env, uint64_t r1, uint64_t r3)#define DIAG_308_RC_NO_CONF 0x0102#define DIAG_308_RC_INVALID 0x0402 +#define DIAG308_RESET_MOD_CLR 0 +#define DIAG308_RESET_LOAD_NORM 1 +#define DIAG308_LOAD_CLEAR 3 +#define DIAG308_LOAD_NORMAL_DUMP 4 +#define DIAG308_SET 5 +#define DIAG308_STORE 6 + +static int diag308_parm_check (CPUS390XState *env,uint64_t r1,uint64_t addr, +uintptr_t ra,bool write) +{ +if ((r1 &1 ) || (addr & ~TARGET_PAGE_MASK )) { +s390_program_interrupt (env,PGM_SPECIFICATION , ra); +return -1 ; + } +if (!address_space_access_valid (&address_space_memory, addr, +sizeof (IplParameterBlock), write, +MEMTXATTRS_UNSPECIFIED )) { +s390_program_interrupt (env,PGM_ADDRESSING , ra); +return -1 ; + } +return 0 ; +} +void handle_diag_308 (CPUS390XState *env,uint64_t r1,uint64_t r3,uintptr_t ra) {CPUState *cs =env_cpu (env);@@ -65,30 +88,24 @@ void handle_diag_308(CPUS390XState *env, uint64_t r1, uint64_t r3, uintptr_t ra)return ; } -if ((subcode & ~0x0ffffULL ) || (subcode >6 )) { +if (subcode & ~0x0ffffULL ) {s390_program_interrupt (env,PGM_SPECIFICATION , ra);return ; }switch (subcode) { -case 0 : +case DIAG308_RESET_MOD_CLR :s390_ipl_reset_request (cs,S390_RESET_MODIFIED_CLEAR );break ; -case 1 : +case DIAG308_RESET_LOAD_NORM :s390_ipl_reset_request (cs,S390_RESET_LOAD_NORMAL );break ; -case 3 : +case DIAG308_LOAD_CLEAR : +/* Well we still lack the clearing bit... */ s390_ipl_reset_request (cs,S390_RESET_REIPL );break ; -case 5 : -if ((r1 &1 ) || (addr &0x0fffULL )) { -s390_program_interrupt (env,PGM_SPECIFICATION , ra); -return ; - } -if (!address_space_access_valid (&address_space_memory, addr, -sizeof (IplParameterBlock), false, -MEMTXATTRS_UNSPECIFIED )) { -s390_program_interrupt (env,PGM_ADDRESSING , ra); +case DIAG308_SET : +if (diag308_parm_check (env, r1, addr, ra, false)) {return ; } iplb =g_new0 (IplParameterBlock,1 );@@ -110,15 +127,8 @@ void handle_diag_308(CPUS390XState *env, uint64_t r1, uint64_t r3, uintptr_t ra) out:g_free (iplb);return ; -case 6 : -if ((r1 &1 ) || (addr &0x0fffULL )) { -s390_program_interrupt (env,PGM_SPECIFICATION , ra); -return ;
target/s390x/diag.c void handle_diag_308(CPUS390XState *env, uint64_t r1, uint64_t r3, uintptr_t ra) · line 134
Quoted 10 lines
target/s390x/diag.c +2
-5- } -if (!address_space_access_valid (&address_space_memory, addr, -sizeof (IplParameterBlock), true, -MEMTXATTRS_UNSPECIFIED )) { -s390_program_interrupt (env,PGM_ADDRESSING , ra); +case DIAG308_STORE : +if (diag308_parm_check (env, r1, addr, ra, true)) {return ; } iplb =s390_ipl_get_iplb ();
Signature · 3 lines
Thanks, David / dhildenb
Re: [PATCH 4/4] s390x: Beautify machine reset
In reply to Janosch FrankQuoted 16 lines · Janosch Frank
* Add comments that tell you which diag308 subcode caused the reset
* Sort by diag308 reset subcodeSigned-off-by Janosch Frank <[email protected]>--- hw/s390x/s390-virtio-ccw.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)hw/s390x/s390-virtio-ccw.c +0
-0@@ -330,15 +330,7 @@ static void s390_machine_reset(MachineState *machine)s390_cmma_reset ();switch (reset_type) {
hw/s390x/s390-virtio-ccw.c static void s390_machine_reset(MachineState *machine) · line 333
Quoted 10 lines
hw/s390x/s390-virtio-ccw.c +1
-9-case S390_RESET_EXTERNAL : -case S390_RESET_REIPL : -qemu_devices_reset (); -s390_crypto_reset (); - -/* configure and start the ipl CPU only */ -run_on_cpu (cs, s390_do_cpu_ipl,RUN_ON_CPU_NULL ); -break ; -case S390_RESET_MODIFIED_CLEAR : +case S390_RESET_MODIFIED_CLEAR :/* Subcode 0 */
IMHO "Subcode X" isn't of much help here. We're out of diag handling.
I'd suggest to just document the subcodes along with the definitions, if really needed, and drop this patch, at least I don't quite see the value of moving code around here... or is the code shuffling of any value on your prot virt patches?
Signature · 3 lines
Thanks, David / dhildenb
Re: [PATCH 2/4] s390x: Cleanup cpu resets
In reply to Janosch Frank[...]
target/s390x/cpu.c static void s390_cpu_class_init(ObjectClass *oc, void *data) · line 463
Quoted 11 lines
#if !defined(CONFIG_USER_ONLY)target/s390x/cpu.c +2
-3@@ -473,9 +459,9 @@ static void s390_cpu_class_init(ObjectClass *oc, void *data)#if !defined(CONFIG_USER_ONLY ) scc->load_normal = s390_cpu_load_normal;#endif - scc->cpu_reset = s390_cpu_reset; - scc->initial_cpu_reset = s390_cpu_initial_reset; - cc->reset = s390_cpu_full_reset; + scc->cpu_reset = s390_cpu_reset_normal; + scc->initial_cpu_reset = s390_cpu_reset_initial;
What about having only one function here
scc->cpu_reset(), where you directly pass in the reset type
instead of scc->cpu_reset/scc->initial_cpu_reset?
Quoted 5 lines
target/s390x/cpu.c +1
-0+ cc->reset = s390_cpu_reset_clear; cc->class_by_name = s390_cpu_class_by_name, cc->has_work = s390_cpu_has_work;#ifdef CONFIG_TCG
Signature · 3 lines
Thanks, David / dhildenb
Re: [PATCH 4/4] s390x: Beautify machine reset
In reply to David HildenbrandQuoted 30 lines · David Hildenbrand
Quoted 16 lines · Janosch Frank
* Add comments that tell you which diag308 subcode caused the reset
* Sort by diag308 reset subcodeSigned-off-by Janosch Frank <[email protected]>--- hw/s390x/s390-virtio-ccw.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)hw/s390x/s390-virtio-ccw.c +0
-0@@ -330,15 +330,7 @@ static void s390_machine_reset(MachineState *machine)s390_cmma_reset ();switch (reset_type) {hw/s390x/s390-virtio-ccw.c static void s390_machine_reset(MachineState *machine) · line 333
Quoted 10 lines
hw/s390x/s390-virtio-ccw.c +1
-9-case S390_RESET_EXTERNAL : -case S390_RESET_REIPL : -qemu_devices_reset (); -s390_crypto_reset (); - -/* configure and start the ipl CPU only */ -run_on_cpu (cs, s390_do_cpu_ipl,RUN_ON_CPU_NULL ); -break ; -case S390_RESET_MODIFIED_CLEAR : +case S390_RESET_MODIFIED_CLEAR :/* Subcode 0 */ IMHO "Subcode X" isn't of much help here. We're out of diag handling.
Quoted 5 lines
I'd suggest to just document the subcodes along with the definitions, if really needed, and drop this patch, at least I don't quite see the value of moving code around here... or is the code shuffling of any value on your prot virt patches?
It keeps me from consulting the POP every time I need to change things in the machine resets. This is basically a 1:1 mapping of diag 308 subcodes to machine resets, so why don't we want to make that obvious and order them by the subcodes?
Re: [PATCH 4/4] s390x: Beautify machine reset
Quoted 37 lines · Janosch Frank
Quoted 30 lines · David Hildenbrand
Quoted 16 lines · Janosch Frank
* Add comments that tell you which diag308 subcode caused the reset
* Sort by diag308 reset subcodeSigned-off-by Janosch Frank <[email protected]>--- hw/s390x/s390-virtio-ccw.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)hw/s390x/s390-virtio-ccw.c +0
-0@@ -330,15 +330,7 @@ static void s390_machine_reset(MachineState *machine)s390_cmma_reset ();switch (reset_type) {hw/s390x/s390-virtio-ccw.c static void s390_machine_reset(MachineState *machine) · line 333
Quoted 10 lines
hw/s390x/s390-virtio-ccw.c +1
-9-case S390_RESET_EXTERNAL : -case S390_RESET_REIPL : -qemu_devices_reset (); -s390_crypto_reset (); - -/* configure and start the ipl CPU only */ -run_on_cpu (cs, s390_do_cpu_ipl,RUN_ON_CPU_NULL ); -break ; -case S390_RESET_MODIFIED_CLEAR : +case S390_RESET_MODIFIED_CLEAR :/* Subcode 0 */ IMHO "Subcode X" isn't of much help here. We're out of diag handling.
Quoted 5 lines
I'd suggest to just document the subcodes along with the definitions, if really needed, and drop this patch, at least I don't quite see the value of moving code around here... or is the code shuffling of any value on your prot virt patches?
Quoted 5 lines
It keeps me from consulting the POP every time I need to change things in the machine resets. This is basically a 1:1 mapping of diag 308 subcodes to machine resets, so why don't we want to make that obvious and order them by the subcodes?
Because it is not a 1:1 mapping: S390_RESET_EXTERNAL
Signature · 3 lines
Thanks, David / dhildenb
Re: [PATCH 4/4] s390x: Beautify machine reset
Quoted 38 lines · On Fri, 22 Nov 2019 12:47:44 +0100 David Hildenbrand <[email protected]> wrote:
Quoted 37 lines · Janosch Frank
Quoted 35 lines · David Hildenbrand
Quoted 16 lines · Janosch Frank
* Add comments that tell you which diag308 subcode caused the reset
* Sort by diag308 reset subcodeSigned-off-by Janosch Frank <[email protected]>--- hw/s390x/s390-virtio-ccw.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)hw/s390x/s390-virtio-ccw.c +0
-0@@ -330,15 +330,7 @@ static void s390_machine_reset(MachineState *machine)s390_cmma_reset ();switch (reset_type) {hw/s390x/s390-virtio-ccw.c static void s390_machine_reset(MachineState *machine) · line 333
Quoted 10 lines
hw/s390x/s390-virtio-ccw.c +1
-9-case S390_RESET_EXTERNAL : -case S390_RESET_REIPL : -qemu_devices_reset (); -s390_crypto_reset (); - -/* configure and start the ipl CPU only */ -run_on_cpu (cs, s390_do_cpu_ipl,RUN_ON_CPU_NULL ); -break ; -case S390_RESET_MODIFIED_CLEAR : +case S390_RESET_MODIFIED_CLEAR :/* Subcode 0 */ IMHO "Subcode X" isn't of much help here. We're out of diag handling.
I'd suggest to just document the subcodes along with the definitions, if really needed, and drop this patch, at least I don't quite see the value of moving code around here... or is the code shuffling of any value on your prot virt patches?
Quoted 8 lines
Quoted 5 lines
It keeps me from consulting the POP every time I need to change things in the machine resets. This is basically a 1:1 mapping of diag 308 subcodes to machine resets, so why don't we want to make that obvious and order them by the subcodes?
Because it is not a 1:1 mapping:
S390_RESET_EXTERNAL
Tack the explanation onto the definitions of S390_RESET_, then? Probably still quicker than consulting the POP :)
PATCH 1/1 Remove wrappers
In reply to David HildenbrandThat's what it would look like.
--- target/s390x/cpu-qom.h | 12 ++++++++---- target/s390x/cpu.c | 28 +++++----------------------- target/s390x/cpu.h | 8 +++++--- target/s390x/sigp.c | 4 ++-- 4 files changed, 20 insertions(+), 32 deletions(-)
target/s390x/cpu-qom.h +8 -4
@@ -34,13 +34,18 @@typedef struct S390CPUModel S390CPUModel ;typedef struct S390CPUDef S390CPUDef ; +typedef enum cpu_reset_type { +S390_CPU_RESET_NORMAL , +S390_CPU_RESET_INITIAL , +S390_CPU_RESET_CLEAR , +}cpu_reset_type ; +/** * S390CPUClass: * @parent_realize: The parent class' realize handler. * @parent_reset: The parent class' reset handler. * @load_normal: Performs a load normal. -* @cpu_reset: Performs a CPU reset. -* @initial_cpu_reset: Performs an initial CPU reset. +* @reset: Performs a CPU reset of a given type. * * An S/390 CPU model. */
@@ -57,8 +62,7 @@ typedef struct S390CPUClass {DeviceRealize parent_realize;void (*parent_reset)(CPUState *cpu);void (*load_normal)(CPUState *cpu); -void (*cpu_reset)(CPUState *cpu); -void (*initial_cpu_reset)(CPUState *cpu); +void (*reset)(CPUState *cpu,cpu_reset_type type); } S390CPUClass;typedef struct S390CPU S390CPU ;
target/s390x/cpu.c +5 -23
@@ -82,12 +82,6 @@ static void s390_cpu_load_normal(CPUState *s) }#endif -typedef enum cpu_reset_type { -S390_CPU_RESET_NORMAL , -S390_CPU_RESET_INITIAL , -S390_CPU_RESET_CLEAR , -}cpu_reset_type ; -static void s390_cpu_reset (CPUState *s,cpu_reset_type type) {S390CPU *cpu =S390_CPU (s);
@@ -138,21 +132,6 @@ static void s390_cpu_reset(CPUState *s, cpu_reset_type type)#endif } -static void s390_cpu_reset_normal (CPUState *s) -{ -return s390_cpu_reset (s,S390_CPU_RESET_NORMAL ); -} - -static void s390_cpu_reset_initial (CPUState *s) -{ -return s390_cpu_reset (s,S390_CPU_RESET_INITIAL ); -} - -static void s390_cpu_reset_clear (CPUState *s) -{ -return s390_cpu_reset (s,S390_CPU_RESET_CLEAR ); -} -#if !defined(CONFIG_USER_ONLY )static void s390_cpu_machine_reset_cb (void *opaque) {
@@ -444,6 +423,11 @@ static Property s390x_cpu_properties[] = { DEFINE_PROP_END_OF_LIST() }; +static void s390_cpu_reset_clear (CPUState *s) +{ +return s390_cpu_reset (s,S390_CPU_RESET_CLEAR ); +} +static void s390_cpu_class_init (ObjectClass *oc,void *data) {S390CPUClass *scc =S390_CPU_CLASS (oc);
@@ -459,8 +443,6 @@ static void s390_cpu_class_init(ObjectClass *oc, void *data)#if !defined(CONFIG_USER_ONLY ) scc->load_normal = s390_cpu_load_normal;#endif - scc->cpu_reset = s390_cpu_reset_normal; - scc->initial_cpu_reset = s390_cpu_reset_initial; cc->reset = s390_cpu_reset_clear; cc->class_by_name = s390_cpu_class_by_name, cc->has_work = s390_cpu_has_work;
target/s390x/cpu.h +5 -3
@@ -734,21 +734,23 @@ static inline uint64_t s390_build_validity_mcic(void)static inline void s390_do_cpu_full_reset (CPUState *cs,run_on_cpu_data arg) { -cpu_reset (cs); +S390CPUClass *scc =S390_CPU_GET_CLASS (cs); + + scc->reset (cs,S390_CPU_RESET_CLEAR ); }static inline void s390_do_cpu_reset (CPUState *cs,run_on_cpu_data arg) {S390CPUClass *scc =S390_CPU_GET_CLASS (cs); - scc->cpu_reset (cs); + scc->reset (cs,S390_CPU_RESET_CLEAR ); }static inline void s390_do_cpu_initial_reset (CPUState *cs,run_on_cpu_data arg) {S390CPUClass *scc =S390_CPU_GET_CLASS (cs); - scc->initial_cpu_reset (cs); + scc->reset (cs,S390_CPU_RESET_INITIAL ); }static inline void s390_do_cpu_load_normal (CPUState *cs,run_on_cpu_data arg)
target/s390x/sigp.c +2 -2
@@ -254,7 +254,7 @@ static void sigp_initial_cpu_reset(CPUState *cs, run_on_cpu_data arg)SigpInfo *si = arg.host_ptr;cpu_synchronize_state (cs); - scc->initial_cpu_reset (cs); + scc->reset (cs,S390_CPU_RESET_INITIAL );cpu_synchronize_post_reset (cs); si->cc =SIGP_CC_ORDER_CODE_ACCEPTED ; }
@@ -266,7 +266,7 @@ static void sigp_cpu_reset(CPUState *cs, run_on_cpu_data arg)SigpInfo *si = arg.host_ptr;cpu_synchronize_state (cs); - scc->cpu_reset (cs); + scc->reset (cs,S390_CPU_RESET_NORMAL );cpu_synchronize_post_reset (cs); si->cc =SIGP_CC_ORDER_CODE_ACCEPTED ; }
Signature · 1 line
2.20.1
Re: [PATCH 4/4] s390x: Beautify machine reset
In reply to Cornelia HuckQuoted 47 lines · Cornelia Huck
Quoted 44 lines · On Fri, 22 Nov 2019 12:47:44 +0100 David Hildenbrand <[email protected]> wrote:
Quoted 42 lines · Janosch Frank
Quoted 30 lines · David Hildenbrand
Quoted 16 lines · Janosch Frank
* Add comments that tell you which diag308 subcode caused the reset
* Sort by diag308 reset subcodeSigned-off-by Janosch Frank <[email protected]>--- hw/s390x/s390-virtio-ccw.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)hw/s390x/s390-virtio-ccw.c +0
-0@@ -330,15 +330,7 @@ static void s390_machine_reset(MachineState *machine)s390_cmma_reset ();switch (reset_type) {hw/s390x/s390-virtio-ccw.c static void s390_machine_reset(MachineState *machine) · line 333
Quoted 10 lines
hw/s390x/s390-virtio-ccw.c +1
-9-case S390_RESET_EXTERNAL : -case S390_RESET_REIPL : -qemu_devices_reset (); -s390_crypto_reset (); - -/* configure and start the ipl CPU only */ -run_on_cpu (cs, s390_do_cpu_ipl,RUN_ON_CPU_NULL ); -break ; -case S390_RESET_MODIFIED_CLEAR : +case S390_RESET_MODIFIED_CLEAR :/* Subcode 0 */ IMHO "Subcode X" isn't of much help here. We're out of diag handling.
Quoted 5 lines
I'd suggest to just document the subcodes along with the definitions, if really needed, and drop this patch, at least I don't quite see the value of moving code around here... or is the code shuffling of any value on your prot virt patches?
It keeps me from consulting the POP every time I need to change things in the machine resets. This is basically a 1:1 mapping of diag 308 subcodes to machine resets, so why don't we want to make that obvious and order them by the subcodes?
Quoted 6 lines
Quoted 2 lines
Because it is not a 1:1 mapping:
S390_RESET_EXTERNALTack the explanation onto the definitions of
S390_RESET_, then? Probably still quicker than consulting the POP :)
Does it really bother you that much, that I add some explanations to the things we're doing. The external reset also gets a comment so Conni won't need that much coffee anymore to understand the code :-)
Re: [PATCH] Remove wrappers
In reply to Janosch FrankQuoted 97 lines · Janosch Frank
That's what it would look like.
Signed-off-by Janosch Frank <[email protected]>--- target/s390x/cpu-qom.h | 12 ++++++++---- target/s390x/cpu.c | 28 +++++----------------------- target/s390x/cpu.h | 8 +++++--- target/s390x/sigp.c | 4 ++-- 4 files changed, 20 insertions(+), 32 deletions(-)target/s390x/cpu-qom.h +8
-4@@ -34,13 +34,18 @@typedef struct S390CPUModel S390CPUModel ;typedef struct S390CPUDef S390CPUDef ; +typedef enum cpu_reset_type { +S390_CPU_RESET_NORMAL , +S390_CPU_RESET_INITIAL , +S390_CPU_RESET_CLEAR , +}cpu_reset_type ; +/** * S390CPUClass: * @parent_realize: The parent class' realize handler. * @parent_reset: The parent class' reset handler. * @load_normal: Performs a load normal. -* @cpu_reset: Performs a CPU reset. -* @initial_cpu_reset: Performs an initial CPU reset. +* @reset: Performs a CPU reset of a given type. * * An S/390 CPU model. */ @@ -57,8 +62,7 @@ typedef struct S390CPUClass {DeviceRealize parent_realize;void (*parent_reset)(CPUState *cpu);void (*load_normal)(CPUState *cpu); -void (*cpu_reset)(CPUState *cpu); -void (*initial_cpu_reset)(CPUState *cpu); +void (*reset)(CPUState *cpu,cpu_reset_type type); } S390CPUClass;typedef struct S390CPU S390CPU ;target/s390x/cpu.c +5
-21@@ -82,12 +82,6 @@ static void s390_cpu_load_normal(CPUState *s) }#endif -typedef enum cpu_reset_type { -S390_CPU_RESET_NORMAL , -S390_CPU_RESET_INITIAL , -S390_CPU_RESET_CLEAR , -}cpu_reset_type ; -static void s390_cpu_reset (CPUState *s,cpu_reset_type type) {S390CPU *cpu =S390_CPU (s);@@ -138,21 +132,6 @@ static void s390_cpu_reset(CPUState *s, cpu_reset_type type)#endif } -static void s390_cpu_reset_normal (CPUState *s) -{ -return s390_cpu_reset (s,S390_CPU_RESET_NORMAL ); -} - -static void s390_cpu_reset_initial (CPUState *s) -{ -return s390_cpu_reset (s,S390_CPU_RESET_INITIAL ); -} - -static void s390_cpu_reset_clear (CPUState *s) -{ -return s390_cpu_reset (s,S390_CPU_RESET_CLEAR ); -} -#if !defined(CONFIG_USER_ONLY )static void s390_cpu_machine_reset_cb (void *opaque) {@@ -444,6 +423,11 @@ static Property s390x_cpu_properties[] = { DEFINE_PROP_END_OF_LIST() }; +static void s390_cpu_reset_clear (CPUState *s) +{ +return s390_cpu_reset (s,S390_CPU_RESET_CLEAR ); +} +static void s390_cpu_class_init (ObjectClass *oc,void *data) {S390CPUClass *scc =S390_CPU_CLASS (oc);
target/s390x/cpu.c static void s390_cpu_class_init(ObjectClass *oc, void *data) · line 463
Quoted 5 lines
target/s390x/cpu.c +0
-2@@ -459,8 +443,6 @@ static void s390_cpu_class_init(ObjectClass *oc, void *data)#if !defined(CONFIG_USER_ONLY ) scc->load_normal = s390_cpu_load_normal;#endif - scc->cpu_reset = s390_cpu_reset_normal; - scc->initial_cpu_reset = s390_cpu_reset_initial;
You have to set
scc->reset = s390_cpu_reset;
if I'm not wrong.
Quoted 49 lines
target/s390x/cpu.c +0
-0cc->reset = s390_cpu_reset_clear; cc->class_by_name = s390_cpu_class_by_name, cc->has_work = s390_cpu_has_work;target/s390x/cpu.h +5
-3@@ -734,21 +734,23 @@ static inline uint64_t s390_build_validity_mcic(void)static inline void s390_do_cpu_full_reset (CPUState *cs,run_on_cpu_data arg) { -cpu_reset (cs); +S390CPUClass *scc =S390_CPU_GET_CLASS (cs); + + scc->reset (cs,S390_CPU_RESET_CLEAR ); }static inline void s390_do_cpu_reset (CPUState *cs,run_on_cpu_data arg) {S390CPUClass *scc =S390_CPU_GET_CLASS (cs); - scc->cpu_reset (cs); + scc->reset (cs,S390_CPU_RESET_CLEAR ); }static inline void s390_do_cpu_initial_reset (CPUState *cs,run_on_cpu_data arg) {S390CPUClass *scc =S390_CPU_GET_CLASS (cs); - scc->initial_cpu_reset (cs); + scc->reset (cs,S390_CPU_RESET_INITIAL ); }static inline void s390_do_cpu_load_normal (CPUState *cs,run_on_cpu_data arg)target/s390x/sigp.c +1
-1@@ -254,7 +254,7 @@ static void sigp_initial_cpu_reset(CPUState *cs, run_on_cpu_data arg)SigpInfo *si = arg.host_ptr;cpu_synchronize_state (cs); - scc->initial_cpu_reset (cs); + scc->reset (cs,S390_CPU_RESET_INITIAL );cpu_synchronize_post_reset (cs); si->cc =SIGP_CC_ORDER_CODE_ACCEPTED ; }
target/s390x/sigp.c static void sigp_cpu_reset(CPUState *cs, run_on_cpu_data arg) · line 272
Quoted 8 lines
target/s390x/sigp.c +1
-1@@ -266,7 +266,7 @@ static void sigp_cpu_reset(CPUState *cs, run_on_cpu_data arg)SigpInfo *si = arg.host_ptr;cpu_synchronize_state (cs); - scc->cpu_reset (cs); + scc->reset (cs,S390_CPU_RESET_NORMAL );cpu_synchronize_post_reset (cs); si->cc =SIGP_CC_ORDER_CODE_ACCEPTED ; }
Looks good and much cleaner to me :)
Signature · 3 lines
Thanks, David / dhildenb
Re: [PATCH 4/4] s390x: Beautify machine reset
In reply to Janosch FrankQuoted 51 lines · Janosch Frank
Quoted 50 lines · Cornelia Huck
Quoted 46 lines · On Fri, 22 Nov 2019 12:47:44 +0100 David Hildenbrand <[email protected]> wrote:
Quoted 37 lines · Janosch Frank
Quoted 30 lines · David Hildenbrand
Quoted 16 lines · Janosch Frank
* Add comments that tell you which diag308 subcode caused the reset
* Sort by diag308 reset subcodeSigned-off-by Janosch Frank <[email protected]>--- hw/s390x/s390-virtio-ccw.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)hw/s390x/s390-virtio-ccw.c +0
-0@@ -330,15 +330,7 @@ static void s390_machine_reset(MachineState *machine)s390_cmma_reset ();switch (reset_type) {hw/s390x/s390-virtio-ccw.c static void s390_machine_reset(MachineState *machine) · line 333
Quoted 10 lines
hw/s390x/s390-virtio-ccw.c +1
-9-case S390_RESET_EXTERNAL : -case S390_RESET_REIPL : -qemu_devices_reset (); -s390_crypto_reset (); - -/* configure and start the ipl CPU only */ -run_on_cpu (cs, s390_do_cpu_ipl,RUN_ON_CPU_NULL ); -break ; -case S390_RESET_MODIFIED_CLEAR : +case S390_RESET_MODIFIED_CLEAR :/* Subcode 0 */ IMHO "Subcode X" isn't of much help here. We're out of diag handling.
Quoted 5 lines
I'd suggest to just document the subcodes along with the definitions, if really needed, and drop this patch, at least I don't quite see the value of moving code around here... or is the code shuffling of any value on your prot virt patches?
Quoted 5 lines
It keeps me from consulting the POP every time I need to change things in the machine resets. This is basically a 1:1 mapping of diag 308 subcodes to machine resets, so why don't we want to make that obvious and order them by the subcodes?
Because it is not a 1:1 mapping:
S390_RESET_EXTERNAL
Quoted 8 lines
Quoted 3 lines
Tack the explanation onto the definitions of
S390_RESET_, then? Probably still quicker than consulting the POP :)Does it really bother you that much, that I add some explanations to the things we're doing. The external reset also gets a comment so Conni won't need that much coffee anymore to understand the code :-)
I'm really sorry, but I fail to see how "Subcode 0" is *any* better than S390_RESET_MODIFIED_CLEAR (and avoids consulting the PoP) and why the order should matter at all here to make it easier to understand.
I don't NACK this, I just find it *completely* useless :)
Signature · 3 lines
Thanks, David / dhildenb
Re: [PATCH] Remove wrappers
In reply to David HildenbrandQuoted 106 lines · David Hildenbrand
Quoted 97 lines · Janosch Frank
That's what it would look like.
Signed-off-by Janosch Frank <[email protected]>--- target/s390x/cpu-qom.h | 12 ++++++++---- target/s390x/cpu.c | 28 +++++----------------------- target/s390x/cpu.h | 8 +++++--- target/s390x/sigp.c | 4 ++-- 4 files changed, 20 insertions(+), 32 deletions(-)target/s390x/cpu-qom.h +8
-4@@ -34,13 +34,18 @@typedef struct S390CPUModel S390CPUModel ;typedef struct S390CPUDef S390CPUDef ; +typedef enum cpu_reset_type { +S390_CPU_RESET_NORMAL , +S390_CPU_RESET_INITIAL , +S390_CPU_RESET_CLEAR , +}cpu_reset_type ; +/** * S390CPUClass: * @parent_realize: The parent class' realize handler. * @parent_reset: The parent class' reset handler. * @load_normal: Performs a load normal. -* @cpu_reset: Performs a CPU reset. -* @initial_cpu_reset: Performs an initial CPU reset. +* @reset: Performs a CPU reset of a given type. * * An S/390 CPU model. */ @@ -57,8 +62,7 @@ typedef struct S390CPUClass {DeviceRealize parent_realize;void (*parent_reset)(CPUState *cpu);void (*load_normal)(CPUState *cpu); -void (*cpu_reset)(CPUState *cpu); -void (*initial_cpu_reset)(CPUState *cpu); +void (*reset)(CPUState *cpu,cpu_reset_type type); } S390CPUClass;typedef struct S390CPU S390CPU ;target/s390x/cpu.c +5
-21@@ -82,12 +82,6 @@ static void s390_cpu_load_normal(CPUState *s) }#endif -typedef enum cpu_reset_type { -S390_CPU_RESET_NORMAL , -S390_CPU_RESET_INITIAL , -S390_CPU_RESET_CLEAR , -}cpu_reset_type ; -static void s390_cpu_reset (CPUState *s,cpu_reset_type type) {S390CPU *cpu =S390_CPU (s);@@ -138,21 +132,6 @@ static void s390_cpu_reset(CPUState *s, cpu_reset_type type)#endif } -static void s390_cpu_reset_normal (CPUState *s) -{ -return s390_cpu_reset (s,S390_CPU_RESET_NORMAL ); -} - -static void s390_cpu_reset_initial (CPUState *s) -{ -return s390_cpu_reset (s,S390_CPU_RESET_INITIAL ); -} - -static void s390_cpu_reset_clear (CPUState *s) -{ -return s390_cpu_reset (s,S390_CPU_RESET_CLEAR ); -} -#if !defined(CONFIG_USER_ONLY )static void s390_cpu_machine_reset_cb (void *opaque) {@@ -444,6 +423,11 @@ static Property s390x_cpu_properties[] = { DEFINE_PROP_END_OF_LIST() }; +static void s390_cpu_reset_clear (CPUState *s) +{ +return s390_cpu_reset (s,S390_CPU_RESET_CLEAR ); +} +static void s390_cpu_class_init (ObjectClass *oc,void *data) {S390CPUClass *scc =S390_CPU_CLASS (oc);target/s390x/cpu.c static void s390_cpu_class_init(ObjectClass *oc, void *data) · line 463
Quoted 5 lines
target/s390x/cpu.c +0
-2@@ -459,8 +443,6 @@ static void s390_cpu_class_init(ObjectClass *oc, void *data)#if !defined(CONFIG_USER_ONLY ) scc->load_normal = s390_cpu_load_normal;#endif - scc->cpu_reset = s390_cpu_reset_normal; - scc->initial_cpu_reset = s390_cpu_reset_initial;You have to set
Quoted 3 lines
scc->reset=s390_cpu_reset;if I'm not wrong.
Yeah, that would make sense :)
I'm also going to tripple check if we are doing the right resets.
Quoted 61 lines
Quoted 50 lines
target/s390x/cpu.c +0
-0cc->reset = s390_cpu_reset_clear; cc->class_by_name = s390_cpu_class_by_name, cc->has_work = s390_cpu_has_work;target/s390x/cpu.h +5
-3@@ -734,21 +734,23 @@ static inline uint64_t s390_build_validity_mcic(void)static inline void s390_do_cpu_full_reset (CPUState *cs,run_on_cpu_data arg) { -cpu_reset (cs); +S390CPUClass *scc =S390_CPU_GET_CLASS (cs); + + scc->reset (cs,S390_CPU_RESET_CLEAR ); }static inline void s390_do_cpu_reset (CPUState *cs,run_on_cpu_data arg) {S390CPUClass *scc =S390_CPU_GET_CLASS (cs); - scc->cpu_reset (cs); + scc->reset (cs,S390_CPU_RESET_CLEAR ); }static inline void s390_do_cpu_initial_reset (CPUState *cs,run_on_cpu_data arg) {S390CPUClass *scc =S390_CPU_GET_CLASS (cs); - scc->initial_cpu_reset (cs); + scc->reset (cs,S390_CPU_RESET_INITIAL ); }static inline void s390_do_cpu_load_normal (CPUState *cs,run_on_cpu_data arg)target/s390x/sigp.c +1
-1@@ -254,7 +254,7 @@ static void sigp_initial_cpu_reset(CPUState *cs, run_on_cpu_data arg)SigpInfo *si = arg.host_ptr;cpu_synchronize_state (cs); - scc->initial_cpu_reset (cs); + scc->reset (cs,S390_CPU_RESET_INITIAL );cpu_synchronize_post_reset (cs); si->cc =SIGP_CC_ORDER_CODE_ACCEPTED ; }target/s390x/sigp.c static void sigp_cpu_reset(CPUState *cs, run_on_cpu_data arg) · line 272
Quoted 8 lines
target/s390x/sigp.c +1
-1@@ -266,7 +266,7 @@ static void sigp_cpu_reset(CPUState *cs, run_on_cpu_data arg)SigpInfo *si = arg.host_ptr;cpu_synchronize_state (cs); - scc->cpu_reset (cs); + scc->reset (cs,S390_CPU_RESET_NORMAL );cpu_synchronize_post_reset (cs); si->cc =SIGP_CC_ORDER_CODE_ACCEPTED ; }Looks good and much cleaner to me :)
Re: [PATCH 4/4] s390x: Beautify machine reset
In reply to David HildenbrandQuoted 61 lines · David Hildenbrand
Quoted 51 lines · Janosch Frank
Quoted 50 lines · Cornelia Huck
Quoted 46 lines · On Fri, 22 Nov 2019 12:47:44 +0100 David Hildenbrand <[email protected]> wrote:
Quoted 37 lines · Janosch Frank
Quoted 30 lines · David Hildenbrand
Quoted 16 lines · Janosch Frank
* Add comments that tell you which diag308 subcode caused the reset
* Sort by diag308 reset subcodeSigned-off-by Janosch Frank <[email protected]>--- hw/s390x/s390-virtio-ccw.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)hw/s390x/s390-virtio-ccw.c +0
-0@@ -330,15 +330,7 @@ static void s390_machine_reset(MachineState *machine)s390_cmma_reset ();switch (reset_type) {hw/s390x/s390-virtio-ccw.c static void s390_machine_reset(MachineState *machine) · line 333
Quoted 10 lines
hw/s390x/s390-virtio-ccw.c +1
-9-case S390_RESET_EXTERNAL : -case S390_RESET_REIPL : -qemu_devices_reset (); -s390_crypto_reset (); - -/* configure and start the ipl CPU only */ -run_on_cpu (cs, s390_do_cpu_ipl,RUN_ON_CPU_NULL ); -break ; -case S390_RESET_MODIFIED_CLEAR : +case S390_RESET_MODIFIED_CLEAR :/* Subcode 0 */ IMHO "Subcode X" isn't of much help here. We're out of diag handling.
Quoted 5 lines
I'd suggest to just document the subcodes along with the definitions, if really needed, and drop this patch, at least I don't quite see the value of moving code around here... or is the code shuffling of any value on your prot virt patches?
Quoted 5 lines
It keeps me from consulting the POP every time I need to change things in the machine resets. This is basically a 1:1 mapping of diag 308 subcodes to machine resets, so why don't we want to make that obvious and order them by the subcodes?
Because it is not a 1:1 mapping:
S390_RESET_EXTERNALQuoted 8 lines
Quoted 3 lines
Tack the explanation onto the definitions of
S390_RESET_, then? Probably still quicker than consulting the POP :)Does it really bother you that much, that I add some explanations to the things we're doing. The external reset also gets a comment so Conni won't need that much coffee anymore to understand the code :-)
Quoted 6 lines
I'm really sorry, but I fail to see how "Subcode 0" is *any* better than
S390_RESET_MODIFIED_CLEAR(and avoids consulting the PoP) and why the order should matter at all here to make it easier to understand.I don't NACK this, I just find it *completely* useless :)
Ugh, time for some rebase conflicts...
Re: [PATCH 4/4] s390x: Beautify machine reset
In reply to Janosch FrankQuoted 39 lines · Janosch Frank
* Add comments that tell you which diag308 subcode caused the reset
* Sort by diag308 reset subcodeSigned-off-by Janosch Frank <[email protected]>--- hw/s390x/s390-virtio-ccw.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)hw/s390x/s390-virtio-ccw.c +2
-10@@ -330,15 +330,7 @@ static void s390_machine_reset(MachineState *machine)s390_cmma_reset ();switch (reset_type) { -case S390_RESET_EXTERNAL : -case S390_RESET_REIPL : -qemu_devices_reset (); -s390_crypto_reset (); - -/* configure and start the ipl CPU only */ -run_on_cpu (cs, s390_do_cpu_ipl,RUN_ON_CPU_NULL ); -break ; -case S390_RESET_MODIFIED_CLEAR : +case S390_RESET_MODIFIED_CLEAR :/* Subcode 0 */ CPU_FOREACH(t) {run_on_cpu (t, s390_do_cpu_full_reset,RUN_ON_CPU_NULL ); }@@ -346,7 +338,7 @@ static void s390_machine_reset(MachineState *machine)s390_crypto_reset ();run_on_cpu (cs, s390_do_cpu_load_normal,RUN_ON_CPU_NULL );break ; -case S390_RESET_LOAD_NORMAL : +case S390_RESET_LOAD_NORMAL :/* Subcode 1 */ CPU_FOREACH(t) {if (t == cs) {continue ;
hw/s390x/s390-virtio-ccw.c static void s390_machine_reset(MachineState *machine) · line 352
Quoted 4 lines
hw/s390x/s390-virtio-ccw.c +1
-0@@ -357,6 +349,14 @@ static void s390_machine_reset(MachineState *machine)run_on_cpu (cs, s390_do_cpu_initial_reset,RUN_ON_CPU_NULL );run_on_cpu (cs, s390_do_cpu_load_normal,RUN_ON_CPU_NULL );break ; +case S390_RESET_EXTERNAL :/* Externally triggered reboot */
BTW, if we decide to document this *somehow*, S390_RESET_EXTERNAL is also used via the diag288 watchdog.
Signature · 3 lines
Thanks, David / dhildenb
Re: [PATCH 2/4] s390x: Cleanup cpu resets
In reply to Philippe Mathieu-DaudéQuoted 167 lines · Philippe Mathieu-Daudé
Hi Janosh,
Quoted 150 lines · Janosch Frank
Let's move the resets into one function and switch by type, so we can use fallthroughs for shared reset actions.
Signed-off-by Janosch Frank <[email protected]>--- target/s390x/cpu.c | 110 ++++++++++++++++++++------------------------- 1 file changed, 48 insertions(+), 62 deletions(-)target/s390x/cpu.c +45
-59@@ -82,67 +82,52 @@ static void s390_cpu_load_normal(CPUState *s) }#endif -/* S390CPUClass::cpu_reset() */ -static void s390_cpu_reset (CPUState *s) +typedef enum cpu_reset_type { +S390_CPU_RESET_NORMAL , +S390_CPU_RESET_INITIAL , +S390_CPU_RESET_CLEAR , +}cpu_reset_type ; + +static void s390_cpu_reset (CPUState *s,cpu_reset_type type) {S390CPU *cpu =S390_CPU (s);S390CPUClass *scc =S390_CPU_GET_CLASS (cpu);CPUS390XState *env = &cpu->env; - env->pfault_token =-1UL ; - env->bpbc = false; scc->parent_reset (s); cpu->env.sigp_order =0 ;s390_cpu_set_state (S390_CPU_STATE_STOPPED , cpu); -} -/* S390CPUClass::initial_reset() */ -static void s390_cpu_initial_reset (CPUState *s) -{ -S390CPU *cpu =S390_CPU (s); -CPUS390XState *env = &cpu->env; +/* Set initial values after clearing */ +switch (type) { +case S390_CPU_RESET_CLEAR : +memset (env,0 , offsetof(CPUS390XState , start_initial_reset_fields)); +/* Fallthrough */ +case S390_CPU_RESET_INITIAL : +memset (&env->start_initial_reset_fields,0 , + offsetof(CPUS390XState , end_reset_fields) - + offsetof(CPUS390XState , start_initial_reset_fields)); +/* architectured initial values for CR 0 and 14 */ + env->cregs[0 ] =CR0_RESET ; + env->cregs[14 ] =CR14_RESET ; -s390_cpu_reset (s); -/* initial reset does not clear everything! */ -memset (&env->start_initial_reset_fields,0 , - offsetof(CPUS390XState , end_reset_fields) - - offsetof(CPUS390XState , start_initial_reset_fields)); - -/* architectured initial values for CR 0 and 14 */ - env->cregs[0 ] =CR0_RESET ; - env->cregs[14 ] =CR14_RESET ; - -/* architectured initial value for Breaking-Event-Address register */ - env->gbea =1 ; - - env->pfault_token =-1UL ; - -/* tininess for underflow is detected before rounding */ -set_float_detect_tininess (float_tininess_before_rounding, - &env->fpu_status); +/* architectured initial value for Breaking-Event-Address register */ + env->gbea =1 ; +/* tininess for underflow is detected before rounding */ +set_float_detect_tininess (float_tininess_before_rounding, + &env->fpu_status); +/* Fallthrough */ +case S390_CPU_RESET_NORMAL : + env->pfault_token =-1UL ; + env->bpbc = false; +break ; + }/* Reset state inside the kernel that we cannot access yet from QEMU. */ -if (kvm_enabled ()) { -kvm_s390_reset_vcpu (cpu); +if (kvm_enabled () && (type ==S390_CPU_RESET_CLEAR || + type ==S390_CPU_RESET_INITIAL )) { +kvm_s390_reset_vcpu (cpu); } -} - -/* CPUClass:reset() */ -static void s390_cpu_full_reset (CPUState *s) -{ -S390CPU *cpu =S390_CPU (s); -S390CPUClass *scc =S390_CPU_GET_CLASS (cpu); -CPUS390XState *env = &cpu->env; - - scc->parent_reset (s); - cpu->env.sigp_order =0 ; -s390_cpu_set_state (S390_CPU_STATE_STOPPED , cpu); - -memset (env,0 , offsetof(CPUS390XState , end_reset_fields)); - -/* architectured initial values for CR 0 and 14 */ - env->cregs[0 ] =CR0_RESET ; - env->cregs[14 ] =CR14_RESET ;#if defined(CONFIG_USER_ONLY )/* user mode should always be allowed to use the full FPU */ @@ -151,20 +136,21 @@ static void s390_cpu_full_reset(CPUState *s) env->cregs[0] |= CR0_VECTOR; }#endif +} -/* architectured initial value for Breaking-Event-Address register */ - env->gbea =1 ; +static void s390_cpu_reset_normal (CPUState *s) +{ +return s390_cpu_reset (s,S390_CPU_RESET_NORMAL ); +} - env->pfault_token =-1UL ; +static void s390_cpu_reset_initial (CPUState *s) +{ +return s390_cpu_reset (s,S390_CPU_RESET_INITIAL ); +} -/* tininess for underflow is detected before rounding */ -set_float_detect_tininess (float_tininess_before_rounding, - &env->fpu_status); - -/* Reset state inside the kernel that we cannot access yet from QEMU. */ -if (kvm_enabled ()) { -kvm_s390_reset_vcpu (cpu); - } +static void s390_cpu_reset_clear (CPUState *s) +{ +return s390_cpu_reset (s,S390_CPU_RESET_CLEAR ); }#if !defined(CONFIG_USER_ONLY )@@ -473,9 +459,9 @@ static void s390_cpu_class_init(ObjectClass *oc, void *data)#if !defined(CONFIG_USER_ONLY ) scc->load_normal = s390_cpu_load_normal;target/s390x/cpu.c static void s390_cpu_class_init(ObjectClass *oc, void *data) · line 467
Quoted 10 lines
target/s390x/cpu.c +3
-3#endif - scc->cpu_reset = s390_cpu_reset; - scc->initial_cpu_reset = s390_cpu_initial_reset; - cc->reset = s390_cpu_full_reset; + scc->cpu_reset = s390_cpu_reset_normal; + scc->initial_cpu_reset = s390_cpu_reset_initial; + cc->reset = s390_cpu_reset_clear; cc->class_by_name = s390_cpu_class_by_name, cc->has_work = s390_cpu_has_work;#ifdef CONFIG_TCG This is a nice cleanup, but the patch is hard to digest. Maybe you can split it in 3, one patch for each
cpu_reset_type.
Quoted 4 lines
Regards,
Phil.
I'll try to split it up.