[kvm-unit-tests,PULL,05/17] s390x/smp: fix detection of "running"

Commit Message

David Hildenbrand April 30, 2020, 3:24 p.m. UTC

From: Christian Borntraeger <[e-mail]>

On s390x hosts with a single CPU, the smp test case hangs (loops).
The check if our restart has finished is wrong.
Sigp sense running status checks if the CPU is currently backed by a
real CPU. This means that on single CPU hosts a sigp sense running
will never claim that a target is running. We need to check for not
being stopped instead.

Reviewed-by: Janosch Frank <[e-mail]>
Reviewed-by: Cornelia Huck <[e-mail]>
Signed-off-by: Christian Borntraeger <[e-mail]>
Message-Id: <[e-mail]>
Signed-off-by: David Hildenbrand <[e-mail]>
---
 lib/s390x/smp.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Patch

diff --git a/lib/s390x/smp.c b/lib/s390x/smp.c
index 3f86243..203792a 100644
--- a/lib/s390x/smp.c
+++ b/lib/s390x/smp.c
@@ -128,7 +128,7 @@  static int smp_cpu_restart_nolock(uint16_t addr, struct psw *psw)
 	 * The order has been accepted, but the actual restart may not
 	 * have been performed yet, so wait until the cpu is running.
 	 */
-	while (!smp_cpu_running(addr))
+	while (smp_cpu_stopped(addr))
 		mb();
 	cpu->active = true;
 	return 0;