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

Commit a02689fe authored by Thomas Huth's avatar Thomas Huth Committed by Christian Borntraeger
Browse files

KVM: s390: Small fixes for the PFMF handler 



This patch includes two small fixes for the PFMF handler: First, the
start address for PFMF has to be masked according to the current
addressing mode, which is now done with kvm_s390_logical_to_effective().
Second, the protection exceptions have a lower priority than the
specification exceptions, so the check for low-address protection
has to be moved after the last spot where we inject a specification
exception.

Signed-off-by: default avatarThomas Huth <thuth@linux.vnet.ibm.com>
Reviewed-by: default avatarCornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
parent b65d6e17

arch/s390/kvm/priv.c

+7 −4
Original line number Diff line number Diff line
@@ -646,10 +646,7 @@ static int handle_pfmf(struct kvm_vcpu *vcpu) 
		return kvm_s390_inject_program_int(vcpu, PGM_SPECIFICATION);



	start = vcpu->run->s.regs.gprs[reg2] & PAGE_MASK;

	if (vcpu->run->s.regs.gprs[reg1] & PFMF_CF) {

		if (kvm_s390_check_low_addr_protection(vcpu, start))

			return kvm_s390_inject_prog_irq(vcpu, &vcpu->arch.pgm);

	}

	start = kvm_s390_logical_to_effective(vcpu, start);



	switch (vcpu->run->s.regs.gprs[reg1] & PFMF_FSC) {

	case 0x00000000:
@@ -665,6 +662,12 @@ static int handle_pfmf(struct kvm_vcpu *vcpu) 
	default:

		return kvm_s390_inject_program_int(vcpu, PGM_SPECIFICATION);

	}



	if (vcpu->run->s.regs.gprs[reg1] & PFMF_CF) {

		if (kvm_s390_check_low_addr_protection(vcpu, start))

			return kvm_s390_inject_prog_irq(vcpu, &vcpu->arch.pgm);

	}



	while (start < end) {

		unsigned long useraddr, abs_addr;