diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2018-07-23 20:11:27 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2018-07-23 20:11:27 -0400 |
| commit | c4339516e340ff32e272611d66be1ed7312b76d0 (patch) | |
| tree | 8b0996c582d7fb4248339c26f59fe43f0ad4ef80 | |
| parent | ebb239eb8dc3b2538cd2354381c6f46d92de8293 (diff) | |
| download | longterm-queue-4.12-c4339516e340ff32e272611d66be1ed7312b76d0.tar.gz | |
kvm: drop patch n/a for 4.12
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/KVM-nVMX-Fix-EPT-switching-advertising.patch | 43 | ||||
| -rw-r--r-- | queue/series | 1 |
2 files changed, 0 insertions, 44 deletions
diff --git a/queue/KVM-nVMX-Fix-EPT-switching-advertising.patch b/queue/KVM-nVMX-Fix-EPT-switching-advertising.patch deleted file mode 100644 index 54ab168..0000000 --- a/queue/KVM-nVMX-Fix-EPT-switching-advertising.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 575b3a2cb439b03fd603ea77c73c76f3ed237596 Mon Sep 17 00:00:00 2001 -From: Wanpeng Li <wanpeng.li@hotmail.com> -Date: Thu, 19 Oct 2017 07:00:34 +0800 -Subject: [PATCH] KVM: nVMX: Fix EPT switching advertising -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -commit 575b3a2cb439b03fd603ea77c73c76f3ed237596 upstream. - -I can use vmxcap tool to observe "EPTP Switching yes" even if EPT is not -exposed to L1. - -EPT switching is advertised unconditionally since it is emulated, however, -it can be treated as an extended feature for EPT and it should not be -advertised if EPT itself is not exposed. This patch fixes it. - -Reviewed-by: David Hildenbrand <david@redhat.com> -Cc: Paolo Bonzini <pbonzini@redhat.com> -Cc: Radim Krčmář <rkrcmar@redhat.com> -Cc: Jim Mattson <jmattson@google.com> -Signed-off-by: Wanpeng Li <wanpeng.li@hotmail.com> -Signed-off-by: Radim Krčmář <rkrcmar@redhat.com> - -diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c -index 69d45734091f..dba0f6ad4e57 100644 ---- a/arch/x86/kvm/vmx.c -+++ b/arch/x86/kvm/vmx.c -@@ -2842,8 +2842,9 @@ static void nested_vmx_setup_ctls_msrs(struct vcpu_vmx *vmx) - * Advertise EPTP switching unconditionally - * since we emulate it - */ -- vmx->nested.nested_vmx_vmfunc_controls = -- VMX_VMFUNC_EPTP_SWITCHING; -+ if (enable_ept) -+ vmx->nested.nested_vmx_vmfunc_controls = -+ VMX_VMFUNC_EPTP_SWITCHING; - } - - /* --- -2.15.0 - diff --git a/queue/series b/queue/series index c191b6d..5cf6bfa 100644 --- a/queue/series +++ b/queue/series @@ -92,7 +92,6 @@ powerpc-perf-hv-24x7-Fix-incorrect-comparison-in-mem.patch powerpc-xmon-Check-before-calling-xive-functions.patch soc-mediatek-pwrap-fix-compiler-errors.patch ipv4-ipv4_default_advmss-should-use-route-mtu.patch -KVM-nVMX-Fix-EPT-switching-advertising.patch tty-fix-oops-when-rmmod-8250.patch dev-dax-fix-uninitialized-variable-build-warning.patch pinctrl-adi2-Fix-Kconfig-build-problem.patch |