105 lines
3.0 KiB
Diff
105 lines
3.0 KiB
Diff
|
References: FATE#313633
|
||
|
|
|
||
|
|
# HG changeset patch
|
||
|
|
# User Liu, Jinsong <jinsong.liu@intel.com>
|
||
|
|
# Date 1348654418 -7200
|
||
|
|
# Node ID 56fb977ce6eb4626a02d4a7a34e85009bb8ee3e0
|
||
|
|
# Parent c47ef9592fb39325e33f8406b4bd736cc84482e5
|
||
|
|
x86: Save/restore TSC adjust during HVM guest migration
|
||
|
|
|
||
|
|
Signed-off-by: Liu, Jinsong <jinsong.liu@intel.com>
|
||
|
|
Committed-by: Jan Beulich <jbeulich@suse.com>
|
||
|
|
|
||
|
|
--- a/tools/misc/xen-hvmctx.c
|
||
|
|
+++ b/tools/misc/xen-hvmctx.c
|
||
|
|
@@ -390,6 +390,13 @@ static void dump_vmce_vcpu(void)
|
||
|
|
printf(" VMCE_VCPU: caps %" PRIx64 "\n", p.caps);
|
||
|
|
}
|
||
|
|
|
||
|
|
+static void dump_tsc_adjust(void)
|
||
|
|
+{
|
||
|
|
+ HVM_SAVE_TYPE(TSC_ADJUST) p;
|
||
|
|
+ READ(p);
|
||
|
|
+ printf(" TSC_ADJUST: tsc_adjust %" PRIx64 "\n", p.tsc_adjust);
|
||
|
|
+}
|
||
|
|
+
|
||
|
|
int main(int argc, char **argv)
|
||
|
|
{
|
||
|
|
int entry, domid;
|
||
|
|
@@ -457,6 +464,7 @@ int main(int argc, char **argv)
|
||
|
|
case HVM_SAVE_CODE(VIRIDIAN_DOMAIN): dump_viridian_domain(); break;
|
||
|
|
case HVM_SAVE_CODE(VIRIDIAN_VCPU): dump_viridian_vcpu(); break;
|
||
|
|
case HVM_SAVE_CODE(VMCE_VCPU): dump_vmce_vcpu(); break;
|
||
|
|
+ case HVM_SAVE_CODE(TSC_ADJUST): dump_tsc_adjust(); break;
|
||
|
|
case HVM_SAVE_CODE(END): break;
|
||
|
|
default:
|
||
|
|
printf(" ** Don't understand type %u: skipping\n",
|
||
|
|
--- a/xen/arch/x86/hvm/hvm.c
|
||
|
|
+++ b/xen/arch/x86/hvm/hvm.c
|
||
|
|
@@ -610,6 +610,46 @@ void hvm_domain_destroy(struct domain *d
|
||
|
|
hvm_destroy_cacheattr_region_list(d);
|
||
|
|
}
|
||
|
|
|
||
|
|
+static int hvm_save_tsc_adjust(struct domain *d, hvm_domain_context_t *h)
|
||
|
|
+{
|
||
|
|
+ struct vcpu *v;
|
||
|
|
+ struct hvm_tsc_adjust ctxt;
|
||
|
|
+ int err = 0;
|
||
|
|
+
|
||
|
|
+ for_each_vcpu ( d, v )
|
||
|
|
+ {
|
||
|
|
+ ctxt.tsc_adjust = v->arch.hvm_vcpu.msr_tsc_adjust;
|
||
|
|
+ err = hvm_save_entry(TSC_ADJUST, v->vcpu_id, h, &ctxt);
|
||
|
|
+ if ( err )
|
||
|
|
+ break;
|
||
|
|
+ }
|
||
|
|
+
|
||
|
|
+ return err;
|
||
|
|
+}
|
||
|
|
+
|
||
|
|
+static int hvm_load_tsc_adjust(struct domain *d, hvm_domain_context_t *h)
|
||
|
|
+{
|
||
|
|
+ unsigned int vcpuid = hvm_load_instance(h);
|
||
|
|
+ struct vcpu *v;
|
||
|
|
+ struct hvm_tsc_adjust ctxt;
|
||
|
|
+
|
||
|
|
+ if ( vcpuid >= d->max_vcpus || (v = d->vcpu[vcpuid]) == NULL )
|
||
|
|
+ {
|
||
|
|
+ dprintk(XENLOG_G_ERR, "HVM restore: dom%d has no vcpu%u\n",
|
||
|
|
+ d->domain_id, vcpuid);
|
||
|
|
+ return -EINVAL;
|
||
|
|
+ }
|
||
|
|
+
|
||
|
|
+ if ( hvm_load_entry(TSC_ADJUST, h, &ctxt) != 0 )
|
||
|
|
+ return -EINVAL;
|
||
|
|
+
|
||
|
|
+ v->arch.hvm_vcpu.msr_tsc_adjust = ctxt.tsc_adjust;
|
||
|
|
+ return 0;
|
||
|
|
+}
|
||
|
|
+
|
||
|
|
+HVM_REGISTER_SAVE_RESTORE(TSC_ADJUST, hvm_save_tsc_adjust,
|
||
|
|
+ hvm_load_tsc_adjust, 1, HVMSR_PER_VCPU);
|
||
|
|
+
|
||
|
|
static int hvm_save_cpu_ctxt(struct domain *d, hvm_domain_context_t *h)
|
||
|
|
{
|
||
|
|
struct vcpu *v;
|
||
|
|
--- a/xen/include/public/arch-x86/hvm/save.h
|
||
|
|
+++ b/xen/include/public/arch-x86/hvm/save.h
|
||
|
|
@@ -581,9 +581,15 @@ struct hvm_vmce_vcpu {
|
||
|
|
|
||
|
|
DECLARE_HVM_SAVE_TYPE(VMCE_VCPU, 18, struct hvm_vmce_vcpu);
|
||
|
|
|
||
|
|
+struct hvm_tsc_adjust {
|
||
|
|
+ uint64_t tsc_adjust;
|
||
|
|
+};
|
||
|
|
+
|
||
|
|
+DECLARE_HVM_SAVE_TYPE(TSC_ADJUST, 19, struct hvm_tsc_adjust);
|
||
|
|
+
|
||
|
|
/*
|
||
|
|
* Largest type-code in use
|
||
|
|
*/
|
||
|
|
-#define HVM_SAVE_CODE_MAX 18
|
||
|
|
+#define HVM_SAVE_CODE_MAX 19
|
||
|
|
|
||
|
|
#endif /* __XEN_PUBLIC_HVM_SAVE_X86_H__ */
|