rpm/qemu
SHA256
1
0
Fork 0
forked from pool/qemu
Code Pull Requests Activity

Accepting request 582205 from home:bfrogers:branches:Virtualization

Browse Source 
Remove no longer needed temporary workaround: 0076-i386-Compensate-for-KVM-SPEC_CTRL-f.patch

OBS-URL: https://build.opensuse.org/request/show/582205
OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=397
This commit is contained in:
Bruce Rogers 2018-03-03 15:05:43 +00:00 committed by Git OBS Bridge
parent a7517427cc
commit 8b3ea2463f
7 changed files with 23 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
0076-i386-Compensate-for-KVM-SPEC_CTRL-f.patch
View File

@ -1,36 +0,0 @@
From 5d4a265705e98952cc849c59ba3118f8a79515aa Mon Sep 17 00:00:00 2001
From: Bruce Rogers <brogers@suse.com>
Date: Thu, 22 Feb 2018 04:48:07 -0700
Subject: [PATCH] i386: Compensate for KVM SPEC_CTRL feature availability bug
As we move away from the quick and dirty qemu solution for
Spectre v2, it was found that KVM wasn't reporting the SPEC_CTRL
feature when it in fact was present due to microcode update.
This patch compensates for that bug by checking for the feature
in QEMU code (like the quick and dirty solution did), instead of
simply relying on KVM for that information.
[BR: BSC#1082276]
Signed-off-by: Bruce Rogers <brogers@suse.com>
---
target/i386/cpu.c | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/target/i386/cpu.c b/target/i386/cpu.c
index a7e27f3bbf..27b40fc81f 100644
--- a/target/i386/cpu.c
+++ b/target/i386/cpu.c
@@ -2824,6 +2824,13 @@ static uint32_t x86_cpu_get_supported_feature_word(FeatureWord w,
r = kvm_arch_get_supported_cpuid(kvm_state, wi->cpuid_eax,
wi->cpuid_ecx,
wi->cpuid_reg);
+ // BUG!!! We need to compensate for a KVM bug where it doesn't
+ // correctly report support for IBRS (bsc#1082276)
+ if (w == FEAT_7_0_EDX) {
+ uint32_t edx;
+ host_cpuid(7, 0, NULL, NULL, NULL, &edx);
+ r |= edx & CPUID_7_0_EDX_SPEC_CTRL;
+ }
} else if (tcg_enabled()) {
r = wi->tcg_features;
} else {

7
qemu-linux-user.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Sat Mar 3 14:24:13 UTC 2018 - brogers@suse.com
- Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-2.11
* Patches dropped:
0076-i386-Compensate-for-KVM-SPEC_CTRL-f.patch
-------------------------------------------------------------------
Thu Feb 22 12:01:25 UTC 2018 - brogers@suse.com

2
qemu-linux-user.spec
View File

@ -101,7 +101,6 @@ Patch0072: 0072-tests-qmp-test-blacklist-query-sev-.patch
Patch0073: 0073-sev-i386-add-migration-blocker.patch
Patch0074: 0074-cpu-i386-populate-CPUID-0x8000_001F.patch
Patch0075: 0075-migration-warn-about-inconsistent-s.patch
Patch0076: 0076-i386-Compensate-for-KVM-SPEC_CTRL-f.patch
# Please do not add QEMU patches manually here.
# Run update_git.sh to regenerate this queue.
Source400: update_git.sh
@ -206,7 +205,6 @@ syscall layer occurs on the native hardware and operating system.
%patch0073 -p1
%patch0074 -p1
%patch0075 -p1
%patch0076 -p1
%build
./configure \

8
qemu-testsuite.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Sat Mar 3 14:24:10 UTC 2018 - brogers@suse.com
- SLE15 KVM (as targeted for RC1) now has the feature exposed.
Drop the patch. (bsc#1082276)
0076-i386-Compensate-for-KVM-SPEC_CTRL-f.patch
- Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-2.11
-------------------------------------------------------------------
Fri Mar 2 16:31:15 UTC 2018 - brogers@suse.com

2
qemu-testsuite.spec
View File

@ -205,7 +205,6 @@ Patch0072: 0072-tests-qmp-test-blacklist-query-sev-.patch
Patch0073: 0073-sev-i386-add-migration-blocker.patch
Patch0074: 0074-cpu-i386-populate-CPUID-0x8000_001F.patch
Patch0075: 0075-migration-warn-about-inconsistent-s.patch
Patch0076: 0076-i386-Compensate-for-KVM-SPEC_CTRL-f.patch
# Please do not add QEMU patches manually here.
# Run update_git.sh to regenerate this queue.
@ -880,7 +879,6 @@ This package provides a service file for starting and stopping KSM.
%patch0073 -p1
%patch0074 -p1
%patch0075 -p1
%patch0076 -p1
%if 0%{?suse_version} > 1320
%patch1000 -p1

8
qemu.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Sat Mar 3 14:24:10 UTC 2018 - brogers@suse.com
- SLE15 KVM (as targeted for RC1) now has the feature exposed.
Drop the patch. (bsc#1082276)
0076-i386-Compensate-for-KVM-SPEC_CTRL-f.patch
- Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-2.11
-------------------------------------------------------------------
Fri Mar 2 16:31:15 UTC 2018 - brogers@suse.com

2
qemu.spec
View File

@ -205,7 +205,6 @@ Patch0072: 0072-tests-qmp-test-blacklist-query-sev-.patch
Patch0073: 0073-sev-i386-add-migration-blocker.patch
Patch0074: 0074-cpu-i386-populate-CPUID-0x8000_001F.patch
Patch0075: 0075-migration-warn-about-inconsistent-s.patch
Patch0076: 0076-i386-Compensate-for-KVM-SPEC_CTRL-f.patch
# Please do not add QEMU patches manually here.
# Run update_git.sh to regenerate this queue.
@ -880,7 +879,6 @@ This package provides a service file for starting and stopping KSM.
%patch0073 -p1
%patch0074 -p1
%patch0075 -p1
%patch0076 -p1
%if 0%{?suse_version} > 1320
%patch1000 -p1