KVM: s390: Fix pfmf and conditional skey emulation
A message that is not in the archive (sent off-list or not yet received): [email protected]
Quoted 7 lines · Christian Borntraeger
Quoted 4 lines · David Hildenbrand
Quoted 2 lines · Christian Borntraeger
Please re-add the "Fixes" tag. While not relevant for stable, it might be relevant for backport.
Quoted 7 lines
Quoted 3 lines
Isn't that a potential endless loop in the pfmf handler? (!PFMF_SK)
If so, this should be stable no?
the patches made it in after 4.18 (for 4.19) so no stable if I got that right.
ahh right, missed that ...
Signature · 3 lines
Thanks, David / dhildenb
Christian Borntraeger
AppliedQuoted 7 lines · Janosch Frank
We should not return with a lock.
We also have to increase the address when we do page clearing.Signed-off-by Janosch Frank <[email protected]>---
I knew there were more instances...
Thanks applied.
Quoted 75 lines
--- arch/s390/kvm/priv.c | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-)arch/s390/kvm/priv.c +18
-12@@ -280,9 +280,11 @@ static int handle_iske(struct kvm_vcpu *vcpu) goto retry; } } -if (rc) -return kvm_s390_inject_program_int (vcpu,PGM_ADDRESSING );up_read (¤t->mm->mmap_sem); +if (rc == -EFAULT ) +return kvm_s390_inject_program_int (vcpu,PGM_ADDRESSING ); +if (rc <0 ) +return rc; vcpu->run->s.regs.gprs[reg1] &= ~0xff ; vcpu->run->s.regs.gprs[reg1] |= key;return 0 ;@@ -324,9 +326,11 @@ static int handle_rrbe(struct kvm_vcpu *vcpu) goto retry; } } -if (rc <0 ) -return kvm_s390_inject_program_int (vcpu,PGM_ADDRESSING );up_read (¤t->mm->mmap_sem); +if (rc == -EFAULT ) +return kvm_s390_inject_program_int (vcpu,PGM_ADDRESSING ); +if (rc <0 ) +return rc;kvm_s390_set_psw_cc (vcpu, rc);return 0 ; }@@ -390,12 +394,12 @@ static int handle_sske(struct kvm_vcpu *vcpu) FAULT_FLAG_WRITE, &unlocked); rc = !rc ? -EAGAIN : rc; } +up_read (¤t->mm->mmap_sem);if (rc == -EFAULT )return kvm_s390_inject_program_int (vcpu,PGM_ADDRESSING ); - -up_read (¤t->mm->mmap_sem); -if (rc >=0 ) - start +=PAGE_SIZE ; +if (rc <0 ) +return rc; + start +=PAGE_SIZE ; }if (m3 & (SSKE_MC |SSKE_MR )) {@@ -1002,13 +1006,15 @@ static int handle_pfmf(struct kvm_vcpu *vcpu) FAULT_FLAG_WRITE, &unlocked); rc = !rc ? -EAGAIN : rc; } +up_read (¤t->mm->mmap_sem);if (rc == -EFAULT )return kvm_s390_inject_program_int (vcpu,PGM_ADDRESSING ); - -up_read (¤t->mm->mmap_sem); -if (rc >=0 ) - start +=PAGE_SIZE ; +if (rc == -EAGAIN ) +continue ; +if (rc <0 ) +return rc; } + start +=PAGE_SIZE ; }if (vcpu->run->s.regs.gprs[reg1] &PFMF_FSC ) {if (psw_bits (vcpu->arch.sie_block->gpsw).eaba ==PSW_BITS_AMODE_64BIT ) {