KVM: s390: fix pfmf non-quiescing control handling (e769ece3) · Commits · 戴 / test

Fix the test within handle_pfmf() if the host has the NQ key-setting facility installed. Right now the code would incorrectly generate a program check in the guest if the NQ control bit for a pfmf request was set and if the host has the NQ key-setting facility installed. Signed-off-by:

Heiko Carstens <heiko.carstens@de.ibm.com> Reviewed-by:

Thomas Huth <thuth@linux.vnet.ibm.com> Signed-off-by:

Christian Borntraeger <borntraeger@de.ibm.com> Signed-off-by:

Paolo Bonzini <pbonzini@redhat.com>

arch/s390/kvm/priv.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -16,6 +16,7 @@
		#include <linux/errno.h>
		#include <linux/compat.h>
		#include <asm/asm-offsets.h>
		#include <asm/facility.h>
		#include <asm/current.h>
		#include <asm/debug.h>
		#include <asm/ebcdic.h>
		@@ -532,8 +533,7 @@ static int handle_pfmf(struct kvm_vcpu *vcpu)
		return kvm_s390_inject_program_int(vcpu, PGM_SPECIFICATION);

		/* Only provide non-quiescing support if the host supports it */
		if (vcpu->run->s.regs.gprs[reg1] & PFMF_NQ &&
		S390_lowcore.stfl_fac_list & 0x00020000)
		if (vcpu->run->s.regs.gprs[reg1] & PFMF_NQ && !test_facility(14))
		return kvm_s390_inject_program_int(vcpu, PGM_SPECIFICATION);

		/* No support for conditional-SSKE */

Admin message