[kvm-unit-tests PATCH v3 2/9] s390x: smp: Only use smp_cpu_setup once

Janosch Frank
2020-01-17T10:46:58Z

Let's stop and start instead of using setup to run a function on a
cpu.

Signed-off-by: Janosch Frank <frankja@linux.ibm.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Cornelia Huck <cohuck@redhat.com>
Acked-by: David Hildenbrand <david@redhat.com>
---
s390x/smp.c | 21 ++++++++++++++-------
1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/s390x/smp.c b/s390x/smp.c
index 8d8e3a5..555ed72 100644
--- a/s390x/smp.c
+++ b/s390x/smp.c
@@ -46,7 +46,7 @@ static void test_start(void)
psw.mask = extract_psw_mask();
psw.addr = (unsigned long)test_func;

- smp_cpu_setup(1, psw);
+ smp_cpu_start(1, psw);
wait_for_flag();
report(1, "start");
}
@@ -102,6 +102,7 @@ static void test_store_status(void)
report(1, "status written");
free_pages(status, PAGE_SIZE * 2);
report_prefix_pop();
+ smp_cpu_stop(1);

report_prefix_pop();
}
@@ -130,9 +131,8 @@ static void test_ecall(void)

report_prefix_push("ecall");
testflag = 0;
- smp_cpu_destroy(1);

- smp_cpu_setup(1, psw);
+ smp_cpu_start(1, psw);
wait_for_flag();
testflag = 0;
sigp(1, SIGP_EXTERNAL_CALL, 0, NULL);
@@ -165,9 +165,8 @@ static void test_emcall(void)

report_prefix_push("emcall");
testflag = 0;
- smp_cpu_destroy(1);

- smp_cpu_setup(1, psw);
+ smp_cpu_start(1, psw);
wait_for_flag();
testflag = 0;
sigp(1, SIGP_EMERGENCY_SIGNAL, 0, NULL);
@@ -185,7 +184,7 @@ static void test_reset_initial(void)
psw.addr = (unsigned long)test_func;

report_prefix_push("reset initial");
- smp_cpu_setup(1, psw);
+ smp_cpu_start(1, psw);

sigp_retry(1, SIGP_INITIAL_CPU_RESET, 0, NULL);
sigp(1, SIGP_STORE_STATUS_AT_ADDRESS, (uintptr_t)status, NULL);
@@ -216,7 +215,7 @@ static void test_reset(void)
psw.addr = (unsigned long)test_func;

report_prefix_push("cpu reset");
- smp_cpu_setup(1, psw);
+ smp_cpu_start(1, psw);

sigp_retry(1, SIGP_CPU_RESET, 0, NULL);
report(smp_cpu_stopped(1), "cpu stopped");
@@ -225,6 +224,7 @@ static void test_reset(void)

int main(void)
{
+ struct psw psw;
report_prefix_push("smp");

if (smp_query_num_cpus() == 1) {
@@ -232,6 +232,12 @@ int main(void)
goto done;
}

+ /* Setting up the cpu to give it a stack and lowcore */
+ psw.mask = extract_psw_mask();
+ psw.addr = (unsigned long)cpu_loop;
+ smp_cpu_setup(1, psw);
+ smp_cpu_stop(1);
+
test_start();
test_stop();
test_stop_store_status();
@@ -240,6 +246,7 @@ int main(void)
test_emcall();
test_reset();
test_reset_initial();
+ smp_cpu_destroy(1);

done:
report_prefix_pop();
--
2.20.1