* Sat Feb 29 2020 Danilo Cesar Lemes de Paula <ddepaula@redhat.com> - 4.2.0-13.el8
- kvm-target-i386-kvm-initialize-feature-MSRs-very-early.patch [bz#1791648] - kvm-target-i386-add-a-ucode-rev-property.patch [bz#1791648] - kvm-target-i386-kvm-initialize-microcode-revision-from-K.patch [bz#1791648] - kvm-target-i386-fix-TCG-UCODE_REV-access.patch [bz#1791648] - kvm-target-i386-check-for-availability-of-MSR_IA32_UCODE.patch [bz#1791648] - kvm-target-i386-enable-monitor-and-ucode-revision-with-c.patch [bz#1791648] - kvm-qcow2-Fix-qcow2_alloc_cluster_abort-for-external-dat.patch [bz#1703907] - kvm-mirror-Store-MirrorOp.co-for-debuggability.patch [bz#1794692] - kvm-mirror-Don-t-let-an-operation-wait-for-itself.patch [bz#1794692] - Resolves: bz#1703907 ([upstream]QEMU coredump when converting to qcow2: external data file images on block devices with copy_offloading) - Resolves: bz#1791648 ([RFE] Passthrough host CPU microcode version to KVM guest if using CPU passthrough) - Resolves: bz#1794692 (Mirror block job stops making progress)
This commit is contained in:
Danilo C. L. de Paula
parent
6d18d0286e
commit
2084aa0246
123
kvm-mirror-Don-t-let-an-operation-wait-for-itself.patch
Normal file
123
kvm-mirror-Don-t-let-an-operation-wait-for-itself.patch
Normal file
@ -0,0 +1,123 @@
|
|||||||
|
From 261ee33e0e6711fadd3049e4640bb731ee3d44ff Mon Sep 17 00:00:00 2001
|
||||||
|
From: Kevin Wolf <kwolf@redhat.com>
|
||||||
|
Date: Mon, 24 Feb 2020 16:57:10 +0000
|
||||||
|
Subject: [PATCH 9/9] mirror: Don't let an operation wait for itself
|
||||||
|
|
||||||
|
RH-Author: Kevin Wolf <kwolf@redhat.com>
|
||||||
|
Message-id: <20200224165710.4830-3-kwolf@redhat.com>
|
||||||
|
Patchwork-id: 94045
|
||||||
|
O-Subject: [RHEL-AV-8.2.0 qemu-kvm PATCH 2/2] mirror: Don't let an operation wait for itself
|
||||||
|
Bugzilla: 1794692
|
||||||
|
RH-Acked-by: John Snow <jsnow@redhat.com>
|
||||||
|
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
|
||||||
|
RH-Acked-by: Max Reitz <mreitz@redhat.com>
|
||||||
|
|
||||||
|
mirror_wait_for_free_in_flight_slot() just picks a random operation to
|
||||||
|
wait for. However, when mirror_co_read() waits for free slots, its
|
||||||
|
MirrorOp is already in s->ops_in_flight, so if not enough slots are
|
||||||
|
immediately available, an operation can end up waiting for itself to
|
||||||
|
complete, which results in a hang.
|
||||||
|
|
||||||
|
Fix this by passing the current MirrorOp and skipping this operation
|
||||||
|
when picking an operation to wait for.
|
||||||
|
|
||||||
|
Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1794692
|
||||||
|
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
||||||
|
Reviewed-by: Eric Blake <eblake@redhat.com>
|
||||||
|
(cherry picked from commit 7e6c4ff792734e196c8ca82564c56b5e7c6288ca)
|
||||||
|
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
||||||
|
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
|
||||||
|
---
|
||||||
|
block/mirror.c | 21 ++++++++++++---------
|
||||||
|
1 file changed, 12 insertions(+), 9 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/block/mirror.c b/block/mirror.c
|
||||||
|
index 8959e42..cacbc70 100644
|
||||||
|
--- a/block/mirror.c
|
||||||
|
+++ b/block/mirror.c
|
||||||
|
@@ -283,11 +283,14 @@ static int mirror_cow_align(MirrorBlockJob *s, int64_t *offset,
|
||||||
|
}
|
||||||
|
|
||||||
|
static inline void coroutine_fn
|
||||||
|
-mirror_wait_for_any_operation(MirrorBlockJob *s, bool active)
|
||||||
|
+mirror_wait_for_any_operation(MirrorBlockJob *s, MirrorOp *self, bool active)
|
||||||
|
{
|
||||||
|
MirrorOp *op;
|
||||||
|
|
||||||
|
QTAILQ_FOREACH(op, &s->ops_in_flight, next) {
|
||||||
|
+ if (self == op) {
|
||||||
|
+ continue;
|
||||||
|
+ }
|
||||||
|
/* Do not wait on pseudo ops, because it may in turn wait on
|
||||||
|
* some other operation to start, which may in fact be the
|
||||||
|
* caller of this function. Since there is only one pseudo op
|
||||||
|
@@ -302,10 +305,10 @@ mirror_wait_for_any_operation(MirrorBlockJob *s, bool active)
|
||||||
|
}
|
||||||
|
|
||||||
|
static inline void coroutine_fn
|
||||||
|
-mirror_wait_for_free_in_flight_slot(MirrorBlockJob *s)
|
||||||
|
+mirror_wait_for_free_in_flight_slot(MirrorBlockJob *s, MirrorOp *self)
|
||||||
|
{
|
||||||
|
/* Only non-active operations use up in-flight slots */
|
||||||
|
- mirror_wait_for_any_operation(s, false);
|
||||||
|
+ mirror_wait_for_any_operation(s, self, false);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Perform a mirror copy operation.
|
||||||
|
@@ -348,7 +351,7 @@ static void coroutine_fn mirror_co_read(void *opaque)
|
||||||
|
|
||||||
|
while (s->buf_free_count < nb_chunks) {
|
||||||
|
trace_mirror_yield_in_flight(s, op->offset, s->in_flight);
|
||||||
|
- mirror_wait_for_free_in_flight_slot(s);
|
||||||
|
+ mirror_wait_for_free_in_flight_slot(s, op);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Now make a QEMUIOVector taking enough granularity-sized chunks
|
||||||
|
@@ -555,7 +558,7 @@ static uint64_t coroutine_fn mirror_iteration(MirrorBlockJob *s)
|
||||||
|
|
||||||
|
while (s->in_flight >= MAX_IN_FLIGHT) {
|
||||||
|
trace_mirror_yield_in_flight(s, offset, s->in_flight);
|
||||||
|
- mirror_wait_for_free_in_flight_slot(s);
|
||||||
|
+ mirror_wait_for_free_in_flight_slot(s, pseudo_op);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (s->ret < 0) {
|
||||||
|
@@ -609,7 +612,7 @@ static void mirror_free_init(MirrorBlockJob *s)
|
||||||
|
static void coroutine_fn mirror_wait_for_all_io(MirrorBlockJob *s)
|
||||||
|
{
|
||||||
|
while (s->in_flight > 0) {
|
||||||
|
- mirror_wait_for_free_in_flight_slot(s);
|
||||||
|
+ mirror_wait_for_free_in_flight_slot(s, NULL);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -794,7 +797,7 @@ static int coroutine_fn mirror_dirty_init(MirrorBlockJob *s)
|
||||||
|
if (s->in_flight >= MAX_IN_FLIGHT) {
|
||||||
|
trace_mirror_yield(s, UINT64_MAX, s->buf_free_count,
|
||||||
|
s->in_flight);
|
||||||
|
- mirror_wait_for_free_in_flight_slot(s);
|
||||||
|
+ mirror_wait_for_free_in_flight_slot(s, NULL);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -947,7 +950,7 @@ static int coroutine_fn mirror_run(Job *job, Error **errp)
|
||||||
|
/* Do not start passive operations while there are active
|
||||||
|
* writes in progress */
|
||||||
|
while (s->in_active_write_counter) {
|
||||||
|
- mirror_wait_for_any_operation(s, true);
|
||||||
|
+ mirror_wait_for_any_operation(s, NULL, true);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (s->ret < 0) {
|
||||||
|
@@ -973,7 +976,7 @@ static int coroutine_fn mirror_run(Job *job, Error **errp)
|
||||||
|
if (s->in_flight >= MAX_IN_FLIGHT || s->buf_free_count == 0 ||
|
||||||
|
(cnt == 0 && s->in_flight > 0)) {
|
||||||
|
trace_mirror_yield(s, cnt, s->buf_free_count, s->in_flight);
|
||||||
|
- mirror_wait_for_free_in_flight_slot(s);
|
||||||
|
+ mirror_wait_for_free_in_flight_slot(s, NULL);
|
||||||
|
continue;
|
||||||
|
} else if (cnt != 0) {
|
||||||
|
delay_ns = mirror_iteration(s);
|
||||||
|
--
|
||||||
|
1.8.3.1
|
||||||
|
|
||||||
51
kvm-mirror-Store-MirrorOp.co-for-debuggability.patch
Normal file
51
kvm-mirror-Store-MirrorOp.co-for-debuggability.patch
Normal file
@ -0,0 +1,51 @@
|
|||||||
|
From 27fe3b8d42a2c99de01ce20e4b0727079c12da65 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Kevin Wolf <kwolf@redhat.com>
|
||||||
|
Date: Mon, 24 Feb 2020 16:57:09 +0000
|
||||||
|
Subject: [PATCH 8/9] mirror: Store MirrorOp.co for debuggability
|
||||||
|
|
||||||
|
RH-Author: Kevin Wolf <kwolf@redhat.com>
|
||||||
|
Message-id: <20200224165710.4830-2-kwolf@redhat.com>
|
||||||
|
Patchwork-id: 94044
|
||||||
|
O-Subject: [RHEL-AV-8.2.0 qemu-kvm PATCH 1/2] mirror: Store MirrorOp.co for debuggability
|
||||||
|
Bugzilla: 1794692
|
||||||
|
RH-Acked-by: John Snow <jsnow@redhat.com>
|
||||||
|
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
|
||||||
|
RH-Acked-by: Max Reitz <mreitz@redhat.com>
|
||||||
|
|
||||||
|
If a coroutine is launched, but the coroutine pointer isn't stored
|
||||||
|
anywhere, debugging any problems inside the coroutine is quite hard.
|
||||||
|
Let's store the coroutine pointer of a mirror operation in MirrorOp to
|
||||||
|
have it available in the debugger.
|
||||||
|
|
||||||
|
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
||||||
|
Reviewed-by: Eric Blake <eblake@redhat.com>
|
||||||
|
(cherry picked from commit eed325b92c3e68417121ea23f96e33af6a4654ed)
|
||||||
|
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
||||||
|
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
|
||||||
|
---
|
||||||
|
block/mirror.c | 2 ++
|
||||||
|
1 file changed, 2 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/block/mirror.c b/block/mirror.c
|
||||||
|
index f0f2d9d..8959e42 100644
|
||||||
|
--- a/block/mirror.c
|
||||||
|
+++ b/block/mirror.c
|
||||||
|
@@ -103,6 +103,7 @@ struct MirrorOp {
|
||||||
|
bool is_pseudo_op;
|
||||||
|
bool is_active_write;
|
||||||
|
CoQueue waiting_requests;
|
||||||
|
+ Coroutine *co;
|
||||||
|
|
||||||
|
QTAILQ_ENTRY(MirrorOp) next;
|
||||||
|
};
|
||||||
|
@@ -429,6 +430,7 @@ static unsigned mirror_perform(MirrorBlockJob *s, int64_t offset,
|
||||||
|
default:
|
||||||
|
abort();
|
||||||
|
}
|
||||||
|
+ op->co = co;
|
||||||
|
|
||||||
|
QTAILQ_INSERT_TAIL(&s->ops_in_flight, op, next);
|
||||||
|
qemu_coroutine_enter(co);
|
||||||
|
--
|
||||||
|
1.8.3.1
|
||||||
|
|
||||||
@ -0,0 +1,52 @@
|
|||||||
|
From ecc4fb6e1941035e1d9def1f69b779fbea216caf Mon Sep 17 00:00:00 2001
|
||||||
|
From: Kevin Wolf <kwolf@redhat.com>
|
||||||
|
Date: Mon, 24 Feb 2020 16:13:07 +0000
|
||||||
|
Subject: [PATCH 7/9] qcow2: Fix qcow2_alloc_cluster_abort() for external data
|
||||||
|
file
|
||||||
|
|
||||||
|
RH-Author: Kevin Wolf <kwolf@redhat.com>
|
||||||
|
Message-id: <20200224161307.29783-2-kwolf@redhat.com>
|
||||||
|
Patchwork-id: 94042
|
||||||
|
O-Subject: [RHEL-AV-8.2.0 qemu-kvm PATCH 1/1] qcow2: Fix qcow2_alloc_cluster_abort() for external data file
|
||||||
|
Bugzilla: 1703907
|
||||||
|
RH-Acked-by: John Snow <jsnow@redhat.com>
|
||||||
|
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
|
||||||
|
RH-Acked-by: Max Reitz <mreitz@redhat.com>
|
||||||
|
|
||||||
|
For external data file, cluster allocations return an offset in the data
|
||||||
|
file and are not refcounted. In this case, there is nothing to do for
|
||||||
|
qcow2_alloc_cluster_abort(). Freeing the same offset in the qcow2 file
|
||||||
|
is wrong and causes crashes in the better case or image corruption in
|
||||||
|
the worse case.
|
||||||
|
|
||||||
|
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
||||||
|
Message-Id: <20200211094900.17315-3-kwolf@redhat.com>
|
||||||
|
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
||||||
|
(cherry picked from commit c3b6658c1a5a3fb24d6c27b2594cf86146f75b22)
|
||||||
|
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
||||||
|
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
|
||||||
|
---
|
||||||
|
block/qcow2-cluster.c | 7 +++++--
|
||||||
|
1 file changed, 5 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/block/qcow2-cluster.c b/block/qcow2-cluster.c
|
||||||
|
index 8982b7b..dc3c270 100644
|
||||||
|
--- a/block/qcow2-cluster.c
|
||||||
|
+++ b/block/qcow2-cluster.c
|
||||||
|
@@ -1015,8 +1015,11 @@ err:
|
||||||
|
void qcow2_alloc_cluster_abort(BlockDriverState *bs, QCowL2Meta *m)
|
||||||
|
{
|
||||||
|
BDRVQcow2State *s = bs->opaque;
|
||||||
|
- qcow2_free_clusters(bs, m->alloc_offset, m->nb_clusters << s->cluster_bits,
|
||||||
|
- QCOW2_DISCARD_NEVER);
|
||||||
|
+ if (!has_data_file(bs)) {
|
||||||
|
+ qcow2_free_clusters(bs, m->alloc_offset,
|
||||||
|
+ m->nb_clusters << s->cluster_bits,
|
||||||
|
+ QCOW2_DISCARD_NEVER);
|
||||||
|
+ }
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
--
|
||||||
|
1.8.3.1
|
||||||
|
|
||||||
125
kvm-target-i386-add-a-ucode-rev-property.patch
Normal file
125
kvm-target-i386-add-a-ucode-rev-property.patch
Normal file
@ -0,0 +1,125 @@
|
|||||||
|
From 4009f0bcc8004ce481015d088fe335a16b8d7ce1 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Paolo Bonzini <pbonzini@redhat.com>
|
||||||
|
Date: Mon, 17 Feb 2020 16:23:12 +0000
|
||||||
|
Subject: [PATCH 2/9] target/i386: add a ucode-rev property
|
||||||
|
|
||||||
|
RH-Author: Paolo Bonzini <pbonzini@redhat.com>
|
||||||
|
Message-id: <20200217162316.2464-3-pbonzini@redhat.com>
|
||||||
|
Patchwork-id: 93909
|
||||||
|
O-Subject: [RHEL-AV-8.2.0 qemu-kvm PATCH 2/6] target/i386: add a ucode-rev property
|
||||||
|
Bugzilla: 1791648
|
||||||
|
RH-Acked-by: Eduardo Habkost <ehabkost@redhat.com>
|
||||||
|
RH-Acked-by: Maxim Levitsky <mlevitsk@redhat.com>
|
||||||
|
RH-Acked-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
|
||||||
|
|
||||||
|
Add the property and plumb it in TCG and HVF (the latter of which
|
||||||
|
tried to support returning a constant value but used the wrong MSR).
|
||||||
|
|
||||||
|
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
||||||
|
Message-Id: <1579544504-3616-3-git-send-email-pbonzini@redhat.com>
|
||||||
|
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
||||||
|
(cherry picked from commit 4e45aff398cd1542c2a384a2a3b8600f23337d86)
|
||||||
|
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
|
||||||
|
---
|
||||||
|
target/i386/cpu.c | 10 ++++++++++
|
||||||
|
target/i386/cpu.h | 3 +++
|
||||||
|
target/i386/hvf/x86_emu.c | 4 +---
|
||||||
|
target/i386/misc_helper.c | 4 ++++
|
||||||
|
4 files changed, 18 insertions(+), 3 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/target/i386/cpu.c b/target/i386/cpu.c
|
||||||
|
index 863192c..e505d3e 100644
|
||||||
|
--- a/target/i386/cpu.c
|
||||||
|
+++ b/target/i386/cpu.c
|
||||||
|
@@ -6325,6 +6325,15 @@ static void x86_cpu_realizefn(DeviceState *dev, Error **errp)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
+ if (cpu->ucode_rev == 0) {
|
||||||
|
+ /* The default is the same as KVM's. */
|
||||||
|
+ if (IS_AMD_CPU(env)) {
|
||||||
|
+ cpu->ucode_rev = 0x01000065;
|
||||||
|
+ } else {
|
||||||
|
+ cpu->ucode_rev = 0x100000000ULL;
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
/* mwait extended info: needed for Core compatibility */
|
||||||
|
/* We always wake on interrupt even if host does not have the capability */
|
||||||
|
cpu->mwait.ecx |= CPUID_MWAIT_EMX | CPUID_MWAIT_IBE;
|
||||||
|
@@ -7008,6 +7017,7 @@ static Property x86_cpu_properties[] = {
|
||||||
|
DEFINE_PROP_UINT32("min-level", X86CPU, env.cpuid_min_level, 0),
|
||||||
|
DEFINE_PROP_UINT32("min-xlevel", X86CPU, env.cpuid_min_xlevel, 0),
|
||||||
|
DEFINE_PROP_UINT32("min-xlevel2", X86CPU, env.cpuid_min_xlevel2, 0),
|
||||||
|
+ DEFINE_PROP_UINT64("ucode-rev", X86CPU, ucode_rev, 0),
|
||||||
|
DEFINE_PROP_BOOL("full-cpuid-auto-level", X86CPU, full_cpuid_auto_level, true),
|
||||||
|
DEFINE_PROP_STRING("hv-vendor-id", X86CPU, hyperv_vendor_id),
|
||||||
|
DEFINE_PROP_BOOL("cpuid-0xb", X86CPU, enable_cpuid_0xb, true),
|
||||||
|
diff --git a/target/i386/cpu.h b/target/i386/cpu.h
|
||||||
|
index cde2a16..4441061 100644
|
||||||
|
--- a/target/i386/cpu.h
|
||||||
|
+++ b/target/i386/cpu.h
|
||||||
|
@@ -348,6 +348,7 @@ typedef enum X86Seg {
|
||||||
|
#define MSR_IA32_SPEC_CTRL 0x48
|
||||||
|
#define MSR_VIRT_SSBD 0xc001011f
|
||||||
|
#define MSR_IA32_PRED_CMD 0x49
|
||||||
|
+#define MSR_IA32_UCODE_REV 0x8b
|
||||||
|
#define MSR_IA32_CORE_CAPABILITY 0xcf
|
||||||
|
|
||||||
|
#define MSR_IA32_ARCH_CAPABILITIES 0x10a
|
||||||
|
@@ -1621,6 +1622,8 @@ struct X86CPU {
|
||||||
|
CPUNegativeOffsetState neg;
|
||||||
|
CPUX86State env;
|
||||||
|
|
||||||
|
+ uint64_t ucode_rev;
|
||||||
|
+
|
||||||
|
uint32_t hyperv_spinlock_attempts;
|
||||||
|
char *hyperv_vendor_id;
|
||||||
|
bool hyperv_synic_kvm_only;
|
||||||
|
diff --git a/target/i386/hvf/x86_emu.c b/target/i386/hvf/x86_emu.c
|
||||||
|
index 3df7672..92ab815 100644
|
||||||
|
--- a/target/i386/hvf/x86_emu.c
|
||||||
|
+++ b/target/i386/hvf/x86_emu.c
|
||||||
|
@@ -664,8 +664,6 @@ static void exec_lods(struct CPUX86State *env, struct x86_decode *decode)
|
||||||
|
RIP(env) += decode->len;
|
||||||
|
}
|
||||||
|
|
||||||
|
-#define MSR_IA32_UCODE_REV 0x00000017
|
||||||
|
-
|
||||||
|
void simulate_rdmsr(struct CPUState *cpu)
|
||||||
|
{
|
||||||
|
X86CPU *x86_cpu = X86_CPU(cpu);
|
||||||
|
@@ -681,7 +679,7 @@ void simulate_rdmsr(struct CPUState *cpu)
|
||||||
|
val = cpu_get_apic_base(X86_CPU(cpu)->apic_state);
|
||||||
|
break;
|
||||||
|
case MSR_IA32_UCODE_REV:
|
||||||
|
- val = (0x100000000ULL << 32) | 0x100000000ULL;
|
||||||
|
+ val = x86_cpu->ucode_rev;
|
||||||
|
break;
|
||||||
|
case MSR_EFER:
|
||||||
|
val = rvmcs(cpu->hvf_fd, VMCS_GUEST_IA32_EFER);
|
||||||
|
diff --git a/target/i386/misc_helper.c b/target/i386/misc_helper.c
|
||||||
|
index 3eff688..aed16fe 100644
|
||||||
|
--- a/target/i386/misc_helper.c
|
||||||
|
+++ b/target/i386/misc_helper.c
|
||||||
|
@@ -229,6 +229,7 @@ void helper_rdmsr(CPUX86State *env)
|
||||||
|
#else
|
||||||
|
void helper_wrmsr(CPUX86State *env)
|
||||||
|
{
|
||||||
|
+ X86CPU *x86_cpu = env_archcpu(env);
|
||||||
|
uint64_t val;
|
||||||
|
|
||||||
|
cpu_svm_check_intercept_param(env, SVM_EXIT_MSR, 1, GETPC());
|
||||||
|
@@ -371,6 +372,9 @@ void helper_wrmsr(CPUX86State *env)
|
||||||
|
env->msr_bndcfgs = val;
|
||||||
|
cpu_sync_bndcs_hflags(env);
|
||||||
|
break;
|
||||||
|
+ case MSR_IA32_UCODE_REV:
|
||||||
|
+ val = x86_cpu->ucode_rev;
|
||||||
|
+ break;
|
||||||
|
default:
|
||||||
|
if ((uint32_t)env->regs[R_ECX] >= MSR_MC0_CTL
|
||||||
|
&& (uint32_t)env->regs[R_ECX] < MSR_MC0_CTL +
|
||||||
|
--
|
||||||
|
1.8.3.1
|
||||||
|
|
||||||
@ -0,0 +1,72 @@
|
|||||||
|
From 27d7b085f2f568050d638b694ed2f51495db718c Mon Sep 17 00:00:00 2001
|
||||||
|
From: Paolo Bonzini <pbonzini@redhat.com>
|
||||||
|
Date: Mon, 17 Feb 2020 16:23:15 +0000
|
||||||
|
Subject: [PATCH 5/9] target/i386: check for availability of MSR_IA32_UCODE_REV
|
||||||
|
as an emulated MSR
|
||||||
|
MIME-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
|
||||||
|
RH-Author: Paolo Bonzini <pbonzini@redhat.com>
|
||||||
|
Message-id: <20200217162316.2464-6-pbonzini@redhat.com>
|
||||||
|
Patchwork-id: 93898
|
||||||
|
O-Subject: [RHEL-AV-8.2.0 qemu-kvm PATCH 5/6] target/i386: check for availability of MSR_IA32_UCODE_REV as an emulated MSR
|
||||||
|
Bugzilla: 1791648
|
||||||
|
RH-Acked-by: Philippe Mathieu-Daudé <philmd@redhat.com>
|
||||||
|
RH-Acked-by: Maxim Levitsky <mlevitsk@redhat.com>
|
||||||
|
RH-Acked-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
|
||||||
|
|
||||||
|
Even though MSR_IA32_UCODE_REV has been available long before Linux 5.6,
|
||||||
|
which added it to the emulated MSR list, a bug caused the microcode
|
||||||
|
version to revert to 0x100000000 on INIT. As a result, processors other
|
||||||
|
than the bootstrap processor would not see the host microcode revision;
|
||||||
|
some Windows version complain loudly about this and crash with a
|
||||||
|
fairly explicit MICROCODE REVISION MISMATCH error.
|
||||||
|
|
||||||
|
[If running 5.6 prereleases, the kernel fix "KVM: x86: do not reset
|
||||||
|
microcode version on INIT or RESET" should also be applied.]
|
||||||
|
|
||||||
|
Reported-by: Alex Williamson <alex.williamson@redhat.com>
|
||||||
|
Message-id: <20200211175516.10716-1-pbonzini@redhat.com>
|
||||||
|
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
||||||
|
(cherry picked from commit 6702514814c7e7b4cbf179624539b5f38c72740b)
|
||||||
|
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
|
||||||
|
---
|
||||||
|
target/i386/kvm.c | 7 +++++--
|
||||||
|
1 file changed, 5 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/target/i386/kvm.c b/target/i386/kvm.c
|
||||||
|
index 6c61aef..99840ca 100644
|
||||||
|
--- a/target/i386/kvm.c
|
||||||
|
+++ b/target/i386/kvm.c
|
||||||
|
@@ -105,6 +105,7 @@ static bool has_msr_smi_count;
|
||||||
|
static bool has_msr_arch_capabs;
|
||||||
|
static bool has_msr_core_capabs;
|
||||||
|
static bool has_msr_vmx_vmfunc;
|
||||||
|
+static bool has_msr_ucode_rev;
|
||||||
|
|
||||||
|
static uint32_t has_architectural_pmu_version;
|
||||||
|
static uint32_t num_architectural_pmu_gp_counters;
|
||||||
|
@@ -2056,6 +2057,9 @@ static int kvm_get_supported_msrs(KVMState *s)
|
||||||
|
case MSR_IA32_VMX_VMFUNC:
|
||||||
|
has_msr_vmx_vmfunc = true;
|
||||||
|
break;
|
||||||
|
+ case MSR_IA32_UCODE_REV:
|
||||||
|
+ has_msr_ucode_rev = true;
|
||||||
|
+ break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@@ -2696,8 +2700,7 @@ static void kvm_init_msrs(X86CPU *cpu)
|
||||||
|
env->features[FEAT_CORE_CAPABILITY]);
|
||||||
|
}
|
||||||
|
|
||||||
|
- if (kvm_arch_get_supported_msr_feature(kvm_state,
|
||||||
|
- MSR_IA32_UCODE_REV)) {
|
||||||
|
+ if (has_msr_ucode_rev) {
|
||||||
|
kvm_msr_entry_add(cpu, MSR_IA32_UCODE_REV, cpu->ucode_rev);
|
||||||
|
}
|
||||||
|
|
||||||
|
--
|
||||||
|
1.8.3.1
|
||||||
|
|
||||||
@ -0,0 +1,49 @@
|
|||||||
|
From 7b71a7011437ebfa3bc7df9297e892b82293ec98 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Paolo Bonzini <pbonzini@redhat.com>
|
||||||
|
Date: Mon, 17 Feb 2020 16:23:16 +0000
|
||||||
|
Subject: [PATCH 6/9] target/i386: enable monitor and ucode revision with -cpu
|
||||||
|
max
|
||||||
|
MIME-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
|
||||||
|
RH-Author: Paolo Bonzini <pbonzini@redhat.com>
|
||||||
|
Message-id: <20200217162316.2464-7-pbonzini@redhat.com>
|
||||||
|
Patchwork-id: 93910
|
||||||
|
O-Subject: [RHEL-AV-8.2.0 qemu-kvm PATCH 6/6] target/i386: enable monitor and ucode revision with -cpu max
|
||||||
|
Bugzilla: 1791648
|
||||||
|
RH-Acked-by: Philippe Mathieu-Daudé <philmd@redhat.com>
|
||||||
|
RH-Acked-by: Maxim Levitsky <mlevitsk@redhat.com>
|
||||||
|
RH-Acked-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
|
||||||
|
|
||||||
|
These two features were incorrectly tied to host_cpuid_required rather than
|
||||||
|
cpu->max_features. As a result, -cpu max was not enabling either MONITOR
|
||||||
|
features or ucode revision.
|
||||||
|
|
||||||
|
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
||||||
|
(cherry picked from commit be02cda3afde60d219786e23c3f8edb53aec8e17)
|
||||||
|
|
||||||
|
[RHEL7: context, upstream uses g_autofree]
|
||||||
|
|
||||||
|
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
|
||||||
|
---
|
||||||
|
target/i386/cpu.c | 2 ++
|
||||||
|
1 file changed, 2 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/target/i386/cpu.c b/target/i386/cpu.c
|
||||||
|
index 5ac843d..1685a8c 100644
|
||||||
|
--- a/target/i386/cpu.c
|
||||||
|
+++ b/target/i386/cpu.c
|
||||||
|
@@ -6317,7 +6317,9 @@ static void x86_cpu_realizefn(DeviceState *dev, Error **errp)
|
||||||
|
g_free(name);
|
||||||
|
goto out;
|
||||||
|
}
|
||||||
|
+ }
|
||||||
|
|
||||||
|
+ if (cpu->max_features && accel_uses_host_cpuid()) {
|
||||||
|
if (enable_cpu_pm) {
|
||||||
|
host_cpuid(5, 0, &cpu->mwait.eax, &cpu->mwait.ebx,
|
||||||
|
&cpu->mwait.ecx, &cpu->mwait.edx);
|
||||||
|
--
|
||||||
|
1.8.3.1
|
||||||
|
|
||||||
73
kvm-target-i386-fix-TCG-UCODE_REV-access.patch
Normal file
73
kvm-target-i386-fix-TCG-UCODE_REV-access.patch
Normal file
@ -0,0 +1,73 @@
|
|||||||
|
From 3d16f05359e6277da1f970f71aa9f76337d655dc Mon Sep 17 00:00:00 2001
|
||||||
|
From: Paolo Bonzini <pbonzini@redhat.com>
|
||||||
|
Date: Mon, 17 Feb 2020 16:23:14 +0000
|
||||||
|
Subject: [PATCH 4/9] target/i386: fix TCG UCODE_REV access
|
||||||
|
MIME-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
|
||||||
|
RH-Author: Paolo Bonzini <pbonzini@redhat.com>
|
||||||
|
Message-id: <20200217162316.2464-5-pbonzini@redhat.com>
|
||||||
|
Patchwork-id: 93904
|
||||||
|
O-Subject: [RHEL-AV-8.2.0 qemu-kvm PATCH 4/6] target/i386: fix TCG UCODE_REV access
|
||||||
|
Bugzilla: 1791648
|
||||||
|
RH-Acked-by: Philippe Mathieu-Daudé <philmd@redhat.com>
|
||||||
|
RH-Acked-by: Maxim Levitsky <mlevitsk@redhat.com>
|
||||||
|
RH-Acked-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
|
||||||
|
|
||||||
|
This was a very interesting semantic conflict that caused git to move
|
||||||
|
the MSR_IA32_UCODE_REV read to helper_wrmsr. Not a big deal, but
|
||||||
|
still should be fixed...
|
||||||
|
|
||||||
|
Fixes: 4e45aff398 ("target/i386: add a ucode-rev property", 2020-01-24)
|
||||||
|
Message-id: <20200206171022.9289-1-pbonzini@redhat.com>
|
||||||
|
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
||||||
|
(cherry picked from commit 9028c75c9d08be303ccc425bfe3d3b23d8f4cac7)
|
||||||
|
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
|
||||||
|
---
|
||||||
|
target/i386/misc_helper.c | 8 ++++----
|
||||||
|
1 file changed, 4 insertions(+), 4 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/target/i386/misc_helper.c b/target/i386/misc_helper.c
|
||||||
|
index aed16fe..7d61221 100644
|
||||||
|
--- a/target/i386/misc_helper.c
|
||||||
|
+++ b/target/i386/misc_helper.c
|
||||||
|
@@ -229,7 +229,6 @@ void helper_rdmsr(CPUX86State *env)
|
||||||
|
#else
|
||||||
|
void helper_wrmsr(CPUX86State *env)
|
||||||
|
{
|
||||||
|
- X86CPU *x86_cpu = env_archcpu(env);
|
||||||
|
uint64_t val;
|
||||||
|
|
||||||
|
cpu_svm_check_intercept_param(env, SVM_EXIT_MSR, 1, GETPC());
|
||||||
|
@@ -372,9 +371,6 @@ void helper_wrmsr(CPUX86State *env)
|
||||||
|
env->msr_bndcfgs = val;
|
||||||
|
cpu_sync_bndcs_hflags(env);
|
||||||
|
break;
|
||||||
|
- case MSR_IA32_UCODE_REV:
|
||||||
|
- val = x86_cpu->ucode_rev;
|
||||||
|
- break;
|
||||||
|
default:
|
||||||
|
if ((uint32_t)env->regs[R_ECX] >= MSR_MC0_CTL
|
||||||
|
&& (uint32_t)env->regs[R_ECX] < MSR_MC0_CTL +
|
||||||
|
@@ -393,6 +389,7 @@ void helper_wrmsr(CPUX86State *env)
|
||||||
|
|
||||||
|
void helper_rdmsr(CPUX86State *env)
|
||||||
|
{
|
||||||
|
+ X86CPU *x86_cpu = env_archcpu(env);
|
||||||
|
uint64_t val;
|
||||||
|
|
||||||
|
cpu_svm_check_intercept_param(env, SVM_EXIT_MSR, 0, GETPC());
|
||||||
|
@@ -526,6 +523,9 @@ void helper_rdmsr(CPUX86State *env)
|
||||||
|
case MSR_IA32_BNDCFGS:
|
||||||
|
val = env->msr_bndcfgs;
|
||||||
|
break;
|
||||||
|
+ case MSR_IA32_UCODE_REV:
|
||||||
|
+ val = x86_cpu->ucode_rev;
|
||||||
|
+ break;
|
||||||
|
default:
|
||||||
|
if ((uint32_t)env->regs[R_ECX] >= MSR_MC0_CTL
|
||||||
|
&& (uint32_t)env->regs[R_ECX] < MSR_MC0_CTL +
|
||||||
|
--
|
||||||
|
1.8.3.1
|
||||||
|
|
||||||
178
kvm-target-i386-kvm-initialize-feature-MSRs-very-early.patch
Normal file
178
kvm-target-i386-kvm-initialize-feature-MSRs-very-early.patch
Normal file
@ -0,0 +1,178 @@
|
|||||||
|
From eb0fc0ae2750a0462698d6d21ebb56a4249539f9 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Paolo Bonzini <pbonzini@redhat.com>
|
||||||
|
Date: Mon, 17 Feb 2020 16:23:11 +0000
|
||||||
|
Subject: [PATCH 1/9] target/i386: kvm: initialize feature MSRs very early
|
||||||
|
MIME-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
|
||||||
|
RH-Author: Paolo Bonzini <pbonzini@redhat.com>
|
||||||
|
Message-id: <20200217162316.2464-2-pbonzini@redhat.com>
|
||||||
|
Patchwork-id: 93899
|
||||||
|
O-Subject: [RHEL-AV-8.2.0 qemu-kvm PATCH 1/6] target/i386: kvm: initialize feature MSRs very early
|
||||||
|
Bugzilla: 1791648
|
||||||
|
RH-Acked-by: Philippe Mathieu-Daudé <philmd@redhat.com>
|
||||||
|
RH-Acked-by: Maxim Levitsky <mlevitsk@redhat.com>
|
||||||
|
RH-Acked-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
|
||||||
|
|
||||||
|
Some read-only MSRs affect the behavior of ioctls such as
|
||||||
|
KVM_SET_NESTED_STATE. We can initialize them once and for all
|
||||||
|
right after the CPU is realized, since they will never be modified
|
||||||
|
by the guest.
|
||||||
|
|
||||||
|
Reported-by: Qingua Cheng <qcheng@redhat.com>
|
||||||
|
Cc: qemu-stable@nongnu.org
|
||||||
|
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
||||||
|
Message-Id: <1579544504-3616-2-git-send-email-pbonzini@redhat.com>
|
||||||
|
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
||||||
|
(cherry picked from commit 420ae1fc51c99abfd03b1c590f55617edd2a2bed)
|
||||||
|
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
|
||||||
|
---
|
||||||
|
target/i386/kvm.c | 81 ++++++++++++++++++++++++++++++--------------------
|
||||||
|
target/i386/kvm_i386.h | 1 +
|
||||||
|
2 files changed, 49 insertions(+), 33 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/target/i386/kvm.c b/target/i386/kvm.c
|
||||||
|
index 86d9a1f..f41605b 100644
|
||||||
|
--- a/target/i386/kvm.c
|
||||||
|
+++ b/target/i386/kvm.c
|
||||||
|
@@ -67,6 +67,8 @@
|
||||||
|
* 255 kvm_msr_entry structs */
|
||||||
|
#define MSR_BUF_SIZE 4096
|
||||||
|
|
||||||
|
+static void kvm_init_msrs(X86CPU *cpu);
|
||||||
|
+
|
||||||
|
const KVMCapabilityInfo kvm_arch_required_capabilities[] = {
|
||||||
|
KVM_CAP_INFO(SET_TSS_ADDR),
|
||||||
|
KVM_CAP_INFO(EXT_CPUID),
|
||||||
|
@@ -1842,6 +1844,8 @@ int kvm_arch_init_vcpu(CPUState *cs)
|
||||||
|
has_msr_tsc_aux = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
+ kvm_init_msrs(cpu);
|
||||||
|
+
|
||||||
|
r = hyperv_init_vcpu(cpu);
|
||||||
|
if (r) {
|
||||||
|
goto fail;
|
||||||
|
@@ -2660,11 +2664,53 @@ static void kvm_msr_entry_add_vmx(X86CPU *cpu, FeatureWordArray f)
|
||||||
|
VMCS12_MAX_FIELD_INDEX << 1);
|
||||||
|
}
|
||||||
|
|
||||||
|
+static int kvm_buf_set_msrs(X86CPU *cpu)
|
||||||
|
+{
|
||||||
|
+ int ret = kvm_vcpu_ioctl(CPU(cpu), KVM_SET_MSRS, cpu->kvm_msr_buf);
|
||||||
|
+ if (ret < 0) {
|
||||||
|
+ return ret;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ if (ret < cpu->kvm_msr_buf->nmsrs) {
|
||||||
|
+ struct kvm_msr_entry *e = &cpu->kvm_msr_buf->entries[ret];
|
||||||
|
+ error_report("error: failed to set MSR 0x%" PRIx32 " to 0x%" PRIx64,
|
||||||
|
+ (uint32_t)e->index, (uint64_t)e->data);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ assert(ret == cpu->kvm_msr_buf->nmsrs);
|
||||||
|
+ return 0;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+static void kvm_init_msrs(X86CPU *cpu)
|
||||||
|
+{
|
||||||
|
+ CPUX86State *env = &cpu->env;
|
||||||
|
+
|
||||||
|
+ kvm_msr_buf_reset(cpu);
|
||||||
|
+ if (has_msr_arch_capabs) {
|
||||||
|
+ kvm_msr_entry_add(cpu, MSR_IA32_ARCH_CAPABILITIES,
|
||||||
|
+ env->features[FEAT_ARCH_CAPABILITIES]);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ if (has_msr_core_capabs) {
|
||||||
|
+ kvm_msr_entry_add(cpu, MSR_IA32_CORE_CAPABILITY,
|
||||||
|
+ env->features[FEAT_CORE_CAPABILITY]);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ /*
|
||||||
|
+ * Older kernels do not include VMX MSRs in KVM_GET_MSR_INDEX_LIST, but
|
||||||
|
+ * all kernels with MSR features should have them.
|
||||||
|
+ */
|
||||||
|
+ if (kvm_feature_msrs && cpu_has_vmx(env)) {
|
||||||
|
+ kvm_msr_entry_add_vmx(cpu, env->features);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ assert(kvm_buf_set_msrs(cpu) == 0);
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
static int kvm_put_msrs(X86CPU *cpu, int level)
|
||||||
|
{
|
||||||
|
CPUX86State *env = &cpu->env;
|
||||||
|
int i;
|
||||||
|
- int ret;
|
||||||
|
|
||||||
|
kvm_msr_buf_reset(cpu);
|
||||||
|
|
||||||
|
@@ -2722,17 +2768,6 @@ static int kvm_put_msrs(X86CPU *cpu, int level)
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
- /* If host supports feature MSR, write down. */
|
||||||
|
- if (has_msr_arch_capabs) {
|
||||||
|
- kvm_msr_entry_add(cpu, MSR_IA32_ARCH_CAPABILITIES,
|
||||||
|
- env->features[FEAT_ARCH_CAPABILITIES]);
|
||||||
|
- }
|
||||||
|
-
|
||||||
|
- if (has_msr_core_capabs) {
|
||||||
|
- kvm_msr_entry_add(cpu, MSR_IA32_CORE_CAPABILITY,
|
||||||
|
- env->features[FEAT_CORE_CAPABILITY]);
|
||||||
|
- }
|
||||||
|
-
|
||||||
|
/*
|
||||||
|
* The following MSRs have side effects on the guest or are too heavy
|
||||||
|
* for normal writeback. Limit them to reset or full state updates.
|
||||||
|
@@ -2910,14 +2945,6 @@ static int kvm_put_msrs(X86CPU *cpu, int level)
|
||||||
|
|
||||||
|
/* Note: MSR_IA32_FEATURE_CONTROL is written separately, see
|
||||||
|
* kvm_put_msr_feature_control. */
|
||||||
|
-
|
||||||
|
- /*
|
||||||
|
- * Older kernels do not include VMX MSRs in KVM_GET_MSR_INDEX_LIST, but
|
||||||
|
- * all kernels with MSR features should have them.
|
||||||
|
- */
|
||||||
|
- if (kvm_feature_msrs && cpu_has_vmx(env)) {
|
||||||
|
- kvm_msr_entry_add_vmx(cpu, env->features);
|
||||||
|
- }
|
||||||
|
}
|
||||||
|
|
||||||
|
if (env->mcg_cap) {
|
||||||
|
@@ -2933,19 +2960,7 @@ static int kvm_put_msrs(X86CPU *cpu, int level)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
- ret = kvm_vcpu_ioctl(CPU(cpu), KVM_SET_MSRS, cpu->kvm_msr_buf);
|
||||||
|
- if (ret < 0) {
|
||||||
|
- return ret;
|
||||||
|
- }
|
||||||
|
-
|
||||||
|
- if (ret < cpu->kvm_msr_buf->nmsrs) {
|
||||||
|
- struct kvm_msr_entry *e = &cpu->kvm_msr_buf->entries[ret];
|
||||||
|
- error_report("error: failed to set MSR 0x%" PRIx32 " to 0x%" PRIx64,
|
||||||
|
- (uint32_t)e->index, (uint64_t)e->data);
|
||||||
|
- }
|
||||||
|
-
|
||||||
|
- assert(ret == cpu->kvm_msr_buf->nmsrs);
|
||||||
|
- return 0;
|
||||||
|
+ return kvm_buf_set_msrs(cpu);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
diff --git a/target/i386/kvm_i386.h b/target/i386/kvm_i386.h
|
||||||
|
index 06fe06b..d98c6f6 100644
|
||||||
|
--- a/target/i386/kvm_i386.h
|
||||||
|
+++ b/target/i386/kvm_i386.h
|
||||||
|
@@ -66,4 +66,5 @@ bool kvm_enable_x2apic(void);
|
||||||
|
bool kvm_has_x2apic_api(void);
|
||||||
|
|
||||||
|
bool kvm_hv_vpindex_settable(void);
|
||||||
|
+
|
||||||
|
#endif
|
||||||
|
--
|
||||||
|
1.8.3.1
|
||||||
|
|
||||||
@ -0,0 +1,64 @@
|
|||||||
|
From 8f39b0c9523630efeb451e2298cf64b88cd2ac81 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Paolo Bonzini <pbonzini@redhat.com>
|
||||||
|
Date: Mon, 17 Feb 2020 16:23:13 +0000
|
||||||
|
Subject: [PATCH 3/9] target/i386: kvm: initialize microcode revision from KVM
|
||||||
|
MIME-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
|
||||||
|
RH-Author: Paolo Bonzini <pbonzini@redhat.com>
|
||||||
|
Message-id: <20200217162316.2464-4-pbonzini@redhat.com>
|
||||||
|
Patchwork-id: 93897
|
||||||
|
O-Subject: [RHEL-AV-8.2.0 qemu-kvm PATCH 3/6] target/i386: kvm: initialize microcode revision from KVM
|
||||||
|
Bugzilla: 1791648
|
||||||
|
RH-Acked-by: Philippe Mathieu-Daudé <philmd@redhat.com>
|
||||||
|
RH-Acked-by: Maxim Levitsky <mlevitsk@redhat.com>
|
||||||
|
RH-Acked-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
|
||||||
|
|
||||||
|
KVM can return the host microcode revision as a feature MSR.
|
||||||
|
Use it as the default value for -cpu host.
|
||||||
|
|
||||||
|
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
||||||
|
Message-Id: <1579544504-3616-4-git-send-email-pbonzini@redhat.com>
|
||||||
|
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
||||||
|
(cherry picked from commit 32c87d70ff55b96741f08c35108935cac6f40fe4)
|
||||||
|
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
|
||||||
|
---
|
||||||
|
target/i386/cpu.c | 4 ++++
|
||||||
|
target/i386/kvm.c | 5 +++++
|
||||||
|
2 files changed, 9 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/target/i386/cpu.c b/target/i386/cpu.c
|
||||||
|
index e505d3e..5ac843d 100644
|
||||||
|
--- a/target/i386/cpu.c
|
||||||
|
+++ b/target/i386/cpu.c
|
||||||
|
@@ -6323,6 +6323,10 @@ static void x86_cpu_realizefn(DeviceState *dev, Error **errp)
|
||||||
|
&cpu->mwait.ecx, &cpu->mwait.edx);
|
||||||
|
env->features[FEAT_1_ECX] |= CPUID_EXT_MONITOR;
|
||||||
|
}
|
||||||
|
+ if (kvm_enabled() && cpu->ucode_rev == 0) {
|
||||||
|
+ cpu->ucode_rev = kvm_arch_get_supported_msr_feature(kvm_state,
|
||||||
|
+ MSR_IA32_UCODE_REV);
|
||||||
|
+ }
|
||||||
|
}
|
||||||
|
|
||||||
|
if (cpu->ucode_rev == 0) {
|
||||||
|
diff --git a/target/i386/kvm.c b/target/i386/kvm.c
|
||||||
|
index f41605b..6c61aef 100644
|
||||||
|
--- a/target/i386/kvm.c
|
||||||
|
+++ b/target/i386/kvm.c
|
||||||
|
@@ -2696,6 +2696,11 @@ static void kvm_init_msrs(X86CPU *cpu)
|
||||||
|
env->features[FEAT_CORE_CAPABILITY]);
|
||||||
|
}
|
||||||
|
|
||||||
|
+ if (kvm_arch_get_supported_msr_feature(kvm_state,
|
||||||
|
+ MSR_IA32_UCODE_REV)) {
|
||||||
|
+ kvm_msr_entry_add(cpu, MSR_IA32_UCODE_REV, cpu->ucode_rev);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
/*
|
||||||
|
* Older kernels do not include VMX MSRs in KVM_GET_MSR_INDEX_LIST, but
|
||||||
|
* all kernels with MSR features should have them.
|
||||||
|
--
|
||||||
|
1.8.3.1
|
||||||
|
|
||||||
@ -67,7 +67,7 @@ Obsoletes: %1-rhev
|
|||||||
Summary: QEMU is a machine emulator and virtualizer
|
Summary: QEMU is a machine emulator and virtualizer
|
||||||
Name: qemu-kvm
|
Name: qemu-kvm
|
||||||
Version: 4.2.0
|
Version: 4.2.0
|
||||||
Release: 12%{?dist}
|
Release: 13%{?dist}
|
||||||
# Epoch because we pushed a qemu-1.0 package. AIUI this can't ever be dropped
|
# Epoch because we pushed a qemu-1.0 package. AIUI this can't ever be dropped
|
||||||
Epoch: 15
|
Epoch: 15
|
||||||
License: GPLv2 and GPLv2+ and CC-BY
|
License: GPLv2 and GPLv2+ and CC-BY
|
||||||
@ -510,6 +510,24 @@ Patch186: kvm-virtio-reset-region-cache-when-on-queue-deletion.patch
|
|||||||
Patch187: kvm-virtio-net-delete-also-control-queue-when-TX-RX-dele.patch
|
Patch187: kvm-virtio-net-delete-also-control-queue-when-TX-RX-dele.patch
|
||||||
# For bz#1805334 - vhost-user/50-qemu-gpu.json is not valid JSON
|
# For bz#1805334 - vhost-user/50-qemu-gpu.json is not valid JSON
|
||||||
Patch188: kvm-vhost-user-gpu-Drop-trailing-json-comma.patch
|
Patch188: kvm-vhost-user-gpu-Drop-trailing-json-comma.patch
|
||||||
|
# For bz#1791648 - [RFE] Passthrough host CPU microcode version to KVM guest if using CPU passthrough
|
||||||
|
Patch189: kvm-target-i386-kvm-initialize-feature-MSRs-very-early.patch
|
||||||
|
# For bz#1791648 - [RFE] Passthrough host CPU microcode version to KVM guest if using CPU passthrough
|
||||||
|
Patch190: kvm-target-i386-add-a-ucode-rev-property.patch
|
||||||
|
# For bz#1791648 - [RFE] Passthrough host CPU microcode version to KVM guest if using CPU passthrough
|
||||||
|
Patch191: kvm-target-i386-kvm-initialize-microcode-revision-from-K.patch
|
||||||
|
# For bz#1791648 - [RFE] Passthrough host CPU microcode version to KVM guest if using CPU passthrough
|
||||||
|
Patch192: kvm-target-i386-fix-TCG-UCODE_REV-access.patch
|
||||||
|
# For bz#1791648 - [RFE] Passthrough host CPU microcode version to KVM guest if using CPU passthrough
|
||||||
|
Patch193: kvm-target-i386-check-for-availability-of-MSR_IA32_UCODE.patch
|
||||||
|
# For bz#1791648 - [RFE] Passthrough host CPU microcode version to KVM guest if using CPU passthrough
|
||||||
|
Patch194: kvm-target-i386-enable-monitor-and-ucode-revision-with-c.patch
|
||||||
|
# For bz#1703907 - [upstream]QEMU coredump when converting to qcow2: external data file images on block devices with copy_offloading
|
||||||
|
Patch195: kvm-qcow2-Fix-qcow2_alloc_cluster_abort-for-external-dat.patch
|
||||||
|
# For bz#1794692 - Mirror block job stops making progress
|
||||||
|
Patch196: kvm-mirror-Store-MirrorOp.co-for-debuggability.patch
|
||||||
|
# For bz#1794692 - Mirror block job stops making progress
|
||||||
|
Patch197: kvm-mirror-Don-t-let-an-operation-wait-for-itself.patch
|
||||||
|
|
||||||
BuildRequires: wget
|
BuildRequires: wget
|
||||||
BuildRequires: rpm-build
|
BuildRequires: rpm-build
|
||||||
@ -1443,6 +1461,23 @@ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Sat Feb 29 2020 Danilo Cesar Lemes de Paula <ddepaula@redhat.com> - 4.2.0-13.el8
|
||||||
|
- kvm-target-i386-kvm-initialize-feature-MSRs-very-early.patch [bz#1791648]
|
||||||
|
- kvm-target-i386-add-a-ucode-rev-property.patch [bz#1791648]
|
||||||
|
- kvm-target-i386-kvm-initialize-microcode-revision-from-K.patch [bz#1791648]
|
||||||
|
- kvm-target-i386-fix-TCG-UCODE_REV-access.patch [bz#1791648]
|
||||||
|
- kvm-target-i386-check-for-availability-of-MSR_IA32_UCODE.patch [bz#1791648]
|
||||||
|
- kvm-target-i386-enable-monitor-and-ucode-revision-with-c.patch [bz#1791648]
|
||||||
|
- kvm-qcow2-Fix-qcow2_alloc_cluster_abort-for-external-dat.patch [bz#1703907]
|
||||||
|
- kvm-mirror-Store-MirrorOp.co-for-debuggability.patch [bz#1794692]
|
||||||
|
- kvm-mirror-Don-t-let-an-operation-wait-for-itself.patch [bz#1794692]
|
||||||
|
- Resolves: bz#1703907
|
||||||
|
([upstream]QEMU coredump when converting to qcow2: external data file images on block devices with copy_offloading)
|
||||||
|
- Resolves: bz#1791648
|
||||||
|
([RFE] Passthrough host CPU microcode version to KVM guest if using CPU passthrough)
|
||||||
|
- Resolves: bz#1794692
|
||||||
|
(Mirror block job stops making progress)
|
||||||
|
|
||||||
* Mon Feb 24 2020 Danilo Cesar Lemes de Paula <ddepaula@redhat.com> - 4.2.0-12.el8
|
* Mon Feb 24 2020 Danilo Cesar Lemes de Paula <ddepaula@redhat.com> - 4.2.0-12.el8
|
||||||
- kvm-vhost-user-gpu-Drop-trailing-json-comma.patch [bz#1805334]
|
- kvm-vhost-user-gpu-Drop-trailing-json-comma.patch [bz#1805334]
|
||||||
- Resolves: bz#1805334
|
- Resolves: bz#1805334
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user