From: Dan Magenheimer Subject: [PATCH] trust new architecturally-defined TSC Invariant bit on Intel systems Date: Thu, 8 Oct 2009 11:05:59 -0700 (PDT) Message-ID: Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="__125502517373913952abhmt021.oracle.com" Return-path: List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: "Xen-Devel (E-mail)" Cc: Keir Fraser List-Id: xen-devel@lists.xenproject.org --__125502517373913952abhmt021.oracle.com Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: quoted-printable Trust new architecturally-defined TSC Invariant bit (on Intel systems only for now, AMD TBD). Signed-off-by: Dan Magenheimer diff -r 1d7221667204 xen/arch/x86/smpboot.c --- a/xen/arch/x86/smpboot.c=09Thu Oct 08 09:24:32 2009 +0100 +++ b/xen/arch/x86/smpboot.c=09Thu Oct 08 11:48:15 2009 -0600 @@ -187,6 +187,11 @@ static void __init synchronize_tsc_bp (v =09unsigned int one_usec; =09int buggy =3D 0; =20 +=09if (tsc_is_reliable()) { +=09=09printk("TSC is reliable, synchronization unnecessary\n"); +=09=09return; +=09} + =20 =09printk("checking TSC synchronization across %u CPUs: ", num_booting_cpu= s()); =20 =09/* convert from kcyc/sec to cyc/usec */ @@ -278,6 +283,9 @@ static void __init synchronize_tsc_ap (v static void __init synchronize_tsc_ap (void) { =09int i; + +=09if (tsc_is_reliable()) +=09=09return; =20 =09/* =09 * Not every cpu is online at the time diff -r 1d7221667204 xen/arch/x86/time.c --- a/xen/arch/x86/time.c=09Thu Oct 08 09:24:32 2009 +0100 +++ b/xen/arch/x86/time.c=09Thu Oct 08 11:48:15 2009 -0600 @@ -43,6 +43,12 @@ string_param("clocksource", opt_clocksou */ static int opt_consistent_tscs; boolean_param("consistent_tscs", opt_consistent_tscs); + +/* + * opt_tsc_broken: Override all tests and force TSC to be assumed unreliab= le + */ +static int opt_tsc_broken; +boolean_param("tsc_broken", opt_tsc_broken); =20 unsigned long cpu_khz; /* CPU clock frequency in kHz. */ DEFINE_SPINLOCK(rtc_lock); @@ -692,6 +698,11 @@ static void __init init_platform_timer(v freq_string(pts->frequency), pts->name); } =20 +int tsc_is_reliable(void) +{ + return boot_cpu_has(X86_FEATURE_TSC_RELIABLE) && !opt_tsc_broken; +} + void cstate_restore_tsc(void) { struct cpu_time *t =3D &this_cpu(cpu_time); @@ -699,7 +710,7 @@ void cstate_restore_tsc(void) s_time_t stime_delta; u64 new_tsc; =20 - if ( boot_cpu_has(X86_FEATURE_NONSTOP_TSC) ) + if ( boot_cpu_has(X86_FEATURE_NONSTOP_TSC) && !opt_tsc_broken ) return; =20 stime_delta =3D read_platform_stime() - t->stime_master_stamp; @@ -1117,6 +1128,9 @@ static void time_calibration_tsc_rendezv struct calibration_rendezvous *r =3D _r; unsigned int total_cpus =3D cpus_weight(r->cpu_calibration_map); =20 + if ( tsc_is_reliable() ) + goto skip_tsc_sync; + /* Loop to get rid of cache effects on TSC skew. */ for ( i =3D 4; i >=3D 0; i-- ) { @@ -1153,6 +1167,8 @@ static void time_calibration_tsc_rendezv mb(); } } + +skip_tsc_sync: =20 rdtscll(c->local_tsc_stamp); c->stime_local_stamp =3D get_s_time(); diff -r 1d7221667204 xen/include/asm-x86/time.h --- a/xen/include/asm-x86/time.h=09Thu Oct 08 09:24:32 2009 +0100 +++ b/xen/include/asm-x86/time.h=09Thu Oct 08 11:48:15 2009 -0600 @@ -43,4 +43,6 @@ uint64_t ns_to_acpi_pm_tick(uint64_t ns) =20 void pv_soft_rdtsc(struct vcpu *v, struct cpu_user_regs *regs); =20 +int tsc_is_reliable(void); + #endif /* __X86_TIME_H__ */ --__125502517373913952abhmt021.oracle.com Content-Type: application/octet-stream; name="tsc-reliab3.patch" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="tsc-reliab3.patch" ZGlmZiAtciAxZDcyMjE2NjcyMDQgeGVuL2FyY2gveDg2L3NtcGJvb3QuYwotLS0gYS94ZW4vYXJj aC94ODYvc21wYm9vdC5jCVRodSBPY3QgMDggMDk6MjQ6MzIgMjAwOSArMDEwMAorKysgYi94ZW4v YXJjaC94ODYvc21wYm9vdC5jCVRodSBPY3QgMDggMTE6NDg6MTUgMjAwOSAtMDYwMApAQCAtMTg3 LDYgKzE4NywxMSBAQCBzdGF0aWMgdm9pZCBfX2luaXQgc3luY2hyb25pemVfdHNjX2JwICh2CiAJ dW5zaWduZWQgaW50IG9uZV91c2VjOwogCWludCBidWdneSA9IDA7CiAKKwlpZiAodHNjX2lzX3Jl bGlhYmxlKCkpIHsKKwkJcHJpbnRrKCJUU0MgaXMgcmVsaWFibGUsIHN5bmNocm9uaXphdGlvbiB1 bm5lY2Vzc2FyeVxuIik7CisJCXJldHVybjsKKwl9CisgICAgICAgCiAJcHJpbnRrKCJjaGVja2lu ZyBUU0Mgc3luY2hyb25pemF0aW9uIGFjcm9zcyAldSBDUFVzOiAiLCBudW1fYm9vdGluZ19jcHVz KCkpOwogCiAJLyogY29udmVydCBmcm9tIGtjeWMvc2VjIHRvIGN5Yy91c2VjICovCkBAIC0yNzgs NiArMjgzLDkgQEAgc3RhdGljIHZvaWQgX19pbml0IHN5bmNocm9uaXplX3RzY19hcCAodgogc3Rh dGljIHZvaWQgX19pbml0IHN5bmNocm9uaXplX3RzY19hcCAodm9pZCkKIHsKIAlpbnQgaTsKKwor CWlmICh0c2NfaXNfcmVsaWFibGUoKSkKKwkJcmV0dXJuOwogCiAJLyoKIAkgKiBOb3QgZXZlcnkg Y3B1IGlzIG9ubGluZSBhdCB0aGUgdGltZQpkaWZmIC1yIDFkNzIyMTY2NzIwNCB4ZW4vYXJjaC94 ODYvdGltZS5jCi0tLSBhL3hlbi9hcmNoL3g4Ni90aW1lLmMJVGh1IE9jdCAwOCAwOToyNDozMiAy MDA5ICswMTAwCisrKyBiL3hlbi9hcmNoL3g4Ni90aW1lLmMJVGh1IE9jdCAwOCAxMTo0ODoxNSAy MDA5IC0wNjAwCkBAIC00Myw2ICs0MywxMiBAQCBzdHJpbmdfcGFyYW0oImNsb2Nrc291cmNlIiwg b3B0X2Nsb2Nrc291CiAgKi8KIHN0YXRpYyBpbnQgb3B0X2NvbnNpc3RlbnRfdHNjczsKIGJvb2xl YW5fcGFyYW0oImNvbnNpc3RlbnRfdHNjcyIsIG9wdF9jb25zaXN0ZW50X3RzY3MpOworCisvKgor ICogb3B0X3RzY19icm9rZW46IE92ZXJyaWRlIGFsbCB0ZXN0cyBhbmQgZm9yY2UgVFNDIHRvIGJl IGFzc3VtZWQgdW5yZWxpYWJsZQorICovCitzdGF0aWMgaW50IG9wdF90c2NfYnJva2VuOworYm9v bGVhbl9wYXJhbSgidHNjX2Jyb2tlbiIsIG9wdF90c2NfYnJva2VuKTsKIAogdW5zaWduZWQgbG9u ZyBjcHVfa2h6OyAgLyogQ1BVIGNsb2NrIGZyZXF1ZW5jeSBpbiBrSHouICovCiBERUZJTkVfU1BJ TkxPQ0socnRjX2xvY2spOwpAQCAtNjkyLDYgKzY5OCwxMSBAQCBzdGF0aWMgdm9pZCBfX2luaXQg aW5pdF9wbGF0Zm9ybV90aW1lcih2CiAgICAgICAgICAgIGZyZXFfc3RyaW5nKHB0cy0+ZnJlcXVl bmN5KSwgcHRzLT5uYW1lKTsKIH0KIAoraW50IHRzY19pc19yZWxpYWJsZSh2b2lkKQoreworICAg IHJldHVybiBib290X2NwdV9oYXMoWDg2X0ZFQVRVUkVfVFNDX1JFTElBQkxFKSAmJiAhb3B0X3Rz Y19icm9rZW47Cit9CisKIHZvaWQgY3N0YXRlX3Jlc3RvcmVfdHNjKHZvaWQpCiB7CiAgICAgc3Ry dWN0IGNwdV90aW1lICp0ID0gJnRoaXNfY3B1KGNwdV90aW1lKTsKQEAgLTY5OSw3ICs3MTAsNyBA QCB2b2lkIGNzdGF0ZV9yZXN0b3JlX3RzYyh2b2lkKQogICAgIHNfdGltZV90IHN0aW1lX2RlbHRh OwogICAgIHU2NCBuZXdfdHNjOwogCi0gICAgaWYgKCBib290X2NwdV9oYXMoWDg2X0ZFQVRVUkVf Tk9OU1RPUF9UU0MpICkKKyAgICBpZiAoIGJvb3RfY3B1X2hhcyhYODZfRkVBVFVSRV9OT05TVE9Q X1RTQykgJiYgIW9wdF90c2NfYnJva2VuICkKICAgICAgICAgcmV0dXJuOwogCiAgICAgc3RpbWVf ZGVsdGEgPSByZWFkX3BsYXRmb3JtX3N0aW1lKCkgLSB0LT5zdGltZV9tYXN0ZXJfc3RhbXA7CkBA IC0xMTE3LDYgKzExMjgsOSBAQCBzdGF0aWMgdm9pZCB0aW1lX2NhbGlicmF0aW9uX3RzY19yZW5k ZXp2CiAgICAgc3RydWN0IGNhbGlicmF0aW9uX3JlbmRlenZvdXMgKnIgPSBfcjsKICAgICB1bnNp Z25lZCBpbnQgdG90YWxfY3B1cyA9IGNwdXNfd2VpZ2h0KHItPmNwdV9jYWxpYnJhdGlvbl9tYXAp OwogCisgICAgaWYgKCB0c2NfaXNfcmVsaWFibGUoKSApCisgICAgICAgIGdvdG8gc2tpcF90c2Nf c3luYzsKKwogICAgIC8qIExvb3AgdG8gZ2V0IHJpZCBvZiBjYWNoZSBlZmZlY3RzIG9uIFRTQyBz a2V3LiAqLwogICAgIGZvciAoIGkgPSA0OyBpID49IDA7IGktLSApCiAgICAgewpAQCAtMTE1Myw2 ICsxMTY3LDggQEAgc3RhdGljIHZvaWQgdGltZV9jYWxpYnJhdGlvbl90c2NfcmVuZGV6dgogICAg ICAgICAgICAgICAgIG1iKCk7CiAgICAgICAgIH0KICAgICB9CisKK3NraXBfdHNjX3N5bmM6CiAK ICAgICByZHRzY2xsKGMtPmxvY2FsX3RzY19zdGFtcCk7CiAgICAgYy0+c3RpbWVfbG9jYWxfc3Rh bXAgPSBnZXRfc190aW1lKCk7CmRpZmYgLXIgMWQ3MjIxNjY3MjA0IHhlbi9pbmNsdWRlL2FzbS14 ODYvdGltZS5oCi0tLSBhL3hlbi9pbmNsdWRlL2FzbS14ODYvdGltZS5oCVRodSBPY3QgMDggMDk6 MjQ6MzIgMjAwOSArMDEwMAorKysgYi94ZW4vaW5jbHVkZS9hc20teDg2L3RpbWUuaAlUaHUgT2N0 IDA4IDExOjQ4OjE1IDIwMDkgLTA2MDAKQEAgLTQzLDQgKzQzLDYgQEAgdWludDY0X3QgbnNfdG9f YWNwaV9wbV90aWNrKHVpbnQ2NF90IG5zKQogCiB2b2lkIHB2X3NvZnRfcmR0c2Moc3RydWN0IHZj cHUgKnYsIHN0cnVjdCBjcHVfdXNlcl9yZWdzICpyZWdzKTsKIAoraW50IHRzY19pc19yZWxpYWJs ZSh2b2lkKTsKKwogI2VuZGlmIC8qIF9fWDg2X1RJTUVfSF9fICovCg== --__125502517373913952abhmt021.oracle.com Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel --__125502517373913952abhmt021.oracle.com--