Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 30b229bd authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 9e6bdaaa e769ece3

arch/s390/kvm/kvm-s390.c

+14 −7
Original line number Original line Diff line number Diff line
@@ -702,14 +702,25 @@ static int __vcpu_run(struct kvm_vcpu *vcpu) 
		return rc;

		return rc;





	vcpu->arch.sie_block->icptcode = 0;

	vcpu->arch.sie_block->icptcode = 0;

	preempt_disable();

	kvm_guest_enter();

	preempt_enable();

	VCPU_EVENT(vcpu, 6, "entering sie flags %x",

	VCPU_EVENT(vcpu, 6, "entering sie flags %x",

		   atomic_read(&vcpu->arch.sie_block->cpuflags));

		   atomic_read(&vcpu->arch.sie_block->cpuflags));

	trace_kvm_s390_sie_enter(vcpu,

	trace_kvm_s390_sie_enter(vcpu,

				 atomic_read(&vcpu->arch.sie_block->cpuflags));

				 atomic_read(&vcpu->arch.sie_block->cpuflags));



	/*

	 * As PF_VCPU will be used in fault handler, between guest_enter

	 * and guest_exit should be no uaccess.

	 */

	preempt_disable();

	kvm_guest_enter();

	preempt_enable();

	rc = sie64a(vcpu->arch.sie_block, vcpu->run->s.regs.gprs);

	rc = sie64a(vcpu->arch.sie_block, vcpu->run->s.regs.gprs);

	kvm_guest_exit();



	VCPU_EVENT(vcpu, 6, "exit sie icptcode %d",

		   vcpu->arch.sie_block->icptcode);

	trace_kvm_s390_sie_exit(vcpu, vcpu->arch.sie_block->icptcode);



	if (rc > 0)

	if (rc > 0)

		rc = 0;

		rc = 0;

	if (rc < 0) {

	if (rc < 0) {
@@ -721,10 +732,6 @@ static int __vcpu_run(struct kvm_vcpu *vcpu) 
			rc = kvm_s390_inject_program_int(vcpu, PGM_ADDRESSING);

			rc = kvm_s390_inject_program_int(vcpu, PGM_ADDRESSING);

		}

		}

	}

	}

	VCPU_EVENT(vcpu, 6, "exit sie icptcode %d",

		   vcpu->arch.sie_block->icptcode);

	trace_kvm_s390_sie_exit(vcpu, vcpu->arch.sie_block->icptcode);

	kvm_guest_exit();





	memcpy(&vcpu->run->s.regs.gprs[14], &vcpu->arch.sie_block->gg14, 16);

	memcpy(&vcpu->run->s.regs.gprs[14], &vcpu->arch.sie_block->gg14, 16);

	return rc;

	return rc;

arch/s390/kvm/priv.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -16,6 +16,7 @@ 
#include <linux/errno.h>

#include <linux/errno.h>

#include <linux/compat.h>

#include <linux/compat.h>

#include <asm/asm-offsets.h>

#include <asm/asm-offsets.h>

#include <asm/facility.h>

#include <asm/current.h>

#include <asm/current.h>

#include <asm/debug.h>

#include <asm/debug.h>

#include <asm/ebcdic.h>

#include <asm/ebcdic.h>
@@ -532,8 +533,7 @@ static int handle_pfmf(struct kvm_vcpu *vcpu) 
		return kvm_s390_inject_program_int(vcpu, PGM_SPECIFICATION);

		return kvm_s390_inject_program_int(vcpu, PGM_SPECIFICATION);





	/* Only provide non-quiescing support if the host supports it */

	/* Only provide non-quiescing support if the host supports it */

	if (vcpu->run->s.regs.gprs[reg1] & PFMF_NQ &&

	if (vcpu->run->s.regs.gprs[reg1] & PFMF_NQ && !test_facility(14))

	    S390_lowcore.stfl_fac_list & 0x00020000)

		return kvm_s390_inject_program_int(vcpu, PGM_SPECIFICATION);

		return kvm_s390_inject_program_int(vcpu, PGM_SPECIFICATION);





	/* No support for conditional-SSKE */

	/* No support for conditional-SSKE */