redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

selftests: KVM: s390: fix early guest crash

Browse source 
The guest crashes very early due to changes in the control registers
used by dynamic address translation. Let us use different registers
that will not crash the guest.

Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Christian Borntraeger 2020-03-10 09:01:40 -04:00 committed by Paolo Bonzini
parent 94c4b76b88
commit 41cbed5b07
1 changed files with 13 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
tools/testing/selftests/kvm/s390x/resets.c
View file

@ -23,25 +23,24 @@ struct kvm_run *run;
struct kvm_sync_regs *regs; struct kvm_sync_regs *regs;
static uint64_t regs_null[16]; static uint64_t regs_null[16];
static uint64_t crs[16] = { 0x40000ULL,
0x42000ULL,
0, 0, 0, 0, 0,
0x43000ULL,
0, 0, 0, 0, 0,
0x44000ULL,
0, 0
};
static void guest_code_initial(void) static void guest_code_initial(void)
{ {
/* Round toward 0 */ /* set several CRs to "safe" value */
uint32_t fpc = 0x11; unsigned long cr2_59 = 0x10; /* enable guarded storage */
unsigned long cr8_63 = 0x1; /* monitor mask = 1 */
unsigned long cr10 = 1; /* PER START */
unsigned long cr11 = -1; /* PER END */
/* Dirty registers */ /* Dirty registers */
asm volatile ( asm volatile (
" lctlg 0,15,%0\n" " lghi 2,0x11\n" /* Round toward 0 */
" sfpc %1\n" " sfpc 2\n" /* set fpc to !=0 */
: : "Q" (crs), "d" (fpc)); " lctlg 2,2,%0\n"
" lctlg 8,8,%1\n"
" lctlg 10,10,%2\n"
" lctlg 11,11,%3\n"
: : "m" (cr2_59), "m" (cr8_63), "m" (cr10), "m" (cr11) : "2");
GUEST_SYNC(0); GUEST_SYNC(0);
} }