From: Janosch Frank <frankja@linux.ibm.com>
To: kvm390 mailing list <kvm390-list@tuxmaker.boeblingen.de.ibm.com>
Cc: kvm@vger.kernel.org, linux-s390@vger.kernel.org,
imbrenda@linux.ibm.com, thuth@redhat.com, seiden@linux.ibm.com,
nrb@linux.ibm.com, scgl@linux.ibm.com
Subject: [kvm-unit-tests PATCH v2 2/8] s390x: uv-host: Add uninitialized UV tests
Date: Wed, 6 Jul 2022 06:40:18 +0000 [thread overview]
Message-ID: <20220706064024.16573-3-frankja@linux.ibm.com> (raw)
In-Reply-To: <20220706064024.16573-1-frankja@linux.ibm.com>
Let's also test for rc 0x3
Signed-off-by: Janosch Frank <frankja@linux.ibm.com>
Reviewed-by: Nico Boehr <nrb@linux.ibm.com>
---
s390x/uv-host.c | 79 +++++++++++++++++++++++++++++++++++++++++++++++--
1 file changed, 77 insertions(+), 2 deletions(-)
diff --git a/s390x/uv-host.c b/s390x/uv-host.c
index 983cb4a1..5aeacb42 100644
--- a/s390x/uv-host.c
+++ b/s390x/uv-host.c
@@ -101,6 +101,25 @@ static void test_priv(void)
report_prefix_pop();
}
+static void test_uv_uninitialized(void)
+{
+ struct uv_cb_header uvcb = {};
+ int i;
+
+ report_prefix_push("uninitialized");
+
+ for (i = 0; cmds[i].name; i++) {
+ if (cmds[i].cmd == UVC_CMD_INIT_UV)
+ continue;
+ expect_pgm_int();
+ uvcb.cmd = cmds[i].cmd;
+ uvcb.len = cmds[i].len;
+ uv_call_once(0, (uint64_t)&uvcb);
+ report(uvcb.rc == UVC_RC_INV_STATE, "%s", cmds[i].name);
+ }
+ report_prefix_pop();
+}
+
static void test_config_destroy(void)
{
int rc;
@@ -468,13 +487,68 @@ static void test_invalid(void)
report_prefix_pop();
}
+static void setup_test_clear(void)
+{
+ unsigned long vsize;
+ int rc;
+
+ uvcb_cgc.header.cmd = UVC_CMD_CREATE_SEC_CONF;
+ uvcb_cgc.header.len = sizeof(uvcb_cgc);
+
+ uvcb_cgc.guest_stor_origin = 0;
+ uvcb_cgc.guest_stor_len = 42 * (1UL << 20);
+ vsize = uvcb_qui.conf_base_virt_stor_len +
+ ((uvcb_cgc.guest_stor_len / (1UL << 20)) * uvcb_qui.conf_virt_var_stor_len);
+
+ uvcb_cgc.conf_base_stor_origin = (uint64_t)memalign(PAGE_SIZE * 4, uvcb_qui.conf_base_phys_stor_len);
+ uvcb_cgc.conf_var_stor_origin = (uint64_t)memalign(PAGE_SIZE, vsize);
+ uvcb_cgc.guest_asce = (uint64_t)memalign(PAGE_SIZE, 4 * PAGE_SIZE) | ASCE_DT_SEGMENT | REGION_TABLE_LENGTH | ASCE_P;
+ uvcb_cgc.guest_sca = (uint64_t)memalign(PAGE_SIZE * 4, PAGE_SIZE * 4);
+
+ rc = uv_call(0, (uint64_t)&uvcb_cgc);
+ assert(rc == 0);
+
+ uvcb_csc.header.len = sizeof(uvcb_csc);
+ uvcb_csc.header.cmd = UVC_CMD_CREATE_SEC_CPU;
+ uvcb_csc.guest_handle = uvcb_cgc.guest_handle;
+ uvcb_csc.stor_origin = (unsigned long)memalign(PAGE_SIZE, uvcb_qui.cpu_stor_len);
+ uvcb_csc.state_origin = (unsigned long)memalign(PAGE_SIZE, PAGE_SIZE);
+
+ rc = uv_call(0, (uint64_t)&uvcb_csc);
+ assert(rc == 0);
+}
+
static void test_clear(void)
{
- uint64_t *tmp = (void *)uvcb_init.stor_origin;
+ uint64_t *tmp;
+
+ report_prefix_push("load normal reset");
+
+ /*
+ * Setup a config and a cpu so we can check if a diag308 reset
+ * clears the donated memory and makes the pages unsecure.
+ */
+ setup_test_clear();
diag308_load_reset(1);
sclp_console_setup();
- report(!*tmp, "memory cleared after reset 1");
+
+ tmp = (void *)uvcb_init.stor_origin;
+ report(!*tmp, "uv init donated memory cleared");
+
+ tmp = (void *)uvcb_cgc.conf_base_stor_origin;
+ report(!*tmp, "config base donated memory cleared");
+
+ tmp = (void *)uvcb_cgc.conf_base_stor_origin;
+ report(!*tmp, "config variable donated memory cleared");
+
+ tmp = (void *)uvcb_csc.stor_origin;
+ report(!*tmp, "cpu donated memory cleared after reset 1");
+
+ /* Check if uninitialized after reset */
+ test_uv_uninitialized();
+
+ report_prefix_pop();
}
static void setup_vmem(void)
@@ -505,6 +579,7 @@ int main(void)
test_priv();
test_invalid();
+ test_uv_uninitialized();
test_query();
test_init();
--
2.34.1
next prev parent reply other threads:[~2022-07-06 6:41 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-06 6:40 [kvm-unit-tests PATCH v2 0/8] s390x: uv-host: Access check extensions and improvements Janosch Frank
2022-07-06 6:40 ` [kvm-unit-tests PATCH v2 1/8] s390x: uv-host: Add access checks for donated memory Janosch Frank
2022-07-06 16:33 ` Claudio Imbrenda
2022-07-07 8:16 ` Janosch Frank
2022-07-07 9:19 ` Claudio Imbrenda
2022-07-25 13:08 ` [kvm-unit-tests PATCH v3] " Janosch Frank
2022-08-03 7:22 ` Nico Boehr
2022-08-03 9:46 ` Claudio Imbrenda
2022-08-03 11:18 ` Janosch Frank
2022-08-11 13:18 ` [kvm-unit-tests PATCH v4] " Janosch Frank
2022-08-11 14:17 ` Claudio Imbrenda
2022-08-11 15:00 ` [kvm-unit-tests PATCH v5] " Janosch Frank
2022-08-11 15:15 ` Claudio Imbrenda
2022-07-07 8:11 ` [kvm-unit-tests PATCH v2 1/8] " Steffen Eiden
2022-07-07 8:20 ` Janosch Frank
2022-07-06 6:40 ` Janosch Frank [this message]
2022-07-08 9:10 ` [kvm-unit-tests PATCH v2 2/8] s390x: uv-host: Add uninitialized UV tests Steffen Eiden
2022-07-06 6:40 ` [kvm-unit-tests PATCH v2 3/8] s390x: uv-host: Test uv immediate parameter Janosch Frank
2022-07-08 10:02 ` Steffen Eiden
2022-07-06 6:40 ` [kvm-unit-tests PATCH v2 4/8] s390x: uv-host: Add access exception test Janosch Frank
2022-07-06 6:40 ` [kvm-unit-tests PATCH v2 5/8] s390x: uv-host: Add a set secure config parameters test function Janosch Frank
2022-07-06 6:40 ` [kvm-unit-tests PATCH v2 6/8] s390x: uv-host: Remove duplicated + Janosch Frank
2022-07-06 6:40 ` [kvm-unit-tests PATCH v2 7/8] s390x: uv-host: Fence against being run as a PV guest Janosch Frank
2022-07-08 10:08 ` Steffen Eiden
2022-07-06 6:40 ` [kvm-unit-tests PATCH v2 8/8] s390x: uv-host: Fix init storage origin and length check Janosch Frank
2022-07-08 10:19 ` Steffen Eiden
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=20220706064024.16573-3-frankja@linux.ibm.com \
--to=frankja@linux.ibm.com \
--cc=imbrenda@linux.ibm.com \
--cc=kvm390-list@tuxmaker.boeblingen.de.ibm.com \
--cc=kvm@vger.kernel.org \
--cc=linux-s390@vger.kernel.org \
--cc=nrb@linux.ibm.com \
--cc=scgl@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