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

Commit 2b29a9fd authored by Dominik Dingel's avatar Dominik Dingel Committed by Paolo Bonzini
Browse files

KVM: s390: move kvm_guest_enter,exit closer to sie 



Any uaccess between guest_enter and guest_exit could trigger a page fault,
the page fault handler would handle it as a guest fault and translate a
user address as guest address.

Signed-off-by: default avatarDominik Dingel <dingel@linux.vnet.ibm.com>
Signed-off-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
CC: stable@vger.kernel.org
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 90db76e8

arch/s390/kvm/kvm-s390.c

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



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

	preempt_disable();

	kvm_guest_enter();

	preempt_enable();

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

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

	trace_kvm_s390_sie_enter(vcpu,

				 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);

	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)

		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);

		}

	}

	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);

	return rc;