From: Claudio Imbrenda <imbrenda@linux.ibm.com>
To: kvm@vger.kernel.org, linux-s390@vger.kernel.org, qemu-s390x@nongnu.org
Cc: frankja@linux.ibm.com, thuth@redhat.com
Subject: [PATCH v2 1/2] s390x: intercept: fence one test when using TCG
Date: Thu, 21 Jul 2022 15:30:01 +0200 [thread overview]
Message-ID: <20220721133002.142897-2-imbrenda@linux.ibm.com> (raw)
In-Reply-To: <20220721133002.142897-1-imbrenda@linux.ibm.com>
Qemu commit f8333de2793 ("target/s390x/tcg: SPX: check validity of new prefix")
fixes a TCG bug discovered with a new testcase in the intercept test.
The gitlab pipeline for the KVM unit tests uses TCG and it will keep
failing every time as long as the pipeline uses a version of Qemu
without the aforementioned patch.
Fence the specific testcase for now. Once the pipeline is fixed, this
patch can safely be reverted.
This patch is meant to go on top this already queued patch from Janis:
"s390x/intercept: Test invalid prefix argument to SET PREFIX"
https://lore.kernel.org/all/20220627152412.2243255-1-scgl@linux.ibm.com/
Signed-off-by: Claudio Imbrenda <imbrenda@linux.ibm.com>
---
s390x/intercept.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/s390x/intercept.c b/s390x/intercept.c
index 54bed5a4..656b8adb 100644
--- a/s390x/intercept.c
+++ b/s390x/intercept.c
@@ -14,6 +14,7 @@
#include <asm/page.h>
#include <asm/facility.h>
#include <asm/time.h>
+#include <hardware.h>
static uint8_t pagebuf[PAGE_SIZE * 2] __attribute__((aligned(PAGE_SIZE * 2)));
@@ -76,7 +77,8 @@ static void test_spx(void)
check_pgm_int_code(PGM_INT_CODE_ADDRESSING);
new_prefix = get_ram_size() & 0x7fffe000;
- if (get_ram_size() - new_prefix < 2 * PAGE_SIZE) {
+ /* TODO: Remove host_is_tcg() checks once CIs are using QEMU >= 7.1 */
+ if (!host_is_tcg() && (get_ram_size() - new_prefix < 2 * PAGE_SIZE)) {
expect_pgm_int();
asm volatile("spx %0 " : : "Q"(new_prefix));
check_pgm_int_code(PGM_INT_CODE_ADDRESSING);
@@ -88,7 +90,10 @@ static void test_spx(void)
* the address to 8k we have a completely accessible area.
*/
} else {
- report_skip("inaccessible prefix area");
+ if (host_is_tcg())
+ report_skip("inaccessible prefix area (workaround for TCG bug)");
+ else
+ report_skip("inaccessible prefix area");
}
}
--
2.36.1
next prev parent reply other threads:[~2022-07-21 13:30 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-21 13:30 [PATCH v2 0/2] s390x: Pipeline and other minor fixes Claudio Imbrenda
2022-07-21 13:30 ` Claudio Imbrenda [this message]
2022-07-21 13:41 ` [PATCH v2 1/2] s390x: intercept: fence one test when using TCG Thomas Huth
2022-07-21 13:46 ` Claudio Imbrenda
2022-07-21 13:30 ` [PATCH v2 2/2] s390x: intercept: make sure all output lines are unique Claudio Imbrenda
2022-07-21 13:42 ` 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=20220721133002.142897-2-imbrenda@linux.ibm.com \
--to=imbrenda@linux.ibm.com \
--cc=frankja@linux.ibm.com \
--cc=kvm@vger.kernel.org \
--cc=linux-s390@vger.kernel.org \
--cc=qemu-s390x@nongnu.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox