[kvm-unit-tests PATCH 4/4] lib: s390x: sie: Move sie function into library

Janosch Frank
2021-07-29T13:48:28Z

Time to deduplicate more code.

Signed-off-by: Janosch Frank <frankja@linux.ibm.com>
---
lib/s390x/sie.c | 13 +++++++++++++
lib/s390x/sie.h | 1 +
s390x/mvpg-sie.c | 13 -------------
s390x/sie.c | 17 -----------------
4 files changed, 14 insertions(+), 30 deletions(-)

diff --git a/lib/s390x/sie.c b/lib/s390x/sie.c
index ec0c4867..d971e825 100644
--- a/lib/s390x/sie.c
+++ b/lib/s390x/sie.c
@@ -43,6 +43,19 @@ void sie_handle_validity(struct vm *vm)
validity_expected = false;
}

+void sie(struct vm *vm)
+{
+ /* Reset icptcode so we don't trip over it below */
+ vm->sblk->icptcode = 0;
+
+ while (vm->sblk->icptcode == 0) {
+ sie64a(vm->sblk, &vm->save_area);
+ sie_handle_validity(vm);
+ }
+ vm->save_area.guest.grs[14] = vm->sblk->gg14;
+ vm->save_area.guest.grs[15] = vm->sblk->gg15;
+}
+
/* Initializes the struct vm members like the SIE control block. */
void sie_guest_create(struct vm *vm, uint64_t guest_mem, uint64_t guest_mem_len)
{
diff --git a/lib/s390x/sie.h b/lib/s390x/sie.h
index 946bd164..ca514ef3 100644
--- a/lib/s390x/sie.h
+++ b/lib/s390x/sie.h
@@ -198,6 +198,7 @@ struct vm {
extern void sie_entry(void);
extern void sie_exit(void);
extern void sie64a(struct kvm_s390_sie_block *sblk, struct vm_save_area *save_area);
+void sie(struct vm *vm);
void sie_expect_validity(void);
void sie_check_validity(uint16_t vir_exp);
void sie_handle_validity(struct vm *vm);
diff --git a/s390x/mvpg-sie.c b/s390x/mvpg-sie.c
index 71ae4f88..70d2fcfa 100644
--- a/s390x/mvpg-sie.c
+++ b/s390x/mvpg-sie.c
@@ -32,19 +32,6 @@ extern const char _binary_s390x_snippets_c_mvpg_snippet_gbin_start[];
extern const char _binary_s390x_snippets_c_mvpg_snippet_gbin_end[];
int binary_size;

-static void sie(struct vm *vm)
-{
- /* Reset icptcode so we don't trip over it below */
- vm->sblk->icptcode = 0;
-
- while (vm->sblk->icptcode == 0) {
- sie64a(vm->sblk, &vm->save_area);
- sie_handle_validity(vm);
- }
- vm->save_area.guest.grs[14] = vm->sblk->gg14;
- vm->save_area.guest.grs[15] = vm->sblk->gg15;
-}
-
static void test_mvpg_pei(void)
{
uint64_t **pei_dst = (uint64_t **)((uintptr_t) vm.sblk + 0xc0);
diff --git a/s390x/sie.c b/s390x/sie.c
index 9cb9b055..ed2c3263 100644
--- a/s390x/sie.c
+++ b/s390x/sie.c
@@ -24,22 +24,6 @@ static u8 *guest;
static u8 *guest_instr;
static struct vm vm;

-
-static void sie(struct vm *vm)
-{
- while (vm->sblk->icptcode == 0) {
- sie64a(vm->sblk, &vm->save_area);
- sie_handle_validity(vm);
- }
- vm->save_area.guest.grs[14] = vm->sblk->gg14;
- vm->save_area.guest.grs[15] = vm->sblk->gg15;
-}
-
-static void sblk_cleanup(struct vm *vm)
-{
- vm->sblk->icptcode = 0;
-}
-
static void test_diag(u32 instr)
{
vm.sblk->gpsw.addr = PAGE_SIZE * 2;
@@ -51,7 +35,6 @@ static void test_diag(u32 instr)
report(vm.sblk->icptcode == ICPT_INST &&
vm.sblk->ipa == instr >> 16 && vm.sblk->ipb == instr << 16,
"Intercept data");
- sblk_cleanup(&vm);
}

static struct {
--
2.30.2