From: Janosch Frank <frankja@linux.ibm.com>
To: kvm@vger.kernel.org
Cc: thuth@redhat.com, borntraeger@de.ibm.com,
linux-s390@vger.kernel.org, david@redhat.com, cohuck@redhat.com
Subject: [kvm-unit-tests PATCH v3 5/9] s390x: smp: Wait for cpu setup to finish
Date: Fri, 17 Jan 2020 05:46:36 -0500 [thread overview]
Message-ID: <20200117104640.1983-6-frankja@linux.ibm.com> (raw)
In-Reply-To: <20200117104640.1983-1-frankja@linux.ibm.com>
We store the user provided psw address into restart new, so a psw
restart does not lead us through setup again.
Also we wait on smp_cpu_setup() until the cpu has finished setup
before returning. This is necessary for z/VM and LPAR where sigp is
asynchronous.
Signed-off-by: Janosch Frank <frankja@linux.ibm.com>
Reviewed-by: David Hildenbrand <david@redhat.com>
---
lib/s390x/smp.c | 2 ++
s390x/cstart64.S | 2 ++
2 files changed, 4 insertions(+)
diff --git a/lib/s390x/smp.c b/lib/s390x/smp.c
index 84e681d..9dad146 100644
--- a/lib/s390x/smp.c
+++ b/lib/s390x/smp.c
@@ -204,6 +204,8 @@ int smp_cpu_setup(uint16_t addr, struct psw psw)
/* Start processing */
smp_cpu_restart_nolock(addr, NULL);
+ /* Wait until the cpu has finished setup and started the provided psw */
+ while (lc->restart_new_psw.addr != psw.addr) { mb(); }
out:
spin_unlock(&lock);
return rc;
diff --git a/s390x/cstart64.S b/s390x/cstart64.S
index 86dd4c4..9af6bb3 100644
--- a/s390x/cstart64.S
+++ b/s390x/cstart64.S
@@ -159,6 +159,8 @@ smp_cpu_setup_state:
xgr %r1, %r1
lmg %r0, %r15, GEN_LC_SW_INT_GRS
lctlg %c0, %c0, GEN_LC_SW_INT_CRS
+ /* We should only go once through cpu setup and not for every restart */
+ stg %r14, GEN_LC_RESTART_NEW_PSW + 8
br %r14
pgm_int:
--
2.20.1
next prev parent reply other threads:[~2020-01-17 10:47 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-17 10:46 [kvm-unit-tests PATCH v3 0/9] s390x: smp: Improve smp code and reset checks Janosch Frank
2020-01-17 10:46 ` [kvm-unit-tests PATCH v3 1/9] s390x: smp: Cleanup smp.c Janosch Frank
2020-01-20 12:02 ` David Hildenbrand
2020-01-17 10:46 ` [kvm-unit-tests PATCH v3 2/9] s390x: smp: Only use smp_cpu_setup once Janosch Frank
2020-01-17 10:46 ` [kvm-unit-tests PATCH v3 3/9] s390x: Add cpu id to interrupt error prints Janosch Frank
2020-01-17 10:46 ` [kvm-unit-tests PATCH v3 4/9] s390x: smp: Rework cpu start and active tracking Janosch Frank
2020-01-20 12:06 ` David Hildenbrand
2020-01-20 13:16 ` Thomas Huth
2020-01-20 13:20 ` David Hildenbrand
2020-01-20 14:47 ` Janosch Frank
2020-01-20 14:53 ` David Hildenbrand
2020-01-17 10:46 ` Janosch Frank [this message]
2020-01-20 11:04 ` [kvm-unit-tests PATCH v3 5/9] s390x: smp: Wait for cpu setup to finish Cornelia Huck
2020-01-20 12:07 ` David Hildenbrand
2020-01-17 10:46 ` [kvm-unit-tests PATCH v3 6/9] s390x: smp: Loop if secondary cpu returns into cpu setup again Janosch Frank
2020-01-20 11:27 ` Cornelia Huck
2020-01-20 12:07 ` David Hildenbrand
2020-01-17 10:46 ` [kvm-unit-tests PATCH v3 7/9] s390x: smp: Remove unneeded cpu loops Janosch Frank
2020-01-20 11:29 ` Cornelia Huck
2020-01-20 14:41 ` Janosch Frank
2020-01-20 16:11 ` Cornelia Huck
2020-01-21 12:46 ` Janosch Frank
2020-01-21 12:59 ` Cornelia Huck
2020-01-21 13:07 ` Janosch Frank
2020-01-17 10:46 ` [kvm-unit-tests PATCH v3 8/9] s390x: smp: Test all CRs on initial reset Janosch Frank
2020-01-20 11:44 ` Cornelia Huck
2020-01-20 12:10 ` David Hildenbrand
2020-01-20 14:49 ` Janosch Frank
2020-01-20 14:53 ` David Hildenbrand
2020-01-17 10:46 ` [kvm-unit-tests PATCH v3 9/9] s390x: smp: Dirty fpc before initial reset test Janosch Frank
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200117104640.1983-6-frankja@linux.ibm.com \
--to=frankja@linux.ibm.com \
--cc=borntraeger@de.ibm.com \
--cc=cohuck@redhat.com \
--cc=david@redhat.com \
--cc=kvm@vger.kernel.org \
--cc=linux-s390@vger.kernel.org \
--cc=thuth@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.