From: Janosch Frank <frankja@linux.ibm.com>
To: kvm@vger.kernel.org
Cc: linux-s390@vger.kernel.org, imbrenda@linux.ibm.com,
david@redhat.com, thuth@redhat.com, seiden@linux.ibm.com,
scgl@linux.ibm.com
Subject: [kvm-unit-tests PATCH v3 2/9] s390x: uv-host: Fence a destroy cpu test on z15
Date: Thu, 7 Oct 2021 08:50:20 +0000 [thread overview]
Message-ID: <20211007085027.13050-3-frankja@linux.ibm.com> (raw)
In-Reply-To: <20211007085027.13050-1-frankja@linux.ibm.com>
Firmware will not give us the expected return code on z15 so let's
fence it for the z15 machine generation.
Signed-off-by: Janosch Frank <frankja@linux.ibm.com>
Reviewed-by: Claudio Imbrenda <imbrenda@linux.ibm.com>
Acked-by: Thomas Huth <thuth@redhat.com>
---
lib/s390x/asm/arch_def.h | 14 ++++++++++++++
s390x/uv-host.c | 11 +++++++----
2 files changed, 21 insertions(+), 4 deletions(-)
diff --git a/lib/s390x/asm/arch_def.h b/lib/s390x/asm/arch_def.h
index aa80d840..c8d2722a 100644
--- a/lib/s390x/asm/arch_def.h
+++ b/lib/s390x/asm/arch_def.h
@@ -219,6 +219,20 @@ static inline unsigned short stap(void)
return cpu_address;
}
+#define MACHINE_Z15A 0x8561
+#define MACHINE_Z15B 0x8562
+
+static inline uint16_t get_machine_id(void)
+{
+ uint64_t cpuid;
+
+ asm volatile("stidp %0" : "=Q" (cpuid));
+ cpuid = cpuid >> 16;
+ cpuid &= 0xffff;
+
+ return cpuid;
+}
+
static inline int tprot(unsigned long addr)
{
int cc;
diff --git a/s390x/uv-host.c b/s390x/uv-host.c
index 4b72c24d..92a41069 100644
--- a/s390x/uv-host.c
+++ b/s390x/uv-host.c
@@ -111,6 +111,7 @@ static void test_config_destroy(void)
static void test_cpu_destroy(void)
{
int rc;
+ uint16_t machineid = get_machine_id();
struct uv_cb_nodata uvcb = {
.header.len = sizeof(uvcb),
.header.cmd = UVC_CMD_DESTROY_SEC_CPU,
@@ -125,10 +126,12 @@ static void test_cpu_destroy(void)
"hdr invalid length");
uvcb.header.len += 8;
- uvcb.handle += 1;
- rc = uv_call(0, (uint64_t)&uvcb);
- report(rc == 1 && uvcb.header.rc == UVC_RC_INV_CHANDLE, "invalid handle");
- uvcb.handle -= 1;
+ if (machineid != MACHINE_Z15A && machineid != MACHINE_Z15B) {
+ uvcb.handle += 1;
+ rc = uv_call(0, (uint64_t)&uvcb);
+ report(rc == 1 && uvcb.header.rc == UVC_RC_INV_CHANDLE, "invalid handle");
+ uvcb.handle -= 1;
+ }
rc = uv_call(0, (uint64_t)&uvcb);
report(rc == 0 && uvcb.header.rc == UVC_RC_EXECUTED, "success");
--
2.30.2
next prev parent reply other threads:[~2021-10-07 8:52 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-07 8:50 [kvm-unit-tests PATCH v3 0/9] s390x: Cleanup and maintenance 2 Janosch Frank
2021-10-07 8:50 ` [kvm-unit-tests PATCH v3 1/9] s390x: uv: Tolerate 0x100 query return code Janosch Frank
2021-10-07 8:58 ` Thomas Huth
2021-10-07 8:50 ` Janosch Frank [this message]
2021-10-07 8:50 ` [kvm-unit-tests PATCH v3 3/9] lib: s390x: uv: Fix share return value and print Janosch Frank
2021-10-07 8:50 ` [kvm-unit-tests PATCH v3 4/9] lib: s390x: uv: Add UVC_ERR_DEBUG switch Janosch Frank
2021-10-07 9:01 ` Thomas Huth
2021-10-13 14:14 ` Janosch Frank
2021-10-07 8:50 ` [kvm-unit-tests PATCH v3 5/9] lib: s390x: Add access key argument to tprot Janosch Frank
2021-10-07 9:05 ` Thomas Huth
2021-10-07 8:50 ` [kvm-unit-tests PATCH v3 6/9] lib: s390x: Print PGM code as hex Janosch Frank
2021-10-07 8:50 ` [kvm-unit-tests PATCH v3 7/9] s390x: Add sthyi cc==0 r2+1 verification Janosch Frank
2021-10-07 9:11 ` Thomas Huth
2021-10-07 10:51 ` Janosch Frank
2021-10-07 8:50 ` [kvm-unit-tests PATCH v3 8/9] s390x: snippets: Set stackptr and stacktop in cstart.S Janosch Frank
2021-10-07 9:13 ` Thomas Huth
2021-10-07 9:22 ` Janosch Frank
2021-10-07 8:50 ` [kvm-unit-tests PATCH v3 9/9] s390x: snippets: Define all things that are needed to link the lib Janosch Frank
2021-10-07 9:44 ` Thomas Huth
2021-10-07 10:44 ` Janosch Frank
2021-10-08 7:20 ` Thomas Huth
2021-10-08 8:13 ` 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=20211007085027.13050-3-frankja@linux.ibm.com \
--to=frankja@linux.ibm.com \
--cc=david@redhat.com \
--cc=imbrenda@linux.ibm.com \
--cc=kvm@vger.kernel.org \
--cc=linux-s390@vger.kernel.org \
--cc=scgl@linux.ibm.com \
--cc=seiden@linux.ibm.com \
--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.