KVM: s390: Small fixes for the PFMF handler
authorThomas Huth <thuth@linux.vnet.ibm.com>
Mon, 10 Nov 2014 14:59:32 +0000 (15:59 +0100)
committerChristian Borntraeger <borntraeger@de.ibm.com>
Fri, 28 Nov 2014 11:32:38 +0000 (12:32 +0100)
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: Thomas Huth <thuth@linux.vnet.ibm.com>
Reviewed-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
arch/s390/kvm/priv.c

index 9bde32f66eb5741f60809eaf3f98bb196767f34f..04f70fde9636994711692b8e6045b069fa703375 100644 (file)
@@ -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;