| From 93f0534f01401ea1cdd7ae6a5706c766b0d4b4e5 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Mon, 24 Feb 2020 12:27:44 -0800 |
| Subject: KVM: nVMX: Consolidate nested MTF checks to helper function |
| |
| From: Oliver Upton <oupton@google.com> |
| |
| [ Upstream commit 212617dbb6bac2a21dec6ef7d6012d96bb6dbb5d ] |
| |
| commit 5ef8acbdd687 ("KVM: nVMX: Emulate MTF when performing |
| instruction emulation") introduced a helper to check the MTF |
| VM-execution control in vmcs12. Change pre-existing check in |
| nested_vmx_exit_reflected() to instead use the helper. |
| |
| Signed-off-by: Oliver Upton <oupton@google.com> |
| Reviewed-by: Krish Sadhukhan <krish.sadhukhan@oracle.com> |
| Reviewed-by: Miaohe Lin <linmiaohe@huawei.com> |
| Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| arch/x86/kvm/vmx/nested.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/arch/x86/kvm/vmx/nested.c b/arch/x86/kvm/vmx/nested.c |
| index eec7b2d93104c..b773989308015 100644 |
| --- a/arch/x86/kvm/vmx/nested.c |
| +++ b/arch/x86/kvm/vmx/nested.c |
| @@ -5618,7 +5618,7 @@ bool nested_vmx_exit_reflected(struct kvm_vcpu *vcpu, u32 exit_reason) |
| case EXIT_REASON_MWAIT_INSTRUCTION: |
| return nested_cpu_has(vmcs12, CPU_BASED_MWAIT_EXITING); |
| case EXIT_REASON_MONITOR_TRAP_FLAG: |
| - return nested_cpu_has(vmcs12, CPU_BASED_MONITOR_TRAP_FLAG); |
| + return nested_cpu_has_mtf(vmcs12); |
| case EXIT_REASON_MONITOR_INSTRUCTION: |
| return nested_cpu_has(vmcs12, CPU_BASED_MONITOR_EXITING); |
| case EXIT_REASON_PAUSE_INSTRUCTION: |
| -- |
| 2.20.1 |
| |
