diff options
author | Paolo Bonzini <pbonzini@redhat.com> | 2019-11-18 15:16:46 +0300 |
---|---|---|
committer | Paolo Bonzini <pbonzini@redhat.com> | 2019-11-18 15:16:46 +0300 |
commit | fe289ebb65eee604f08fd1f8ab33ded3e955a7df (patch) | |
tree | 786ded63b34d0c62bbe0821e1dbf5860248f6001 /tools/testing | |
parent | 7ee30bc132c683d06a6d9e360e39e483e3990708 (diff) | |
parent | c7b7de63124645089ccf9900b9e5ea08059ccae0 (diff) | |
download | linux-fe289ebb65eee604f08fd1f8ab33ded3e955a7df.tar.xz |
Merge tag 'kvm-s390-next-5.5-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into HEAD
KVM: s390: small fixes and enhancements
- selftest improvements
- yield improvements
- cleanups
Diffstat (limited to 'tools/testing')
-rw-r--r-- | tools/testing/selftests/kvm/s390x/sync_regs_test.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/tools/testing/selftests/kvm/s390x/sync_regs_test.c b/tools/testing/selftests/kvm/s390x/sync_regs_test.c index d5290b4ad636..b705637ca14b 100644 --- a/tools/testing/selftests/kvm/s390x/sync_regs_test.c +++ b/tools/testing/selftests/kvm/s390x/sync_regs_test.c @@ -25,12 +25,15 @@ static void guest_code(void) { - register u64 stage asm("11") = 0; - - for (;;) { - GUEST_SYNC(0); - asm volatile ("ahi %0,1" : : "r"(stage)); - } + /* + * We embed diag 501 here instead of doing a ucall to avoid that + * the compiler has messed with r11 at the time of the ucall. + */ + asm volatile ( + "0: diag 0,0,0x501\n" + " ahi 11,1\n" + " j 0b\n" + ); } #define REG_COMPARE(reg) \ |