| Message ID | 20240709125704.61312-9-schlameuss@linux.ibm.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | selftests: kvm: s390: Add s390x ucontrol selftests | expand |
On Tue, 9 Jul 2024 14:57:03 +0200 Christoph Schlameuss <schlameuss@linux.ibm.com> wrote: > Add a test case manipulating s390 storage keys from within the ucontrol > VM. > > Signed-off-by: Christoph Schlameuss <schlameuss@linux.ibm.com> > --- > .../selftests/kvm/s390x/ucontrol_test.c | 83 +++++++++++++++++++ > 1 file changed, 83 insertions(+) > > diff --git a/tools/testing/selftests/kvm/s390x/ucontrol_test.c b/tools/testing/selftests/kvm/s390x/ucontrol_test.c > index 4438cfc8bf53..64ad31f667e3 100644 > --- a/tools/testing/selftests/kvm/s390x/ucontrol_test.c > +++ b/tools/testing/selftests/kvm/s390x/ucontrol_test.c > @@ -81,6 +81,32 @@ asm("test_mem_pgm:\n" > " j 0b\n" > ); > > +/* Test program manipulating storage keys */ > +extern char test_skey_pgm[]; > +asm("test_skey_pgm:\n" > + "xgr %r0, %r0\n" > + > + "0:\n" > + " ahi %r0,1\n" > + " st %r1,0(%r5,%r6)\n" > + > + " iske %r1,%r6\n" > + " ahi %r0,1\n" > + " diag 0,0,0x44\n" > + > + " sske %r1,%r6\n" > + " iske %r1,%r6\n" > + " ahi %r0,1\n" > + " diag 0,0,0x44\n" > + > + " rrbe %r1,%r6\n" > + " iske %r1,%r6\n" > + " ahi %r0,1\n" > + " diag 0,0,0x44\n" > + > + " j 0b\n" > +); > + > FIXTURE(uc_kvm) > { > struct kvm_s390_sie_block *sie_block; > @@ -389,6 +415,63 @@ static void uc_assert_diag44(FIXTURE_DATA(uc_kvm) * self) > TEST_ASSERT_EQ(0x440000, sie_block->ipb); > } > > +TEST_F(uc_kvm, uc_skey) > +{ > + u64 test_vaddr = self->base_gpa + VM_MEM_SIZE - (SZ_1M / 2); > + struct kvm_sync_regs *sync_regs = &self->run->s.regs; > + struct kvm_s390_sie_block *sie_block = self->sie_block; > + struct kvm_run *run = self->run; > + u8 skeyvalue = 0x34; > + > + init_st_pt(self); > + > + /* copy test_skey_pgm to code_hva / code_gpa */ > + TH_LOG("copy code %p to vm mapped memory %p / %p", > + &test_skey_pgm, (void *)self->code_hva, (void *)self->code_gpa); > + memcpy((void *)self->code_hva, &test_skey_pgm, PAGE_SIZE); > + > + /* set register content for test_skey_pgm to access not mapped memory*/ missing space before */ > + sync_regs->gprs[1] = skeyvalue; > + sync_regs->gprs[5] = self->base_gpa; > + sync_regs->gprs[6] = test_vaddr; > + run->kvm_dirty_regs |= KVM_SYNC_GPRS; > + > + run->kvm_dirty_regs |= KVM_SYNC_CRS; > + TH_LOG("set CR0 to 0x%llx", sync_regs->crs[0]); > + > + self->sie_block->ictl |= ICTL_OPEREXC | ICTL_PINT; > + self->sie_block->cpuflags &= ~CPUSTAT_KSS; > + run->psw_mask = 0x0400000180000000ULL; /* DAT enabled + 64 bit mode */ > + run->psw_addr = self->code_gpa; > + ASSERT_EQ(0, uc_run_once(self)); > + ASSERT_EQ(true, uc_handle_exit(self)); > + ASSERT_EQ(0, sync_regs->gprs[0]); > + ASSERT_EQ(13, run->exit_reason); can you use macros here instead of magic values? > + ASSERT_EQ(40, sie_block->icptcode); same here > + > + ASSERT_EQ(0, uc_run_once(self)); > + ASSERT_EQ(false, uc_handle_exit(self)); > + ASSERT_EQ(2, sync_regs->gprs[0]); > + ASSERT_EQ(0x06, sync_regs->gprs[1]); > + uc_assert_diag44(self); > + > + sync_regs->gprs[1] = skeyvalue; > + run->kvm_dirty_regs |= KVM_SYNC_GPRS; > + ASSERT_EQ(0, uc_run_once(self)); > + ASSERT_EQ(false, uc_handle_exit(self)); > + ASSERT_EQ(3, sync_regs->gprs[0]); > + ASSERT_EQ(skeyvalue, sync_regs->gprs[1]); > + uc_assert_diag44(self); > + > + sync_regs->gprs[1] = skeyvalue; > + run->kvm_dirty_regs |= KVM_SYNC_GPRS; > + ASSERT_EQ(0, uc_run_once(self)); > + ASSERT_EQ(false, uc_handle_exit(self)); > + ASSERT_EQ(4, sync_regs->gprs[0]); > + ASSERT_EQ(skeyvalue & 0xfb, sync_regs->gprs[1]); > + uc_assert_diag44(self); > +} > + > TEST_F(uc_kvm, uc_map_unmap) > { > struct kvm_sync_regs *sync_regs = &self->run->s.regs;
On Tue, 9 Jul 2024 19:06:58 +0200 Claudio Imbrenda <imbrenda@linux.ibm.com> wrote: > On Tue, 9 Jul 2024 14:57:03 +0200 > Christoph Schlameuss <schlameuss@linux.ibm.com> wrote: > > > Add a test case manipulating s390 storage keys from within the ucontrol > > VM. > > > > Signed-off-by: Christoph Schlameuss <schlameuss@linux.ibm.com> > > --- > > .../selftests/kvm/s390x/ucontrol_test.c | 83 +++++++++++++++++++ > > 1 file changed, 83 insertions(+) > > [...] > > + /* set register content for test_skey_pgm to access not mapped memory*/ > > missing space before */ > Fixing... > > + sync_regs->gprs[1] = skeyvalue; > > + sync_regs->gprs[5] = self->base_gpa; > > + sync_regs->gprs[6] = test_vaddr; > > + run->kvm_dirty_regs |= KVM_SYNC_GPRS; > > + > > + run->kvm_dirty_regs |= KVM_SYNC_CRS; > > + TH_LOG("set CR0 to 0x%llx", sync_regs->crs[0]); > > + > > + self->sie_block->ictl |= ICTL_OPEREXC | ICTL_PINT; > > + self->sie_block->cpuflags &= ~CPUSTAT_KSS; > > + run->psw_mask = 0x0400000180000000ULL; /* DAT enabled + 64 bit mode */ > > + run->psw_addr = self->code_gpa; > > + ASSERT_EQ(0, uc_run_once(self)); > > + ASSERT_EQ(true, uc_handle_exit(self)); > > + ASSERT_EQ(0, sync_regs->gprs[0]); > > + ASSERT_EQ(13, run->exit_reason); > > can you use macros here instead of magic values? > > > + ASSERT_EQ(40, sie_block->icptcode); > > same here > Yes, I should have done that from the beginning. [...]
diff --git a/tools/testing/selftests/kvm/s390x/ucontrol_test.c b/tools/testing/selftests/kvm/s390x/ucontrol_test.c index 4438cfc8bf53..64ad31f667e3 100644 --- a/tools/testing/selftests/kvm/s390x/ucontrol_test.c +++ b/tools/testing/selftests/kvm/s390x/ucontrol_test.c @@ -81,6 +81,32 @@ asm("test_mem_pgm:\n" " j 0b\n" ); +/* Test program manipulating storage keys */ +extern char test_skey_pgm[]; +asm("test_skey_pgm:\n" + "xgr %r0, %r0\n" + + "0:\n" + " ahi %r0,1\n" + " st %r1,0(%r5,%r6)\n" + + " iske %r1,%r6\n" + " ahi %r0,1\n" + " diag 0,0,0x44\n" + + " sske %r1,%r6\n" + " iske %r1,%r6\n" + " ahi %r0,1\n" + " diag 0,0,0x44\n" + + " rrbe %r1,%r6\n" + " iske %r1,%r6\n" + " ahi %r0,1\n" + " diag 0,0,0x44\n" + + " j 0b\n" +); + FIXTURE(uc_kvm) { struct kvm_s390_sie_block *sie_block; @@ -389,6 +415,63 @@ static void uc_assert_diag44(FIXTURE_DATA(uc_kvm) * self) TEST_ASSERT_EQ(0x440000, sie_block->ipb); } +TEST_F(uc_kvm, uc_skey) +{ + u64 test_vaddr = self->base_gpa + VM_MEM_SIZE - (SZ_1M / 2); + struct kvm_sync_regs *sync_regs = &self->run->s.regs; + struct kvm_s390_sie_block *sie_block = self->sie_block; + struct kvm_run *run = self->run; + u8 skeyvalue = 0x34; + + init_st_pt(self); + + /* copy test_skey_pgm to code_hva / code_gpa */ + TH_LOG("copy code %p to vm mapped memory %p / %p", + &test_skey_pgm, (void *)self->code_hva, (void *)self->code_gpa); + memcpy((void *)self->code_hva, &test_skey_pgm, PAGE_SIZE); + + /* set register content for test_skey_pgm to access not mapped memory*/ + sync_regs->gprs[1] = skeyvalue; + sync_regs->gprs[5] = self->base_gpa; + sync_regs->gprs[6] = test_vaddr; + run->kvm_dirty_regs |= KVM_SYNC_GPRS; + + run->kvm_dirty_regs |= KVM_SYNC_CRS; + TH_LOG("set CR0 to 0x%llx", sync_regs->crs[0]); + + self->sie_block->ictl |= ICTL_OPEREXC | ICTL_PINT; + self->sie_block->cpuflags &= ~CPUSTAT_KSS; + run->psw_mask = 0x0400000180000000ULL; /* DAT enabled + 64 bit mode */ + run->psw_addr = self->code_gpa; + ASSERT_EQ(0, uc_run_once(self)); + ASSERT_EQ(true, uc_handle_exit(self)); + ASSERT_EQ(0, sync_regs->gprs[0]); + ASSERT_EQ(13, run->exit_reason); + ASSERT_EQ(40, sie_block->icptcode); + + ASSERT_EQ(0, uc_run_once(self)); + ASSERT_EQ(false, uc_handle_exit(self)); + ASSERT_EQ(2, sync_regs->gprs[0]); + ASSERT_EQ(0x06, sync_regs->gprs[1]); + uc_assert_diag44(self); + + sync_regs->gprs[1] = skeyvalue; + run->kvm_dirty_regs |= KVM_SYNC_GPRS; + ASSERT_EQ(0, uc_run_once(self)); + ASSERT_EQ(false, uc_handle_exit(self)); + ASSERT_EQ(3, sync_regs->gprs[0]); + ASSERT_EQ(skeyvalue, sync_regs->gprs[1]); + uc_assert_diag44(self); + + sync_regs->gprs[1] = skeyvalue; + run->kvm_dirty_regs |= KVM_SYNC_GPRS; + ASSERT_EQ(0, uc_run_once(self)); + ASSERT_EQ(false, uc_handle_exit(self)); + ASSERT_EQ(4, sync_regs->gprs[0]); + ASSERT_EQ(skeyvalue & 0xfb, sync_regs->gprs[1]); + uc_assert_diag44(self); +} + TEST_F(uc_kvm, uc_map_unmap) { struct kvm_sync_regs *sync_regs = &self->run->s.regs;
Add a test case manipulating s390 storage keys from within the ucontrol VM. Signed-off-by: Christoph Schlameuss <schlameuss@linux.ibm.com> --- .../selftests/kvm/s390x/ucontrol_test.c | 83 +++++++++++++++++++ 1 file changed, 83 insertions(+)