From: Janosch Frank <frankja@linux.ibm.com>
To: kvm@vger.kernel.org
Cc: frankja@linux.ibm.com, david@redhat.com, cohuck@redhat.com,
linux-s390@vger.kernel.org, imbrenda@linux.ibm.com,
thuth@redhat.com
Subject: [kvm-unit-tests PATCH v2 4/6] s390x: Test for share/unshare call support before using them
Date: Mon, 10 May 2021 13:51:46 +0000 [thread overview]
Message-ID: <20210510135148.1904-5-frankja@linux.ibm.com> (raw)
In-Reply-To: <20210510135148.1904-1-frankja@linux.ibm.com>
Testing for facility only means the UV Call facility is available.
The UV will only indicate the share/unshare calls for a protected
guest 2, so let's also check that.
Signed-off-by: Janosch Frank <frankja@linux.ibm.com>
Reviewed-by: Claudio Imbrenda <imbrenda@linux.ibm.com>
---
lib/s390x/malloc_io.c | 5 +++--
s390x/uv-guest.c | 6 ++++++
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/lib/s390x/malloc_io.c b/lib/s390x/malloc_io.c
index 1dcf1691..78582eac 100644
--- a/lib/s390x/malloc_io.c
+++ b/lib/s390x/malloc_io.c
@@ -19,6 +19,7 @@
#include <alloc_page.h>
#include <asm/facility.h>
#include <bitops.h>
+#include <uv.h>
static int share_pages(void *p, int count)
{
@@ -47,7 +48,7 @@ void *alloc_io_mem(int size, int flags)
assert(size);
p = alloc_pages_flags(order, AREA_DMA31 | flags);
- if (!p || !test_facility(158))
+ if (!p || !uv_os_is_guest())
return p;
n = share_pages(p, 1 << order);
@@ -65,7 +66,7 @@ void free_io_mem(void *p, int size)
assert(IS_ALIGNED((uintptr_t)p, PAGE_SIZE));
- if (test_facility(158))
+ if (uv_os_is_guest())
unshare_pages(p, 1 << order);
free_pages(p);
}
diff --git a/s390x/uv-guest.c b/s390x/uv-guest.c
index 393d7f5c..e99029a7 100644
--- a/s390x/uv-guest.c
+++ b/s390x/uv-guest.c
@@ -16,6 +16,7 @@
#include <asm/facility.h>
#include <asm/uv.h>
#include <sclp.h>
+#include <uv.h>
static unsigned long page;
@@ -142,6 +143,11 @@ int main(void)
goto done;
}
+ if (!uv_os_is_guest()) {
+ report_skip("Not a protected guest");
+ goto done;
+ }
+
page = (unsigned long)alloc_page();
test_priv();
test_invalid();
--
2.30.2
next prev parent reply other threads:[~2021-05-10 13:56 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-10 13:51 [kvm-unit-tests PATCH v2 0/6] s390x: uv: Extend guest test and add host test Janosch Frank
2021-05-10 13:51 ` [kvm-unit-tests PATCH v2 1/6] s390x: uv-guest: Add invalid share location test Janosch Frank
2021-05-10 13:51 ` [kvm-unit-tests PATCH v2 2/6] s390x: Add more Ultravisor command structure definitions Janosch Frank
2021-05-11 16:02 ` Cornelia Huck
2021-05-10 13:51 ` [kvm-unit-tests PATCH v2 3/6] s390x: uv: Add UV lib Janosch Frank
2021-05-11 16:13 ` Cornelia Huck
2021-05-18 13:10 ` Janosch Frank
2021-05-10 13:51 ` Janosch Frank [this message]
2021-05-11 16:15 ` [kvm-unit-tests PATCH v2 4/6] s390x: Test for share/unshare call support before using them Cornelia Huck
2021-05-10 13:51 ` [kvm-unit-tests PATCH v2 5/6] s390x: uv-guest: Test invalid commands Janosch Frank
2021-05-11 16:22 ` Cornelia Huck
2021-05-11 17:12 ` Claudio Imbrenda
2021-05-10 13:51 ` [kvm-unit-tests PATCH v2 6/6] s390x: Add UV host test Janosch Frank
2021-05-11 16:25 ` Cornelia Huck
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=20210510135148.1904-5-frankja@linux.ibm.com \
--to=frankja@linux.ibm.com \
--cc=cohuck@redhat.com \
--cc=david@redhat.com \
--cc=imbrenda@linux.ibm.com \
--cc=kvm@vger.kernel.org \
--cc=linux-s390@vger.kernel.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;
as well as URLs for NNTP newsgroup(s).