Home Home > GIT Browse > SLE12-SP3-AZURE
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoerg Roedel <jroedel@suse.de>2019-02-21 14:55:42 +0100
committerJoerg Roedel <jroedel@suse.de>2019-02-21 14:59:02 +0100
commit07685c533c3001224246d62adc3fc16e74be406f (patch)
tree48dfb077c4b0f224e44fea757ac10e7dc1975101
parentc4cb00bab482edc077a0e2bd4470003b3f948350 (diff)
KVM: VMX: Missing part of upstream commit 904e14fb7cb9 (bsc#1124166).
-rw-r--r--patches.fixes/0001-KVM-VMX-Missing-part-of-upstream-commit-904e14fb7cb9.patch36
-rw-r--r--series.conf1
2 files changed, 37 insertions, 0 deletions
diff --git a/patches.fixes/0001-KVM-VMX-Missing-part-of-upstream-commit-904e14fb7cb9.patch b/patches.fixes/0001-KVM-VMX-Missing-part-of-upstream-commit-904e14fb7cb9.patch
new file mode 100644
index 0000000000..3a0c97175f
--- /dev/null
+++ b/patches.fixes/0001-KVM-VMX-Missing-part-of-upstream-commit-904e14fb7cb9.patch
@@ -0,0 +1,36 @@
+From c2c190f127d51fe1067687aa7bb1cd26613ba914 Mon Sep 17 00:00:00 2001
+From: Joerg Roedel <jroedel@suse.de>
+Date: Thu, 21 Feb 2019 14:49:58 +0100
+Subject: [PATCH] KVM: VMX: Missing part of upstream commit 904e14fb7cb9
+Git-commit: 904e14fb7cb96401a7dc803ca2863fd5ba32ffe6
+Patch-mainline: v4.16-rc1
+References: bsc#1124166
+
+Stable backport of upstream commit removed the check added
+here because stable-4.4.y does not have support for per-vcpu
+apicv disabling.
+
+SLE12-SP3 adds support for this so we need to add the check
+too.
+
+Signed-off-by: Joerg Roedel <jroedel@suse.de>
+---
+ arch/x86/kvm/vmx.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
+index 14553f6c03a6..e28b67e33300 100644
+--- a/arch/x86/kvm/vmx.c
++++ b/arch/x86/kvm/vmx.c
+@@ -4632,7 +4632,7 @@ static u8 vmx_msr_bitmap_mode(struct kvm_vcpu *vcpu)
+ (vmcs_read32(SECONDARY_VM_EXEC_CONTROL) &
+ SECONDARY_EXEC_VIRTUALIZE_X2APIC_MODE)) {
+ mode |= MSR_BITMAP_MODE_X2APIC;
+- if (enable_apicv)
++ if (enable_apicv && kvm_vcpu_apicv_active(vcpu))
+ mode |= MSR_BITMAP_MODE_X2APIC_APICV;
+ }
+
+--
+2.16.3
+
diff --git a/series.conf b/series.conf
index 0b9371601e..593816eaf2 100644
--- a/series.conf
+++ b/series.conf
@@ -25401,6 +25401,7 @@
patches.kabi/kabi-KVM-x86-kABI-workaround-for-PKRU-fixes.patch
patches.fixes/0001-KVM-VMX-Fix-x2apic-check-in-vmx_msr_bitmap_mode.patch
+ patches.fixes/0001-KVM-VMX-Missing-part-of-upstream-commit-904e14fb7cb9.patch
########################################################
# IOMMU patches