From: Dan Magenheimer Subject: [PATCH] Implement rdtscp emulation and rdtscp_aux "support" Date: Wed, 25 Nov 2009 13:24:09 -0800 (PST) Message-ID: Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="__125918425829318203abhmt006.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)" List-Id: xen-devel@lists.xenproject.org --__125918425829318203abhmt006.oracle.com Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Implement rdtscp emulation and rdtscp_aux "support" The rdtscp instruction (and the associated TSC_AUX msr) are present on most recent AMD processors, and on the Nehalem and future Intel processors. Cpuid has a bit to detect the presence of this feature. Xen intentionally does not expose the cpuid rdtscp bit to PV OS's or to HVM guests, but PV apps can see this bit and, as a result, may choose to use the rdtscp instruction. When a PV guest with such an app is migrated to a machine that does not have rdtscp support, the app will get killed due to an invalid op. Fix this by emulating the rdtscp instruction. We also need to emulate rdtscp in the case where the machine has rdtscp support, but rdtsc emulation is enabled (which is unfortunately a different path: a privileged op). The rdtscp instruction reads the TSC_AUX register which presumably is set by the OS (and, in the case of tsc_mode=3D=3Dpvrdtscp, will be set by Xen). HV Linux and PV Linux will not set TSC_AUX because the cpuid rdtscp bit is not propogated by Xen; I'm told that Windows always sets TSC_AUX to zero. So for PV guests running on rdtscp-capable hardware (that don't use tsc_mode=3D=3Dpvrdtscp), always set TSC_AUX to zero. Signed-off-by: Dan Magenheimer diff -r c0e32941ee69 xen/arch/x86/time.c --- a/xen/arch/x86/time.c=09Wed Nov 25 14:19:50 2009 +0000 +++ b/xen/arch/x86/time.c=09Wed Nov 25 14:12:56 2009 -0700 @@ -851,9 +851,13 @@ static void __update_vcpu_system_time(st else tsc_stamp =3D t->local_tsc_stamp; =20 - if ( d->arch.tsc_mode =3D=3D TSC_MODE_PVRDTSCP && - boot_cpu_has(X86_FEATURE_RDTSCP) ) - write_rdtscp_aux(d->arch.incarnation); + if ( boot_cpu_has(X86_FEATURE_RDTSCP) ) + { + if ( d->arch.tsc_mode =3D=3D TSC_MODE_PVRDTSCP ) + write_rdtscp_aux(d->arch.incarnation); + else + write_rdtscp_aux(0); + } =20 /* Don't bother unless timestamps have changed or we are forced. */ if ( !force && (u->tsc_timestamp =3D=3D tsc_stamp) ) @@ -1608,7 +1612,7 @@ void tsc_check_reliability(void) * PV SoftTSC Emulation. */ =20 -void pv_soft_rdtsc(struct vcpu *v, struct cpu_user_regs *regs) +void pv_soft_rdtsc(struct vcpu *v, struct cpu_user_regs *regs, int rdtscp) { s_time_t now =3D get_s_time(); struct domain *d =3D v->domain; @@ -1633,6 +1637,10 @@ void pv_soft_rdtsc(struct vcpu *v, struc =20 regs->eax =3D (uint32_t)now; regs->edx =3D (uint32_t)(now >> 32); + + if ( rdtscp ) + regs->ecx =3D + (d->arch.tsc_mode =3D=3D TSC_MODE_PVRDTSCP) ? d->arch.incarn= ation : 0; } =20 static int host_tsc_is_safe(void) @@ -1826,7 +1834,7 @@ static void dump_softtsc(unsigned char k printk(",khz=3D%"PRIu32"",d->arch.tsc_khz); if ( d->arch.incarnation ) printk(",inc=3D%"PRIu32"",d->arch.incarnation); - if ( !d->arch.vtsc ) + if ( !(d->arch.vtsc_kerncount | d->arch.vtsc_usercount) ) { printk("\n"); continue; diff -r c0e32941ee69 xen/arch/x86/traps.c --- a/xen/arch/x86/traps.c=09Wed Nov 25 14:19:50 2009 +0000 +++ b/xen/arch/x86/traps.c=09Wed Nov 25 14:12:56 2009 -0700 @@ -831,6 +831,26 @@ static void pv_cpuid(struct cpu_user_reg regs->edx =3D d; } =20 +static int emulate_invalid_rdtscp(struct cpu_user_regs *regs) +{ + char opcode[3]; + unsigned long eip, rc; + struct vcpu *v =3D current; + + eip =3D regs->eip; + if ( (rc =3D copy_from_user(opcode, (char *)eip, sizeof(opcode))) !=3D= 0 ) + { + propagate_page_fault(eip + sizeof(opcode) - rc, 0); + return EXCRET_fault_fixed; + } + if ( memcmp(opcode, "\xf\x1\xf9", sizeof(opcode)) ) + return 0; + eip +=3D sizeof(opcode); + pv_soft_rdtsc(v, regs, 1); + instruction_done(regs, eip, 0); + return EXCRET_fault_fixed; +} + static int emulate_forced_invalid_op(struct cpu_user_regs *regs) { char sig[5], instr[2]; @@ -879,7 +899,8 @@ asmlinkage void do_invalid_op(struct cpu =20 if ( likely(guest_mode(regs)) ) { - if ( !emulate_forced_invalid_op(regs) ) + if ( !emulate_invalid_rdtscp(regs) && + !emulate_forced_invalid_op(regs) ) do_guest_trap(TRAP_invalid_op, regs, 0); return; } @@ -2009,11 +2030,12 @@ static int emulate_privileged_op(struct=20 =20 twobyte_opcode: /* - * All two-byte opcodes, except RDTSC (0x31) are executable only from - * guest kernel mode (virtual ring 0). + * All 2 and 3 byte opcodes, except RDTSC (0x31) and RDTSCP (0x1,0xF9) + * are executable only from guest kernel mode (virtual ring 0). */ opcode =3D insn_fetch(u8, code_base, eip, code_limit); if ( !guest_kernel_mode(v, regs) && + (opcode !=3D 0x1) && /* always emulate rdtscp */ !((opcode =3D=3D 0x31) && v->domain->arch.vtsc) ) goto fail; =20 @@ -2021,6 +2043,12 @@ static int emulate_privileged_op(struct=20 goto fail; switch ( opcode ) { + case 0x1: /* RDTSCP */ + if ( insn_fetch(u8, code_base, eip, code_limit) !=3D 0xf9 ) + goto fail; + pv_soft_rdtsc(v, regs, 1); + break; + case 0x06: /* CLTS */ (void)do_fpu_taskswitch(0); break; @@ -2269,7 +2297,7 @@ static int emulate_privileged_op(struct=20 } =20 case 0x31: /* RDTSC */ - pv_soft_rdtsc(v, regs); + pv_soft_rdtsc(v, regs, 0); break; =20 case 0x32: /* RDMSR */ diff -r c0e32941ee69 xen/include/asm-x86/time.h --- a/xen/include/asm-x86/time.h=09Wed Nov 25 14:19:50 2009 +0000 +++ b/xen/include/asm-x86/time.h=09Wed Nov 25 14:12:56 2009 -0700 @@ -59,7 +59,7 @@ uint64_t acpi_pm_tick_to_ns(uint64_t tic uint64_t acpi_pm_tick_to_ns(uint64_t ticks); uint64_t ns_to_acpi_pm_tick(uint64_t ns); =20 -void pv_soft_rdtsc(struct vcpu *v, struct cpu_user_regs *regs); +void pv_soft_rdtsc(struct vcpu *v, struct cpu_user_regs *regs, int rdtscp)= ; =20 void tsc_set_info(struct domain *d, uint32_t tsc_mode, uint64_t elapsed_ns= ec, uint32_t gtsc_khz, uint32_t incarnation); --__125918425829318203abhmt006.oracle.com Content-Type: application/octet-stream; name="rdtscp.patch" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="rdtscp.patch" ZGlmZiAtciBjMGUzMjk0MWVlNjkgeGVuL2FyY2gveDg2L3RpbWUuYwotLS0gYS94ZW4vYXJjaC94 ODYvdGltZS5jCVdlZCBOb3YgMjUgMTQ6MTk6NTAgMjAwOSArMDAwMAorKysgYi94ZW4vYXJjaC94 ODYvdGltZS5jCVdlZCBOb3YgMjUgMTQ6MTI6NTYgMjAwOSAtMDcwMApAQCAtODUxLDkgKzg1MSwx MyBAQCBzdGF0aWMgdm9pZCBfX3VwZGF0ZV92Y3B1X3N5c3RlbV90aW1lKHN0CiAgICAgZWxzZQog ICAgICAgICB0c2Nfc3RhbXAgPSB0LT5sb2NhbF90c2Nfc3RhbXA7CiAKLSAgICBpZiAoIGQtPmFy Y2gudHNjX21vZGUgPT0gIFRTQ19NT0RFX1BWUkRUU0NQICYmCi0gICAgICAgICAgICAgIGJvb3Rf Y3B1X2hhcyhYODZfRkVBVFVSRV9SRFRTQ1ApICkKLSAgICAgICAgd3JpdGVfcmR0c2NwX2F1eChk LT5hcmNoLmluY2FybmF0aW9uKTsKKyAgICBpZiAoIGJvb3RfY3B1X2hhcyhYODZfRkVBVFVSRV9S RFRTQ1ApICkKKyAgICB7CisgICAgICAgIGlmICggZC0+YXJjaC50c2NfbW9kZSA9PSAgVFNDX01P REVfUFZSRFRTQ1AgKQorICAgICAgICAgICAgd3JpdGVfcmR0c2NwX2F1eChkLT5hcmNoLmluY2Fy bmF0aW9uKTsKKyAgICAgICAgZWxzZQorICAgICAgICAgICAgd3JpdGVfcmR0c2NwX2F1eCgwKTsK KyAgICB9CiAKICAgICAvKiBEb24ndCBib3RoZXIgdW5sZXNzIHRpbWVzdGFtcHMgaGF2ZSBjaGFu Z2VkIG9yIHdlIGFyZSBmb3JjZWQuICovCiAgICAgaWYgKCAhZm9yY2UgJiYgKHUtPnRzY190aW1l c3RhbXAgPT0gdHNjX3N0YW1wKSApCkBAIC0xNjA4LDcgKzE2MTIsNyBAQCB2b2lkIHRzY19jaGVj a19yZWxpYWJpbGl0eSh2b2lkKQogICogUFYgU29mdFRTQyBFbXVsYXRpb24uCiAgKi8KIAotdm9p ZCBwdl9zb2Z0X3JkdHNjKHN0cnVjdCB2Y3B1ICp2LCBzdHJ1Y3QgY3B1X3VzZXJfcmVncyAqcmVn cykKK3ZvaWQgcHZfc29mdF9yZHRzYyhzdHJ1Y3QgdmNwdSAqdiwgc3RydWN0IGNwdV91c2VyX3Jl Z3MgKnJlZ3MsIGludCByZHRzY3ApCiB7CiAgICAgc190aW1lX3Qgbm93ID0gZ2V0X3NfdGltZSgp OwogICAgIHN0cnVjdCBkb21haW4gKmQgPSB2LT5kb21haW47CkBAIC0xNjMzLDYgKzE2MzcsMTAg QEAgdm9pZCBwdl9zb2Z0X3JkdHNjKHN0cnVjdCB2Y3B1ICp2LCBzdHJ1YwogCiAgICAgcmVncy0+ ZWF4ID0gKHVpbnQzMl90KW5vdzsKICAgICByZWdzLT5lZHggPSAodWludDMyX3QpKG5vdyA+PiAz Mik7CisKKyAgICBpZiAoIHJkdHNjcCApCisgICAgICAgICByZWdzLT5lY3ggPQorICAgICAgICAg ICAgIChkLT5hcmNoLnRzY19tb2RlID09IFRTQ19NT0RFX1BWUkRUU0NQKSA/ICBkLT5hcmNoLmlu Y2FybmF0aW9uIDogMDsKIH0KIAogc3RhdGljIGludCBob3N0X3RzY19pc19zYWZlKHZvaWQpCkBA IC0xODI2LDcgKzE4MzQsNyBAQCBzdGF0aWMgdm9pZCBkdW1wX3NvZnR0c2ModW5zaWduZWQgY2hh ciBrCiAgICAgICAgICAgICBwcmludGsoIixraHo9JSJQUkl1MzIiIixkLT5hcmNoLnRzY19raHop OwogICAgICAgICBpZiAoIGQtPmFyY2guaW5jYXJuYXRpb24gKQogICAgICAgICAgICAgcHJpbnRr KCIsaW5jPSUiUFJJdTMyIiIsZC0+YXJjaC5pbmNhcm5hdGlvbik7Ci0gICAgICAgIGlmICggIWQt PmFyY2gudnRzYyApCisgICAgICAgIGlmICggIShkLT5hcmNoLnZ0c2Nfa2VybmNvdW50IHwgZC0+ YXJjaC52dHNjX3VzZXJjb3VudCkgKQogICAgICAgICB7CiAgICAgICAgICAgICBwcmludGsoIlxu Iik7CiAgICAgICAgICAgICBjb250aW51ZTsKZGlmZiAtciBjMGUzMjk0MWVlNjkgeGVuL2FyY2gv eDg2L3RyYXBzLmMKLS0tIGEveGVuL2FyY2gveDg2L3RyYXBzLmMJV2VkIE5vdiAyNSAxNDoxOTo1 MCAyMDA5ICswMDAwCisrKyBiL3hlbi9hcmNoL3g4Ni90cmFwcy5jCVdlZCBOb3YgMjUgMTQ6MTI6 NTYgMjAwOSAtMDcwMApAQCAtODMxLDYgKzgzMSwyNiBAQCBzdGF0aWMgdm9pZCBwdl9jcHVpZChz dHJ1Y3QgY3B1X3VzZXJfcmVnCiAgICAgcmVncy0+ZWR4ID0gZDsKIH0KIAorc3RhdGljIGludCBl bXVsYXRlX2ludmFsaWRfcmR0c2NwKHN0cnVjdCBjcHVfdXNlcl9yZWdzICpyZWdzKQoreworICAg IGNoYXIgb3Bjb2RlWzNdOworICAgIHVuc2lnbmVkIGxvbmcgZWlwLCByYzsKKyAgICBzdHJ1Y3Qg dmNwdSAqdiA9IGN1cnJlbnQ7CisKKyAgICBlaXAgPSByZWdzLT5laXA7CisgICAgaWYgKCAocmMg PSBjb3B5X2Zyb21fdXNlcihvcGNvZGUsIChjaGFyICopZWlwLCBzaXplb2Yob3Bjb2RlKSkpICE9 IDAgKQorICAgIHsKKyAgICAgICAgcHJvcGFnYXRlX3BhZ2VfZmF1bHQoZWlwICsgc2l6ZW9mKG9w Y29kZSkgLSByYywgMCk7CisgICAgICAgIHJldHVybiBFWENSRVRfZmF1bHRfZml4ZWQ7CisgICAg fQorICAgIGlmICggbWVtY21wKG9wY29kZSwgIlx4Zlx4MVx4ZjkiLCBzaXplb2Yob3Bjb2RlKSkg KQorICAgICAgICByZXR1cm4gMDsKKyAgICBlaXAgKz0gc2l6ZW9mKG9wY29kZSk7CisgICAgcHZf c29mdF9yZHRzYyh2LCByZWdzLCAxKTsKKyAgICBpbnN0cnVjdGlvbl9kb25lKHJlZ3MsIGVpcCwg MCk7CisgICAgcmV0dXJuIEVYQ1JFVF9mYXVsdF9maXhlZDsKK30KKwogc3RhdGljIGludCBlbXVs YXRlX2ZvcmNlZF9pbnZhbGlkX29wKHN0cnVjdCBjcHVfdXNlcl9yZWdzICpyZWdzKQogewogICAg IGNoYXIgc2lnWzVdLCBpbnN0clsyXTsKQEAgLTg3OSw3ICs4OTksOCBAQCBhc21saW5rYWdlIHZv aWQgZG9faW52YWxpZF9vcChzdHJ1Y3QgY3B1CiAKICAgICBpZiAoIGxpa2VseShndWVzdF9tb2Rl KHJlZ3MpKSApCiAgICAgewotICAgICAgICBpZiAoICFlbXVsYXRlX2ZvcmNlZF9pbnZhbGlkX29w KHJlZ3MpICkKKyAgICAgICAgaWYgKCAhZW11bGF0ZV9pbnZhbGlkX3JkdHNjcChyZWdzKSAmJgor ICAgICAgICAgICAgICFlbXVsYXRlX2ZvcmNlZF9pbnZhbGlkX29wKHJlZ3MpICkKICAgICAgICAg ICAgIGRvX2d1ZXN0X3RyYXAoVFJBUF9pbnZhbGlkX29wLCByZWdzLCAwKTsKICAgICAgICAgcmV0 dXJuOwogICAgIH0KQEAgLTIwMDksMTEgKzIwMzAsMTIgQEAgc3RhdGljIGludCBlbXVsYXRlX3By aXZpbGVnZWRfb3Aoc3RydWN0IAogCiAgdHdvYnl0ZV9vcGNvZGU6CiAgICAgLyoKLSAgICAgKiBB bGwgdHdvLWJ5dGUgb3Bjb2RlcywgZXhjZXB0IFJEVFNDICgweDMxKSBhcmUgZXhlY3V0YWJsZSBv bmx5IGZyb20KLSAgICAgKiBndWVzdCBrZXJuZWwgbW9kZSAodmlydHVhbCByaW5nIDApLgorICAg ICAqIEFsbCAyIGFuZCAzIGJ5dGUgb3Bjb2RlcywgZXhjZXB0IFJEVFNDICgweDMxKSBhbmQgUkRU U0NQICgweDEsMHhGOSkKKyAgICAgKiBhcmUgZXhlY3V0YWJsZSBvbmx5IGZyb20gZ3Vlc3Qga2Vy bmVsIG1vZGUgKHZpcnR1YWwgcmluZyAwKS4KICAgICAgKi8KICAgICBvcGNvZGUgPSBpbnNuX2Zl dGNoKHU4LCBjb2RlX2Jhc2UsIGVpcCwgY29kZV9saW1pdCk7CiAgICAgaWYgKCAhZ3Vlc3Rfa2Vy bmVsX21vZGUodiwgcmVncykgJiYKKyAgICAgICAgIChvcGNvZGUgIT0gMHgxKSAmJiAvKiBhbHdh eXMgZW11bGF0ZSByZHRzY3AgKi8KICAgICAgICAgICEoKG9wY29kZSA9PSAweDMxKSAmJiB2LT5k b21haW4tPmFyY2gudnRzYykgKQogICAgICAgICBnb3RvIGZhaWw7CiAKQEAgLTIwMjEsNiArMjA0 MywxMiBAQCBzdGF0aWMgaW50IGVtdWxhdGVfcHJpdmlsZWdlZF9vcChzdHJ1Y3QgCiAgICAgICAg IGdvdG8gZmFpbDsKICAgICBzd2l0Y2ggKCBvcGNvZGUgKQogICAgIHsKKyAgICBjYXNlIDB4MTog LyogUkRUU0NQICovCisgICAgICAgIGlmICggaW5zbl9mZXRjaCh1OCwgY29kZV9iYXNlLCBlaXAs IGNvZGVfbGltaXQpICE9IDB4ZjkgKQorICAgICAgICAgICAgZ290byBmYWlsOworICAgICAgICBw dl9zb2Z0X3JkdHNjKHYsIHJlZ3MsIDEpOworICAgICAgICBicmVhazsKKwogICAgIGNhc2UgMHgw NjogLyogQ0xUUyAqLwogICAgICAgICAodm9pZClkb19mcHVfdGFza3N3aXRjaCgwKTsKICAgICAg ICAgYnJlYWs7CkBAIC0yMjY5LDcgKzIyOTcsNyBAQCBzdGF0aWMgaW50IGVtdWxhdGVfcHJpdmls ZWdlZF9vcChzdHJ1Y3QgCiAgICAgfQogCiAgICAgY2FzZSAweDMxOiAvKiBSRFRTQyAqLwotICAg ICAgICBwdl9zb2Z0X3JkdHNjKHYsIHJlZ3MpOworICAgICAgICBwdl9zb2Z0X3JkdHNjKHYsIHJl Z3MsIDApOwogICAgICAgICBicmVhazsKIAogICAgIGNhc2UgMHgzMjogLyogUkRNU1IgKi8KZGlm ZiAtciBjMGUzMjk0MWVlNjkgeGVuL2luY2x1ZGUvYXNtLXg4Ni90aW1lLmgKLS0tIGEveGVuL2lu Y2x1ZGUvYXNtLXg4Ni90aW1lLmgJV2VkIE5vdiAyNSAxNDoxOTo1MCAyMDA5ICswMDAwCisrKyBi L3hlbi9pbmNsdWRlL2FzbS14ODYvdGltZS5oCVdlZCBOb3YgMjUgMTQ6MTI6NTYgMjAwOSAtMDcw MApAQCAtNTksNyArNTksNyBAQCB1aW50NjRfdCBhY3BpX3BtX3RpY2tfdG9fbnModWludDY0X3Qg dGljCiB1aW50NjRfdCBhY3BpX3BtX3RpY2tfdG9fbnModWludDY0X3QgdGlja3MpOwogdWludDY0 X3QgbnNfdG9fYWNwaV9wbV90aWNrKHVpbnQ2NF90IG5zKTsKIAotdm9pZCBwdl9zb2Z0X3JkdHNj KHN0cnVjdCB2Y3B1ICp2LCBzdHJ1Y3QgY3B1X3VzZXJfcmVncyAqcmVncyk7Cit2b2lkIHB2X3Nv ZnRfcmR0c2Moc3RydWN0IHZjcHUgKnYsIHN0cnVjdCBjcHVfdXNlcl9yZWdzICpyZWdzLCBpbnQg cmR0c2NwKTsKIAogdm9pZCB0c2Nfc2V0X2luZm8oc3RydWN0IGRvbWFpbiAqZCwgdWludDMyX3Qg dHNjX21vZGUsIHVpbnQ2NF90IGVsYXBzZWRfbnNlYywKICAgICAgICAgICAgICAgICAgIHVpbnQz Ml90IGd0c2Nfa2h6LCB1aW50MzJfdCBpbmNhcm5hdGlvbik7Cg== --__125918425829318203abhmt006.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 --__125918425829318203abhmt006.oracle.com--