Skip to contentSkip to conversation

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

PATCH [email protected] 2 participants 3 messages Feb 26, 2020 – Feb 27, 2020

Subsystems (3)
Stable branch x86 KVM x86
lore
Share & tools
lore

[email protected]

author maintainer
#0 lore raw

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 <[email protected]>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

From 07721feee46b4b248402133228235318199b05ec Mon Sep 17 00:00:00 2001
From: Paolo Bonzini <[email protected]>
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 [email protected]
[Made commit, added commit msg - Oliver]
Signed-off-by Oliver Upton <[email protected]>
Signed-off-by Paolo Bonzini <[email protected]>
arch/x86/kvm/vmx/vmx.c +1 -1
index dcca514ffd42..5801a86f9c24 100644
@@ -7164,7 +7164,7 @@ static int vmx_check_intercept(struct kvm_vcpu *vcpu,
 	}
 
 	/* TODO: check more intercepts... */
-	return X86EMUL_CONTINUE;
+	return X86EMUL_UNHANDLEABLE;
 }
 
 #ifdef CONFIG_X86_64
maintainer
#1 lore raw
Quoted 31 lines · On Wed, Feb 26, 2020 at 07:17:49PM +0100, [email protected] 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 <[email protected]>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

From 07721feee46b4b248402133228235318199b05ec Mon Sep 17 00:00:00 2001
From: Paolo Bonzini <[email protected]>
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 [email protected]
[Made commit, added commit msg - Oliver]
Signed-off-by Oliver Upton <[email protected]>
Signed-off-by Paolo Bonzini <[email protected]>
arch/x86/kvm/vmx/vmx.c +0 -0
index dcca514ffd42..5801a86f9c24 100644

arch/x86/kvm/vmx/vmx.c static int vmx_check_intercept(struct kvm_vcpu *vcpu, · line 7168

Quoted 6 lines
arch/x86/kvm/vmx/vmx.c +1 -1
@@ -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.

Signature · 2 lines
Thanks,
Sasha
author maintainer
#2 lore raw
Quoted 34 lines · Sasha Levin
Quoted 33 lines · On Wed, Feb 26, 2020 at 07:17:49PM +0100, [email protected] 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 <[email protected]>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

Quoted 1 line

From 07721feee46b4b248402133228235318199b05ec Mon Sep 17 00:00:00 2001

From: Paolo Bonzini <[email protected]>
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 [email protected]
[Made commit, added commit msg - Oliver]
Signed-off-by Oliver Upton <[email protected]>
Signed-off-by Paolo Bonzini <[email protected]>
arch/x86/kvm/vmx/vmx.c +0 -0
index dcca514ffd42..5801a86f9c24 100644
@@ -7164,7 +7164,7 @@ static int vmx_check_intercept(struct kvm_vcpu *vcpu,
 	}
Quoted 8 lines

arch/x86/kvm/vmx/vmx.c static int vmx_check_intercept(struct kvm_vcpu *vcpu, · line 7168

Quoted 4 lines
arch/x86/kvm/vmx/vmx.c +1 -1
 	/* 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 for this, and all of the other fixups.

greg k-h