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

Commit 061e2fd1 authored by Joerg Roedel's avatar Joerg Roedel Committed by Marcelo Tosatti
Browse files

KVM: SVM: Fix wrong intercept masks on 32 bit 



This patch makes KVM on 32 bit SVM working again by
correcting the masks used for iret interception. With the
wrong masks the upper 32 bits of the intercepts are masked
out which leaves vmrun unintercepted. This is not legal on
svm and the vmrun fails.
Bug was introduced by commits 95ba8273 and 3cfc3092.

Cc: Jan Kiszka <jan.kiszka@siemens.com>
Cc: Gleb Natapov <gleb@redhat.com>
Cc: stable@kernel.org
Signed-off-by: default avatarJoerg Roedel <joerg.roedel@amd.com>
Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent 46a47b1e

arch/x86/kvm/svm.c

+4 −4
Original line number Diff line number Diff line
@@ -2067,7 +2067,7 @@ static int cpuid_interception(struct vcpu_svm *svm) 
static int iret_interception(struct vcpu_svm *svm)

{

	++svm->vcpu.stat.nmi_window_exits;

	svm->vmcb->control.intercept &= ~(1UL << INTERCEPT_IRET);

	svm->vmcb->control.intercept &= ~(1ULL << INTERCEPT_IRET);

	svm->vcpu.arch.hflags |= HF_IRET_MASK;

	return 1;

}
@@ -2479,7 +2479,7 @@ static void svm_inject_nmi(struct kvm_vcpu *vcpu) 


	svm->vmcb->control.event_inj = SVM_EVTINJ_VALID | SVM_EVTINJ_TYPE_NMI;

	vcpu->arch.hflags |= HF_NMI_MASK;

	svm->vmcb->control.intercept |= (1UL << INTERCEPT_IRET);

	svm->vmcb->control.intercept |= (1ULL << INTERCEPT_IRET);

	++vcpu->stat.nmi_injections;

}
@@ -2539,10 +2539,10 @@ static void svm_set_nmi_mask(struct kvm_vcpu *vcpu, bool masked) 


	if (masked) {

		svm->vcpu.arch.hflags |= HF_NMI_MASK;

		svm->vmcb->control.intercept |= (1UL << INTERCEPT_IRET);

		svm->vmcb->control.intercept |= (1ULL << INTERCEPT_IRET);

	} else {

		svm->vcpu.arch.hflags &= ~HF_NMI_MASK;

		svm->vmcb->control.intercept &= ~(1UL << INTERCEPT_IRET);

		svm->vmcb->control.intercept &= ~(1ULL << INTERCEPT_IRET);

	}

}