|
 |
9ae3a8 |
From f9a24822687113e34194f05aeb641365b8202e9e Mon Sep 17 00:00:00 2001
|
|
|
9ae3a8 |
From: Amit Shah <amit.shah@redhat.com>
|
|
|
9ae3a8 |
Date: Wed, 25 Nov 2015 05:51:34 +0100
|
|
|
9ae3a8 |
Subject: [PATCH 4/6] target-i386: get/put MSR_TSC_AUX across reset and
|
|
|
9ae3a8 |
migration
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Message-id: <daab7f1c955ec81df8aff4ab10fd6ae17e16e99e.1448430513.git.amit.shah@redhat.com>
|
|
|
9ae3a8 |
Patchwork-id: 68467
|
|
|
9ae3a8 |
O-Subject: [RHEL 7.3 qemu-kvm PATCH 1/1] target-i386: get/put MSR_TSC_AUX across reset and migration
|
|
|
9ae3a8 |
Bugzilla: 1265427
|
|
|
9ae3a8 |
RH-Acked-by: Juan Quintela <quintela@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Eduardo Habkost <ehabkost@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
There's one report of migration breaking due to missing MSR_TSC_AUX
|
|
|
9ae3a8 |
save/restore. Fix this by adding a new subsection that saves the state
|
|
|
9ae3a8 |
of this MSR.
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
https://bugzilla.redhat.com/show_bug.cgi?id=1261797
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Reported-by: Xiaoqing Wei <xwei@redhat.com>
|
|
|
9ae3a8 |
Signed-off-by: Amit Shah <amit.shah@redhat.com>
|
|
|
9ae3a8 |
CC: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
9ae3a8 |
CC: Juan Quintela <quintela@redhat.com>
|
|
|
9ae3a8 |
CC: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
|
|
|
9ae3a8 |
CC: Marcelo Tosatti <mtosatti@redhat.com>
|
|
|
9ae3a8 |
CC: Richard Henderson <rth@twiddle.net>
|
|
|
9ae3a8 |
CC: Eduardo Habkost <ehabkost@redhat.com>
|
|
|
9ae3a8 |
Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
|
|
|
9ae3a8 |
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
|
|
|
9ae3a8 |
(cherry picked from commit c9b8f6b6210847b4381c5b2ee172b1c7eb9985d6)
|
|
|
9ae3a8 |
Signed-off-by: Amit Shah <amit.shah@redhat.com>
|
|
|
9ae3a8 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
9ae3a8 |
---
|
|
|
9ae3a8 |
target-i386/kvm.c | 14 ++++++++++++++
|
|
|
9ae3a8 |
1 file changed, 14 insertions(+)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
diff --git a/target-i386/kvm.c b/target-i386/kvm.c
|
|
|
9ae3a8 |
index c91bfb8..e1b0ca2 100644
|
|
|
9ae3a8 |
--- a/target-i386/kvm.c
|
|
|
9ae3a8 |
+++ b/target-i386/kvm.c
|
|
|
9ae3a8 |
@@ -63,6 +63,7 @@ const KVMCapabilityInfo kvm_arch_required_capabilities[] = {
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
static bool has_msr_star;
|
|
|
9ae3a8 |
static bool has_msr_hsave_pa;
|
|
|
9ae3a8 |
+static bool has_msr_tsc_aux;
|
|
|
9ae3a8 |
static bool has_msr_tsc_adjust;
|
|
|
9ae3a8 |
static bool has_msr_tsc_deadline;
|
|
|
9ae3a8 |
static bool has_msr_async_pf_en;
|
|
|
9ae3a8 |
@@ -774,6 +775,10 @@ static int kvm_get_supported_msrs(KVMState *s)
|
|
|
9ae3a8 |
has_msr_hsave_pa = true;
|
|
|
9ae3a8 |
continue;
|
|
|
9ae3a8 |
}
|
|
|
9ae3a8 |
+ if (kvm_msr_list->indices[i] == MSR_TSC_AUX) {
|
|
|
9ae3a8 |
+ has_msr_tsc_aux = true;
|
|
|
9ae3a8 |
+ continue;
|
|
|
9ae3a8 |
+ }
|
|
|
9ae3a8 |
if (kvm_msr_list->indices[i] == MSR_TSC_ADJUST) {
|
|
|
9ae3a8 |
has_msr_tsc_adjust = true;
|
|
|
9ae3a8 |
continue;
|
|
|
9ae3a8 |
@@ -1159,6 +1164,9 @@ static int kvm_put_msrs(X86CPU *cpu, int level)
|
|
|
9ae3a8 |
if (has_msr_hsave_pa) {
|
|
|
9ae3a8 |
kvm_msr_entry_set(&msrs[n++], MSR_VM_HSAVE_PA, env->vm_hsave);
|
|
|
9ae3a8 |
}
|
|
|
9ae3a8 |
+ if (has_msr_tsc_aux) {
|
|
|
9ae3a8 |
+ kvm_msr_entry_set(&msrs[n++], MSR_TSC_AUX, env->tsc_aux);
|
|
|
9ae3a8 |
+ }
|
|
|
9ae3a8 |
if (has_msr_tsc_adjust) {
|
|
|
9ae3a8 |
kvm_msr_entry_set(&msrs[n++], MSR_TSC_ADJUST, env->tsc_adjust);
|
|
|
9ae3a8 |
}
|
|
|
9ae3a8 |
@@ -1507,6 +1515,9 @@ static int kvm_get_msrs(X86CPU *cpu)
|
|
|
9ae3a8 |
if (has_msr_hsave_pa) {
|
|
|
9ae3a8 |
msrs[n++].index = MSR_VM_HSAVE_PA;
|
|
|
9ae3a8 |
}
|
|
|
9ae3a8 |
+ if (has_msr_tsc_aux) {
|
|
|
9ae3a8 |
+ msrs[n++].index = MSR_TSC_AUX;
|
|
|
9ae3a8 |
+ }
|
|
|
9ae3a8 |
if (has_msr_tsc_adjust) {
|
|
|
9ae3a8 |
msrs[n++].index = MSR_TSC_ADJUST;
|
|
|
9ae3a8 |
}
|
|
|
9ae3a8 |
@@ -1636,6 +1647,9 @@ static int kvm_get_msrs(X86CPU *cpu)
|
|
|
9ae3a8 |
case MSR_IA32_TSC:
|
|
|
9ae3a8 |
env->tsc = msrs[i].data;
|
|
|
9ae3a8 |
break;
|
|
|
9ae3a8 |
+ case MSR_TSC_AUX:
|
|
|
9ae3a8 |
+ env->tsc_aux = msrs[i].data;
|
|
|
9ae3a8 |
+ break;
|
|
|
9ae3a8 |
case MSR_TSC_ADJUST:
|
|
|
9ae3a8 |
env->tsc_adjust = msrs[i].data;
|
|
|
9ae3a8 |
break;
|
|
|
9ae3a8 |
--
|
|
|
9ae3a8 |
1.8.3.1
|
|
|
9ae3a8 |
|