Skip to content

Commit 2673cb6

Browse files
committed
Merge tag 'kvm-s390-master-5.7-3' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into HEAD
KVM: s390: Fix for running nested uner z/VM There are circumstances when running nested under z/VM that would trigger a WARN_ON_ONCE. Remove the WARN_ON_ONCE. Long term we certainly want to make this code more robust and flexible, but just returning instead of WARNING makes guest bootable again.
2 parents 495907e + 5615e74 commit 2673cb6

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

arch/s390/kvm/priv.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -626,10 +626,12 @@ static int handle_pqap(struct kvm_vcpu *vcpu)
626626
* available for the guest are AQIC and TAPQ with the t bit set
627627
* since we do not set IC.3 (FIII) we currently will only intercept
628628
* the AQIC function code.
629+
* Note: running nested under z/VM can result in intercepts for other
630+
* function codes, e.g. PQAP(QCI). We do not support this and bail out.
629631
*/
630632
reg0 = vcpu->run->s.regs.gprs[0];
631633
fc = (reg0 >> 24) & 0xff;
632-
if (WARN_ON_ONCE(fc != 0x03))
634+
if (fc != 0x03)
633635
return -EOPNOTSUPP;
634636

635637
/* PQAP instruction is allowed for guest kernel only */

0 commit comments

Comments
 (0)