Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm
Pull s390 kvm fixes from Paolo Bonzini:
"Two fixes for s390"
* tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
KVM: s390: fix pfmf non-quiescing control handling
KVM: s390: move kvm_guest_enter,exit closer to sie
+16
-9
+14
-7
arch/s390/kvm/kvm-s390.c
+14
-7
arch/s390/kvm/kvm-s390.c
···
702
702
return rc;
703
703
704
704
vcpu->arch.sie_block->icptcode = 0;
705
-
preempt_disable();
706
-
kvm_guest_enter();
707
-
preempt_enable();
708
705
VCPU_EVENT(vcpu, 6, "entering sie flags %x",
709
706
atomic_read(&vcpu->arch.sie_block->cpuflags));
710
707
trace_kvm_s390_sie_enter(vcpu,
711
708
atomic_read(&vcpu->arch.sie_block->cpuflags));
709
+
710
+
/*
711
+
* As PF_VCPU will be used in fault handler, between guest_enter
712
+
* and guest_exit should be no uaccess.
713
+
*/
714
+
preempt_disable();
715
+
kvm_guest_enter();
716
+
preempt_enable();
712
717
rc = sie64a(vcpu->arch.sie_block, vcpu->run->s.regs.gprs);
718
+
kvm_guest_exit();
719
+
720
+
VCPU_EVENT(vcpu, 6, "exit sie icptcode %d",
721
+
vcpu->arch.sie_block->icptcode);
722
+
trace_kvm_s390_sie_exit(vcpu, vcpu->arch.sie_block->icptcode);
723
+
713
724
if (rc > 0)
714
725
rc = 0;
715
726
if (rc < 0) {
···
732
721
rc = kvm_s390_inject_program_int(vcpu, PGM_ADDRESSING);
733
722
}
734
723
}
735
-
VCPU_EVENT(vcpu, 6, "exit sie icptcode %d",
736
-
vcpu->arch.sie_block->icptcode);
737
-
trace_kvm_s390_sie_exit(vcpu, vcpu->arch.sie_block->icptcode);
738
-
kvm_guest_exit();
739
724
740
725
memcpy(&vcpu->run->s.regs.gprs[14], &vcpu->arch.sie_block->gg14, 16);
741
726
return rc;
+2
-2
arch/s390/kvm/priv.c
+2
-2
arch/s390/kvm/priv.c
···
16
16
#include <linux/errno.h>
17
17
#include <linux/compat.h>
18
18
#include <asm/asm-offsets.h>
19
+
#include <asm/facility.h>
19
20
#include <asm/current.h>
20
21
#include <asm/debug.h>
21
22
#include <asm/ebcdic.h>
···
533
532
return kvm_s390_inject_program_int(vcpu, PGM_SPECIFICATION);
534
533
535
534
/* Only provide non-quiescing support if the host supports it */
536
-
if (vcpu->run->s.regs.gprs[reg1] & PFMF_NQ &&
537
-
S390_lowcore.stfl_fac_list & 0x00020000)
535
+
if (vcpu->run->s.regs.gprs[reg1] & PFMF_NQ && !test_facility(14))
538
536
return kvm_s390_inject_program_int(vcpu, PGM_SPECIFICATION);
539
537
540
538
/* No support for conditional-SSKE */