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, linux-s390@vger.kernel.org,
imbrenda@linux.ibm.com, thuth@redhat.com
Subject: [kvm-unit-tests GIT PULL 16/17] lib: s390x: snippet.h: Add a few constants that will make our life easier
Date: Mon, 18 Oct 2021 14:26:34 +0200 [thread overview]
Message-ID: <20211018122635.53614-17-frankja@linux.ibm.com> (raw)
In-Reply-To: <20211018122635.53614-1-frankja@linux.ibm.com>
The variable names for the snippet objects are of gigantic length so
let's define a few macros to make them easier to read.
Also add a standard PSW which should be used to start the snippet.
Signed-off-by: Janosch Frank <frankja@linux.ibm.com>
Reviewed-by: Claudio Imbrenda <imbrenda@linux.ibm.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
---
lib/s390x/snippet.h | 34 ++++++++++++++++++++++++++++++++++
s390x/mvpg-sie.c | 13 ++++++-------
2 files changed, 40 insertions(+), 7 deletions(-)
create mode 100644 lib/s390x/snippet.h
diff --git a/lib/s390x/snippet.h b/lib/s390x/snippet.h
new file mode 100644
index 00000000..8e4765f8
--- /dev/null
+++ b/lib/s390x/snippet.h
@@ -0,0 +1,34 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+/*
+ * Snippet definitions
+ *
+ * Copyright IBM Corp. 2021
+ * Author: Janosch Frank <frankja@linux.ibm.com>
+ */
+
+#ifndef _S390X_SNIPPET_H_
+#define _S390X_SNIPPET_H_
+
+/* This macro cuts down the length of the pointers to snippets */
+#define SNIPPET_NAME_START(type, file) \
+ _binary_s390x_snippets_##type##_##file##_gbin_start
+#define SNIPPET_NAME_END(type, file) \
+ _binary_s390x_snippets_##type##_##file##_gbin_end
+
+/* Returns the length of the snippet */
+#define SNIPPET_LEN(type, file) \
+ ((uintptr_t)SNIPPET_NAME_END(type, file) - (uintptr_t)SNIPPET_NAME_START(type, file))
+
+/*
+ * C snippet instructions start at 0x4000 due to the prefix and the
+ * stack being before that. ASM snippets don't strictly need a stack
+ * but keeping the starting address the same means less code.
+ */
+#define SNIPPET_ENTRY_ADDR 0x4000
+
+/* Standard entry PSWs for snippets which can simply be copied into the guest PSW */
+static const struct psw snippet_psw = {
+ .mask = PSW_MASK_64,
+ .addr = SNIPPET_ENTRY_ADDR,
+};
+#endif
diff --git a/s390x/mvpg-sie.c b/s390x/mvpg-sie.c
index 5adcec1e..d526069d 100644
--- a/s390x/mvpg-sie.c
+++ b/s390x/mvpg-sie.c
@@ -19,6 +19,7 @@
#include <vm.h>
#include <sclp.h>
#include <sie.h>
+#include <snippet.h>
static u8 *guest;
static struct vm vm;
@@ -27,8 +28,8 @@ static uint8_t *src;
static uint8_t *dst;
static uint8_t *cmp;
-extern const char _binary_s390x_snippets_c_mvpg_snippet_gbin_start[];
-extern const char _binary_s390x_snippets_c_mvpg_snippet_gbin_end[];
+extern const char SNIPPET_NAME_START(c, mvpg_snippet)[];
+extern const char SNIPPET_NAME_END(c, mvpg_snippet)[];
int binary_size;
static void test_mvpg_pei(void)
@@ -77,10 +78,9 @@ static void test_mvpg_pei(void)
static void test_mvpg(void)
{
- int binary_size = ((uintptr_t)_binary_s390x_snippets_c_mvpg_snippet_gbin_end -
- (uintptr_t)_binary_s390x_snippets_c_mvpg_snippet_gbin_start);
+ int binary_size = SNIPPET_LEN(c, mvpg_snippet);
- memcpy(guest, _binary_s390x_snippets_c_mvpg_snippet_gbin_start, binary_size);
+ memcpy(guest, SNIPPET_NAME_START(c, mvpg_snippet), binary_size);
memset(src, 0x42, PAGE_SIZE);
memset(dst, 0x43, PAGE_SIZE);
sie(&vm);
@@ -96,8 +96,7 @@ static void setup_guest(void)
sie_guest_create(&vm, (uint64_t)guest, HPAGE_SIZE);
- vm.sblk->gpsw.addr = PAGE_SIZE * 4;
- vm.sblk->gpsw.mask = PSW_MASK_64;
+ vm.sblk->gpsw = snippet_psw;
vm.sblk->ictl = ICTL_OPEREXC | ICTL_PINT;
/* Enable MVPG interpretation as we want to test KVM and not ourselves */
vm.sblk->eca = ECA_MVPGI;
--
2.31.1
next prev parent reply other threads:[~2021-10-18 12:38 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-18 12:26 [kvm-unit-tests GIT PULL 00/17] s390x update 2021-10-18 Janosch Frank
2021-10-18 12:26 ` [kvm-unit-tests GIT PULL 01/17] s390x: uv-host: Explain why we set up the home space and remove the space change Janosch Frank
2021-10-18 12:26 ` [kvm-unit-tests GIT PULL 02/17] lib: s390x: Control register constant cleanup Janosch Frank
2021-10-18 12:26 ` [kvm-unit-tests GIT PULL 03/17] lib: s390x: Print addressing related exception information Janosch Frank
2021-10-18 12:26 ` [kvm-unit-tests GIT PULL 04/17] s390x: skey: Test for ADDRESSING exceptions Janosch Frank
2021-10-18 12:26 ` [kvm-unit-tests GIT PULL 05/17] s390x: mvpg-sie: Remove unused variable Janosch Frank
2021-10-18 12:26 ` [kvm-unit-tests GIT PULL 06/17] s390x: uv: Tolerate 0x100 query return code Janosch Frank
2021-10-18 12:26 ` [kvm-unit-tests GIT PULL 07/17] s390x: uv-host: Fence a destroy cpu test on z15 Janosch Frank
2021-10-18 12:26 ` [kvm-unit-tests GIT PULL 08/17] lib: s390x: uv: Fix share return value and print Janosch Frank
2021-10-18 12:26 ` [kvm-unit-tests GIT PULL 09/17] lib: s390x: uv: Add UVC_ERR_DEBUG switch Janosch Frank
2021-10-18 12:26 ` [kvm-unit-tests GIT PULL 10/17] lib: s390x: Add access key argument to tprot Janosch Frank
2021-10-18 12:26 ` [kvm-unit-tests GIT PULL 11/17] lib: s390x: Print PGM code as hex Janosch Frank
2021-10-18 12:26 ` [kvm-unit-tests GIT PULL 12/17] s390x: Add sthyi cc==0 r2+1 verification Janosch Frank
2021-10-18 12:26 ` [kvm-unit-tests GIT PULL 13/17] s390x: snippets: Set stackptr and stacktop in cstart.S Janosch Frank
2021-10-18 12:26 ` [kvm-unit-tests GIT PULL 14/17] s390x: snippets: Define all things that are needed to link the libc Janosch Frank
2021-10-18 12:26 ` [kvm-unit-tests GIT PULL 15/17] lib: s390x: Fix PSW constant Janosch Frank
2021-10-18 12:26 ` Janosch Frank [this message]
2021-10-18 12:26 ` [kvm-unit-tests GIT PULL 17/17] lib: s390x: Fix copyright message Janosch Frank
2021-10-18 15:31 ` [kvm-unit-tests GIT PULL 00/17] s390x update 2021-10-18 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=20211018122635.53614-17-frankja@linux.ibm.com \
--to=frankja@linux.ibm.com \
--cc=borntraeger@de.ibm.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 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).