From: Janosch Frank <frankja@linux.ibm.com>
To: pbonzini@redhat.com
Cc: kvm@vger.kernel.org, frankja@linux.ibm.com, david@redhat.com,
borntraeger@de.ibm.com, cohuck@redhat.com,
linux-s390@vger.kernel.org, imbrenda@linux.ibm.com,
thuth@redhat.com
Subject: [kvm-unit-tests GIT PULL 9/9] s390x: cpumodel: FMT2 and FMT4 SCLP test
Date: Wed, 26 May 2021 16:55:39 +0200 [thread overview]
Message-ID: <20210526145539.52008-10-frankja@linux.ibm.com> (raw)
In-Reply-To: <20210526145539.52008-1-frankja@linux.ibm.com>
SCLP is also part of the cpumodel, so we need to make sure that the
features indicated via read info / read cpu info are correct.
Signed-off-by: Janosch Frank <frankja@linux.ibm.com>
Reviewed-by: Claudio Imbrenda <imbrenda@linux.ibm.com>
Acked-by: David Hildenbrand <david@redhat.com>
Acked-by: Cornelia Huck <cohuck@redhat.com>
---
s390x/cpumodel.c | 71 +++++++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 70 insertions(+), 1 deletion(-)
diff --git a/s390x/cpumodel.c b/s390x/cpumodel.c
index 4dd8b96f..67bb6543 100644
--- a/s390x/cpumodel.c
+++ b/s390x/cpumodel.c
@@ -2,14 +2,81 @@
/*
* Test the known dependencies for facilities
*
- * Copyright 2019 IBM Corp.
+ * Copyright 2019, 2021 IBM Corp.
*
* Authors:
* Christian Borntraeger <borntraeger@de.ibm.com>
+ * Janosch Frank <frankja@linux.ibm.com>
*/
#include <asm/facility.h>
#include <vm.h>
+#include <sclp.h>
+#include <uv.h>
+#include <asm/uv.h>
+
+static void test_sclp_missing_sief2_implications(void)
+{
+ /* Virtualization related facilities */
+ report(!sclp_facilities.has_64bscao, "!64bscao");
+ report(!sclp_facilities.has_pfmfi, "!pfmfi");
+ report(!sclp_facilities.has_gsls, "!gsls");
+ report(!sclp_facilities.has_cmma, "!cmma");
+ report(!sclp_facilities.has_esca, "!esca");
+ report(!sclp_facilities.has_kss, "!kss");
+ report(!sclp_facilities.has_ibs, "!ibs");
+
+ /* Virtualization related facilities reported via CPU entries */
+ report(!sclp_facilities.has_sigpif, "!sigpif");
+ report(!sclp_facilities.has_sief2, "!sief2");
+ report(!sclp_facilities.has_skeyi, "!skeyi");
+ report(!sclp_facilities.has_siif, "!siif");
+ report(!sclp_facilities.has_cei, "!cei");
+ report(!sclp_facilities.has_ib, "!ib");
+}
+
+static void test_sclp_features_fmt4(void)
+{
+ /*
+ * STFLE facilities are handled by the Ultravisor but SCLP
+ * facilities are advertised by the hypervisor.
+ */
+ report_prefix_push("PV guest implies");
+
+ /* General facilities */
+ report(!sclp_facilities.has_diag318, "!diag318");
+
+ /*
+ * Virtualization related facilities, all of which are
+ * unavailable because there's no virtualization support in a
+ * protected guest.
+ */
+ test_sclp_missing_sief2_implications();
+
+ report_prefix_pop();
+}
+
+static void test_sclp_features_fmt2(void)
+{
+ if (sclp_facilities.has_sief2)
+ return;
+
+ report_prefix_push("!sief2 implies");
+ test_sclp_missing_sief2_implications();
+ report_prefix_pop();
+}
+
+static void test_sclp_features(void)
+{
+ report_prefix_push("sclp");
+
+ if (uv_os_is_guest())
+ test_sclp_features_fmt4();
+ else
+ test_sclp_features_fmt2();
+
+ report_prefix_pop();
+}
static struct {
int facility;
@@ -60,6 +127,8 @@ int main(void)
}
report_prefix_pop();
+ test_sclp_features();
+
report_prefix_pop();
return report_summary();
}
--
2.31.1
next prev parent reply other threads:[~2021-05-26 14:56 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-26 14:55 [kvm-unit-tests GIT PULL 0/9] s390x update 2021-26-05 Janosch Frank
2021-05-26 14:55 ` [kvm-unit-tests GIT PULL 1/9] s390x: uv-guest: Add invalid share location test Janosch Frank
2021-05-26 14:55 ` [kvm-unit-tests GIT PULL 2/9] s390x: Add more Ultravisor command structure definitions Janosch Frank
2021-05-26 14:55 ` [kvm-unit-tests GIT PULL 3/9] s390x: uv: Add UV lib Janosch Frank
2021-05-26 14:55 ` [kvm-unit-tests GIT PULL 4/9] s390x: Test for share/unshare call support before using them Janosch Frank
2021-05-26 14:55 ` [kvm-unit-tests GIT PULL 5/9] s390x: uv-guest: Test invalid commands Janosch Frank
2021-05-26 14:55 ` [kvm-unit-tests GIT PULL 6/9] s390x: Add UV host test Janosch Frank
2021-05-26 14:55 ` [kvm-unit-tests GIT PULL 7/9] s390x: sclp: Only fetch read info byte 134 if cpu entries are above it Janosch Frank
2021-05-26 14:55 ` [kvm-unit-tests GIT PULL 8/9] lib: s390x: sclp: Extend feature probing Janosch Frank
2021-05-26 14:55 ` Janosch Frank [this message]
2021-05-26 16:33 ` [kvm-unit-tests GIT PULL 0/9] s390x update 2021-26-05 Paolo Bonzini
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=20210526145539.52008-10-frankja@linux.ibm.com \
--to=frankja@linux.ibm.com \
--cc=borntraeger@de.ibm.com \
--cc=cohuck@redhat.com \
--cc=david@redhat.com \
--cc=imbrenda@linux.ibm.com \
--cc=kvm@vger.kernel.org \
--cc=linux-s390@vger.kernel.org \
--cc=pbonzini@redhat.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox