From: Janosch Frank <frankja@linux.ibm.com>
To: kvm@vger.kernel.org
Cc: linux-s390@vger.kernel.org, imbrenda@linux.ibm.com,
thuth@redhat.com, nrb@linux.ibm.com, david@redhat.com
Subject: [kvm-unit-tests PATCH v4 4/7] lib: s390x: uv: Add pv host requirement check function
Date: Tue, 2 May 2023 11:59:28 +0000 [thread overview]
Message-ID: <20230502115931.86280-5-frankja@linux.ibm.com> (raw)
In-Reply-To: <20230502115931.86280-1-frankja@linux.ibm.com>
When running PV guests some of the UV memory needs to be allocated
with > 31 bit addresses which means tests with PV guests will always
need a lot more memory than other tests.
Additionally facilities nr 158 and sclp.sief2 need to be available.
Let's add a function that checks for these requirements and prints a
helpful skip message.
Signed-off-by: Janosch Frank <frankja@linux.ibm.com>
---
lib/s390x/snippet.h | 7 +++++++
lib/s390x/uv.c | 20 ++++++++++++++++++++
lib/s390x/uv.h | 1 +
s390x/pv-diags.c | 8 +-------
4 files changed, 29 insertions(+), 7 deletions(-)
diff --git a/lib/s390x/snippet.h b/lib/s390x/snippet.h
index 57045994..11ec54c3 100644
--- a/lib/s390x/snippet.h
+++ b/lib/s390x/snippet.h
@@ -30,6 +30,13 @@
#define SNIPPET_HDR_LEN(type, file) \
((uintptr_t)SNIPPET_HDR_END(type, file) - (uintptr_t)SNIPPET_HDR_START(type, file))
+/*
+ * Some of the UV memory needs to be allocated with >31 bit
+ * addresses which means we need a lot more memory than other
+ * tests.
+ */
+#define SNIPPET_PV_MIN_MEM_SIZE (SZ_1M * 2200UL)
+
#define SNIPPET_PV_TWEAK0 0x42UL
#define SNIPPET_PV_TWEAK1 0UL
#define SNIPPET_UNPACK_OFF 0
diff --git a/lib/s390x/uv.c b/lib/s390x/uv.c
index 383271a5..4ccb7bde 100644
--- a/lib/s390x/uv.c
+++ b/lib/s390x/uv.c
@@ -18,6 +18,7 @@
#include <asm/uv.h>
#include <uv.h>
#include <sie.h>
+#include <snippet.h>
static struct uv_cb_qui uvcb_qui = {
.header.cmd = UVC_CMD_QUI,
@@ -38,6 +39,25 @@ bool uv_os_is_host(void)
return test_facility(158) && uv_query_test_call(BIT_UVC_CMD_INIT_UV);
}
+bool uv_host_requirement_checks(void)
+{
+ if (!test_facility(158)) {
+ report_skip("UV Call facility unavailable");
+ return false;
+ }
+ if (!sclp_facilities.has_sief2) {
+ report_skip("SIEF2 facility unavailable");
+ return false;
+ }
+ if (get_ram_size() < SNIPPET_PV_MIN_MEM_SIZE) {
+ report_skip("Not enough memory. This test needs about %ld MB of memory",
+ SNIPPET_PV_MIN_MEM_SIZE / 1024 / 1024);
+ return false;
+ }
+
+ return true;
+}
+
bool uv_query_test_call(unsigned int nr)
{
/* Query needs to be called first */
diff --git a/lib/s390x/uv.h b/lib/s390x/uv.h
index 78b979b7..286933ca 100644
--- a/lib/s390x/uv.h
+++ b/lib/s390x/uv.h
@@ -7,6 +7,7 @@
bool uv_os_is_guest(void);
bool uv_os_is_host(void);
+bool uv_host_requirement_checks(void);
bool uv_query_test_call(unsigned int nr);
const struct uv_cb_qui *uv_get_query_data(void);
void uv_init(void);
diff --git a/s390x/pv-diags.c b/s390x/pv-diags.c
index fa4e5532..3193ad99 100644
--- a/s390x/pv-diags.c
+++ b/s390x/pv-diags.c
@@ -149,14 +149,8 @@ static void test_diag_yield(void)
int main(void)
{
report_prefix_push("pv-diags");
- if (!test_facility(158)) {
- report_skip("UV Call facility unavailable");
+ if (!uv_host_requirement_checks())
goto done;
- }
- if (!sclp_facilities.has_sief2) {
- report_skip("SIEF2 facility unavailable");
- goto done;
- }
uv_setup_asces();
snippet_setup_guest(&vm, true);
--
2.34.1
next prev parent reply other threads:[~2023-05-02 12:21 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-02 11:59 [kvm-unit-tests PATCH v4 0/7] s390x: Add PV SIE intercepts and ipl tests Janosch Frank
2023-05-02 11:59 ` [kvm-unit-tests PATCH v4 1/7] lib: s390x: uv: Introduce UV validity function Janosch Frank
2023-05-02 11:59 ` [kvm-unit-tests PATCH v4 2/7] lib: s390x: uv: Add intercept data check library function Janosch Frank
2023-05-02 11:59 ` [kvm-unit-tests PATCH v4 3/7] s390x: pv-diags: Drop snippet from snippet names Janosch Frank
2023-05-02 11:59 ` Janosch Frank [this message]
2023-05-02 11:59 ` [kvm-unit-tests PATCH v4 5/7] s390x: pv: Add sie entry intercept and validity test Janosch Frank
2023-05-10 7:28 ` Nico Boehr
2023-05-15 11:53 ` [kvm-unit-tests PATCH v5] " Janosch Frank
2023-05-15 14:00 ` Nico Boehr
2023-05-02 11:59 ` [kvm-unit-tests PATCH v4 6/7] s390x: pv: Add IPL reset tests Janosch Frank
2023-05-10 7:32 ` Nico Boehr
2023-05-02 11:59 ` [kvm-unit-tests PATCH v4 7/7] s390x: pv-diags: Add the test to unittests.conf Janosch Frank
2023-05-10 7:33 ` Nico Boehr
2023-05-31 10:58 ` [kvm-unit-tests PATCH v4 0/7] s390x: Add PV SIE intercepts and ipl tests Nico Boehr
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=20230502115931.86280-5-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=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