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,
nrb@linux.ibm.com
Subject: [kvm-unit-tests PATCH v3 03/11] s390x: diag308: Only test subcode 2 under QEMU
Date: Thu, 21 Apr 2022 10:11:22 +0000 [thread overview]
Message-ID: <20220421101130.23107-4-frankja@linux.ibm.com> (raw)
In-Reply-To: <20220421101130.23107-1-frankja@linux.ibm.com>
Other hypervisors might implement it and therefore not send a
specification exception.
Signed-off-by: Janosch Frank <frankja@linux.ibm.com>
Reviewed-by: Claudio Imbrenda <imbrenda@linux.ibm.com>
Reviewed-by: Nico Boehr <nrb@linux.ibm.com>
---
s390x/diag308.c | 18 +++++++++++++++++-
1 file changed, 17 insertions(+), 1 deletion(-)
diff --git a/s390x/diag308.c b/s390x/diag308.c
index c9d6c499..ea41b455 100644
--- a/s390x/diag308.c
+++ b/s390x/diag308.c
@@ -8,6 +8,7 @@
#include <libcflat.h>
#include <asm/asm-offsets.h>
#include <asm/interrupt.h>
+#include <hardware.h>
/* The diagnose calls should be blocked in problem state */
static void test_priv(void)
@@ -75,7 +76,7 @@ static void test_subcode6(void)
/* Unsupported subcodes should generate a specification exception */
static void test_unsupported_subcode(void)
{
- int subcodes[] = { 2, 0x101, 0xffff, 0x10001, -1 };
+ int subcodes[] = { 0x101, 0xffff, 0x10001, -1 };
int idx;
for (idx = 0; idx < ARRAY_SIZE(subcodes); idx++) {
@@ -85,6 +86,21 @@ static void test_unsupported_subcode(void)
check_pgm_int_code(PGM_INT_CODE_SPECIFICATION);
report_prefix_pop();
}
+
+ /*
+ * Subcode 2 is not available under QEMU but might be on other
+ * hypervisors so we only check for the specification
+ * exception on QEMU.
+ */
+ report_prefix_pushf("0x%04x", 2);
+ if (host_is_qemu()) {
+ expect_pgm_int();
+ asm volatile ("diag %0,%1,0x308" :: "d"(0), "d"(2));
+ check_pgm_int_code(PGM_INT_CODE_SPECIFICATION);
+ } else {
+ report_skip("subcode is supported");
+ }
+ report_prefix_pop();
}
static struct {
--
2.32.0
next prev parent reply other threads:[~2022-04-21 10:13 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-21 10:11 [kvm-unit-tests PATCH v3 00/11] s390x: Cleanup and maintenance 4 Janosch Frank
2022-04-21 10:11 ` [kvm-unit-tests PATCH v3 01/11] lib: s390x: hardware: Add host_is_qemu() function Janosch Frank
2022-04-21 10:11 ` [kvm-unit-tests PATCH v3 02/11] s390x: css: Skip if we're not run by qemu Janosch Frank
2022-04-21 10:11 ` Janosch Frank [this message]
2022-04-21 10:11 ` [kvm-unit-tests PATCH v3 04/11] s390x: pfmf: Initialize pfmf_r1 union on declaration Janosch Frank
2022-04-21 10:11 ` [kvm-unit-tests PATCH v3 05/11] s390x: snippets: asm: Add license and copyright headers Janosch Frank
2022-04-21 10:11 ` [kvm-unit-tests PATCH v3 06/11] s390x: pv-diags: Cleanup includes Janosch Frank
2022-04-21 10:11 ` [kvm-unit-tests PATCH v3 07/11] s390x: css: " Janosch Frank
2022-04-21 10:11 ` [kvm-unit-tests PATCH v3 08/11] s390x: iep: " Janosch Frank
2022-04-21 10:11 ` [kvm-unit-tests PATCH v3 09/11] s390x: mvpg: " Janosch Frank
2022-04-21 10:11 ` [kvm-unit-tests PATCH v3 10/11] s390x: uv-host: Fix pgm tests Janosch Frank
2022-04-21 11:13 ` Nico Boehr
2022-04-21 10:11 ` [kvm-unit-tests PATCH v3 11/11] s390x: Restore registers in diag308_load_reset() error path Janosch Frank
2022-04-21 11:59 ` Claudio Imbrenda
2022-04-21 11:59 ` [kvm-unit-tests PATCH v3 00/11] s390x: Cleanup and maintenance 4 Claudio Imbrenda
2022-04-21 12:39 ` 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=20220421101130.23107-4-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=nrb@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox