From: Janosch Frank <frankja@linux.ibm.com>
To: pbonzini@redhat.com
Cc: kvm@vger.kernel.org, frankja@linux.ibm.com, david@redhat.com,
borntraeger@de.ibm.com, cohuck@redhat.com,
linux-s390@vger.kernel.org, imbrenda@linux.ibm.com,
thuth@redhat.com
Subject: [kvm-unit-tests GIT PULL 3/9] s390x: uv: Add UV lib
Date: Wed, 26 May 2021 16:55:33 +0200 [thread overview]
Message-ID: <20210526145539.52008-4-frankja@linux.ibm.com> (raw)
In-Reply-To: <20210526145539.52008-1-frankja@linux.ibm.com>
Lets add a UV library to make checking the UV feature bit easier.
In the future this library file can take care of handling UV
initialization and UV guest creation.
Signed-off-by: Janosch Frank <frankja@linux.ibm.com>
Reviewed-by: Claudio Imbrenda <imbrenda@linux.ibm.com>
Reviewed-by: Cornelia Huck <cohuck@redhat.com>
Acked-by: Thomas Huth <thuth@redhat.com>
---
lib/s390x/asm/uv.h | 4 ++--
lib/s390x/io.c | 2 ++
lib/s390x/uv.c | 45 +++++++++++++++++++++++++++++++++++++++++++++
lib/s390x/uv.h | 10 ++++++++++
s390x/Makefile | 1 +
5 files changed, 60 insertions(+), 2 deletions(-)
create mode 100644 lib/s390x/uv.c
create mode 100644 lib/s390x/uv.h
diff --git a/lib/s390x/asm/uv.h b/lib/s390x/asm/uv.h
index 11f70a9f..b22cbaa8 100644
--- a/lib/s390x/asm/uv.h
+++ b/lib/s390x/asm/uv.h
@@ -9,8 +9,8 @@
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2.
*/
-#ifndef UV_H
-#define UV_H
+#ifndef ASM_S390X_UV_H
+#define ASM_S390X_UV_H
#define UVC_RC_EXECUTED 0x0001
#define UVC_RC_INV_CMD 0x0002
diff --git a/lib/s390x/io.c b/lib/s390x/io.c
index ef9f59e3..a4f1b113 100644
--- a/lib/s390x/io.c
+++ b/lib/s390x/io.c
@@ -14,6 +14,7 @@
#include <asm/facility.h>
#include <asm/sigp.h>
#include "sclp.h"
+#include "uv.h"
#include "smp.h"
extern char ipl_args[];
@@ -38,6 +39,7 @@ void setup(void)
sclp_facilities_setup();
sclp_console_setup();
sclp_memory_setup();
+ uv_setup();
smp_setup();
}
diff --git a/lib/s390x/uv.c b/lib/s390x/uv.c
new file mode 100644
index 00000000..0d8c141c
--- /dev/null
+++ b/lib/s390x/uv.c
@@ -0,0 +1,45 @@
+#include <libcflat.h>
+#include <bitops.h>
+#include <alloc.h>
+#include <alloc_page.h>
+#include <asm/page.h>
+#include <asm/arch_def.h>
+
+#include <asm/facility.h>
+#include <asm/uv.h>
+#include <uv.h>
+
+static struct uv_cb_qui uvcb_qui = {
+ .header.cmd = UVC_CMD_QUI,
+ .header.len = sizeof(uvcb_qui),
+};
+
+bool uv_os_is_guest(void)
+{
+ return test_facility(158) &&
+ uv_query_test_call(BIT_UVC_CMD_SET_SHARED_ACCESS) &&
+ uv_query_test_call(BIT_UVC_CMD_REMOVE_SHARED_ACCESS);
+}
+
+bool uv_os_is_host(void)
+{
+ return test_facility(158) && uv_query_test_call(BIT_UVC_CMD_INIT_UV);
+}
+
+bool uv_query_test_call(unsigned int nr)
+{
+ /* Query needs to be called first */
+ assert(uvcb_qui.header.rc);
+ assert(nr < BITS_PER_LONG * ARRAY_SIZE(uvcb_qui.inst_calls_list));
+
+ return test_bit_inv(nr, uvcb_qui.inst_calls_list);
+}
+
+int uv_setup(void)
+{
+ if (!test_facility(158))
+ return 0;
+
+ assert(!uv_call(0, (u64)&uvcb_qui));
+ return 1;
+}
diff --git a/lib/s390x/uv.h b/lib/s390x/uv.h
new file mode 100644
index 00000000..42608a96
--- /dev/null
+++ b/lib/s390x/uv.h
@@ -0,0 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+#ifndef UV_H
+#define UV_H
+
+bool uv_os_is_guest(void);
+bool uv_os_is_host(void);
+bool uv_query_test_call(unsigned int nr);
+int uv_setup(void);
+
+#endif /* UV_H */
diff --git a/s390x/Makefile b/s390x/Makefile
index b92de9c5..bbf177fa 100644
--- a/s390x/Makefile
+++ b/s390x/Makefile
@@ -67,6 +67,7 @@ cflatobjs += lib/s390x/vm.o
cflatobjs += lib/s390x/css_dump.o
cflatobjs += lib/s390x/css_lib.o
cflatobjs += lib/s390x/malloc_io.o
+cflatobjs += lib/s390x/uv.o
OBJDIRS += lib/s390x
--
2.31.1
next prev parent reply other threads:[~2021-05-26 14:55 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-26 14:55 [kvm-unit-tests GIT PULL 0/9] s390x update 2021-26-05 Janosch Frank
2021-05-26 14:55 ` [kvm-unit-tests GIT PULL 1/9] s390x: uv-guest: Add invalid share location test Janosch Frank
2021-05-26 14:55 ` [kvm-unit-tests GIT PULL 2/9] s390x: Add more Ultravisor command structure definitions Janosch Frank
2021-05-26 14:55 ` Janosch Frank [this message]
2021-05-26 14:55 ` [kvm-unit-tests GIT PULL 4/9] s390x: Test for share/unshare call support before using them Janosch Frank
2021-05-26 14:55 ` [kvm-unit-tests GIT PULL 5/9] s390x: uv-guest: Test invalid commands Janosch Frank
2021-05-26 14:55 ` [kvm-unit-tests GIT PULL 6/9] s390x: Add UV host test Janosch Frank
2021-05-26 14:55 ` [kvm-unit-tests GIT PULL 7/9] s390x: sclp: Only fetch read info byte 134 if cpu entries are above it Janosch Frank
2021-05-26 14:55 ` [kvm-unit-tests GIT PULL 8/9] lib: s390x: sclp: Extend feature probing Janosch Frank
2021-05-26 14:55 ` [kvm-unit-tests GIT PULL 9/9] s390x: cpumodel: FMT2 and FMT4 SCLP test Janosch Frank
2021-05-26 16:33 ` [kvm-unit-tests GIT PULL 0/9] s390x update 2021-26-05 Paolo Bonzini
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=20210526145539.52008-4-frankja@linux.ibm.com \
--to=frankja@linux.ibm.com \
--cc=borntraeger@de.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=pbonzini@redhat.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.