Re: FAILED: patch "[PATCH] KVM: nVMX: Don't emulate instructions in guest mode" failed to apply to 4.14-stable tree

[Sasha Levin <sashal@kernel.org>]

On Wed, Feb 26, 2020 at 07:17:49PM +0100, gregkh@linuxfoundation.org wrote:
>
>The patch below does not apply to the 4.14-stable tree.
>If someone wants it applied there, or to any other stable or longterm
>tree, then please email the backport, including the original git commit
>id to <stable@vger.kernel.org>.
>
>thanks,
>
>greg k-h
>
>------------------ original commit in Linus's tree ------------------
>
>From 07721feee46b4b248402133228235318199b05ec Mon Sep 17 00:00:00 2001
>From: Paolo Bonzini <pbonzini@redhat.com>
>Date: Tue, 4 Feb 2020 15:26:29 -0800
>Subject: [PATCH] KVM: nVMX: Don't emulate instructions in guest mode
>
>vmx_check_intercept is not yet fully implemented. To avoid emulating
>instructions disallowed by the L1 hypervisor, refuse to emulate
>instructions by default.
>
>Cc: stable@vger.kernel.org
>[Made commit, added commit msg - Oliver]
>Signed-off-by: Oliver Upton <oupton@google.com>
>Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
>
>diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c
>index dcca514ffd42..5801a86f9c24 100644
>--- a/arch/x86/kvm/vmx/vmx.c
>+++ b/arch/x86/kvm/vmx/vmx.c
>@@ -7164,7 +7164,7 @@ static int vmx_check_intercept(struct kvm_vcpu *vcpu,
> 	}
>
> 	/* TODO: check more intercepts... */
>-	return X86EMUL_CONTINUE;
>+	return X86EMUL_UNHANDLEABLE;
> }

File was renamed, and we don't have fb6d4d340e05 ("KVM: x86: emulate
RDPID") on 4.14 and prior. I've fixed it and queued this patch for
4.14-4.4.

-- 
Thanks,
Sasha