From: Thomas Huth <thuth@redhat.com>
To: "Radim Krčmář" <rkrcmar@redhat.com>,
"Paolo Bonzini" <pbonzini@redhat.com>,
kvm@vger.kernel.org
Cc: David Hildenbrand <david@redhat.com>,
Janosch Frank <frankja@linux.ibm.com>
Subject: [kvm-unit-tests PULL 2/4] s390x/skey: Skip the "iske" test when running under z/VM 6
Date: Fri, 19 Apr 2019 08:32:05 +0200 [thread overview]
Message-ID: <20190419063207.11474-3-thuth@redhat.com> (raw)
In-Reply-To: <20190419063207.11474-1-thuth@redhat.com>
There is a known bug of z/VM 6 which causes the "iske" test to fail.
Since it is still sometimes useful to run the kvm-unit-tests in such
a nested environment, let's rather skip the "iske" test there instead
of always reporting a failure.
Acked-by: Christian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
s390x/skey.c | 55 ++++++++++++++++++++++++++++++++++++++++++++++++----
1 file changed, 51 insertions(+), 4 deletions(-)
diff --git a/s390x/skey.c b/s390x/skey.c
index f4894f1..b1e11af 100644
--- a/s390x/skey.c
+++ b/s390x/skey.c
@@ -70,9 +70,51 @@ static void test_set(void)
skey.str.acc == ret.str.acc && skey.str.fp == ret.str.fp);
}
+static inline int stsi(void *addr, int fc, int sel1, int sel2)
+{
+ register int r0 asm("0") = (fc << 28) | sel1;
+ register int r1 asm("1") = sel2;
+ int rc = 0;
+
+ asm volatile(
+ " stsi 0(%3)\n"
+ " jz 0f\n"
+ " lhi %1,-1\n"
+ "0:\n"
+ : "+d" (r0), "+d" (rc)
+ : "d" (r1), "a" (addr)
+ : "cc", "memory");
+
+ return rc;
+}
+
+/* Returns true if we are running under z/VM 6.x */
+static bool check_for_zvm6(void)
+{
+ int dcbt; /* Descriptor block count */
+ int nr;
+ static const unsigned char zvm6[] = {
+ /* This is "z/VM 6" in EBCDIC */
+ 0xa9, 0x61, 0xe5, 0xd4, 0x40, 0x40, 0x40, 0x40, 0xf6
+ };
+
+ if (stsi(pagebuf, 3, 2, 2))
+ return false;
+
+ dcbt = pagebuf[31] & 0xf;
+
+ for (nr = 0; nr < dcbt; nr++) {
+ if (!memcmp(&pagebuf[32 + nr * 64 + 24], zvm6, sizeof(zvm6)))
+ return true;
+ }
+
+ return false;
+}
+
static void test_priv(void)
{
union skey skey;
+ bool is_zvm6 = check_for_zvm6();
memset(pagebuf, 0, PAGE_SIZE * 2);
report_prefix_push("privileged");
@@ -87,10 +129,15 @@ static void test_priv(void)
report("skey did not change on exception", skey.str.acc != 3);
report_prefix_push("iske");
- expect_pgm_int();
- enter_pstate();
- get_storage_key(page0);
- check_pgm_int_code(PGM_INT_CODE_PRIVILEGED_OPERATION);
+ if (is_zvm6) {
+ /* There is a known bug with z/VM 6, so skip the test there */
+ report_skip("not working on z/VM 6");
+ } else {
+ expect_pgm_int();
+ enter_pstate();
+ get_storage_key(page0);
+ check_pgm_int_code(PGM_INT_CODE_PRIVILEGED_OPERATION);
+ }
report_prefix_pop();
report_prefix_pop();
--
2.21.0
next prev parent reply other threads:[~2019-04-19 18:21 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-19 6:32 [kvm-unit-tests PULL 0/4] s390x updates and gitlab-ci file Thomas Huth
2019-04-19 6:32 ` [kvm-unit-tests PULL 1/4] Add s390x/*.bin to the .gitignore file Thomas Huth
2019-04-19 6:32 ` Thomas Huth [this message]
2019-04-19 6:32 ` [kvm-unit-tests PULL 3/4] s390x: Add a test for the diagnose 0x308 hypercall Thomas Huth
2019-04-19 6:32 ` [kvm-unit-tests PULL 4/4] Add a .gitlab-ci.yml file for automatic CI testing on GitLab instances Thomas Huth
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=20190419063207.11474-3-thuth@redhat.com \
--to=thuth@redhat.com \
--cc=david@redhat.com \
--cc=frankja@linux.ibm.com \
--cc=kvm@vger.kernel.org \
--cc=pbonzini@redhat.com \
--cc=rkrcmar@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.