From: Dan Magenheimer Subject: [PATCH] rdtsc hypercall Date: Fri, 11 Sep 2009 09:04:41 -0700 (PDT) Message-ID: <9f4484bf-7b8c-48d7-be0f-e6e9fe6c8e16@default> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="__12526851098073705abhmt003.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 --__12526851098073705abhmt003.oracle.com Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: quoted-printable Implement hypercall for rdtsc. This provides a better performing alternative for guests for which rdtsc emulation is enabled (which may soon be the default). Three forms: 1) Read the raw physical cpu TSC 2) Read monotonically-increasing Xen system time (nsec since guest boot) 3) Determine if rdtsc emulation is enabled for this guest Form 3 can be used (once) to determine if rdtsc emulation is enabled. If it is not, the normal pvclock algorithm can be used as if it can be done in a vsyscall (in user space) it is, by far, the fastest. If it is, form 1 can be used to avoid the trap from rdtsc; or form 2 can be used directly as it should return the same result as applying the pvclock algorithm to the value returned by Form 1 EXCEPT form 2 enforces monotonicity. Signed-off-by: Dan Magenheimer --- a/xen/arch/x86/time.c=09Wed Sep 09 16:39:41 2009 +0100 +++ b/xen/arch/x86/time.c=09Fri Sep 11 09:52:18 2009 -0600 @@ -22,6 +22,7 @@ #include #include #include +#include #include #include #include @@ -1435,6 +1436,43 @@ struct tm wallclock_time(void) =20 =20 /* + * rdtsc hypercall + */ + +#ifdef __x86_64__ +uint64_t do_rdtsc_op(unsigned long subop) +{ + struct vcpu *v =3D current; + unsigned long eax, edx; + s_time_t now =3D 0; + + BUG_ON(is_pv_32on64_vcpu(v)); + switch (subop) + { + case RDTSC_READ_XEN_TSC: + + spin_lock(&v->domain->arch.vtsc_lock); + now =3D get_s_time() + v->domain->arch.vtsc_stime_offset; + if ( (int64_t)(now - v->domain->arch.vtsc_last) > 0 ) + v->domain->arch.vtsc_last =3D now; + else + now =3D ++v->domain->arch.vtsc_last; + spin_unlock(&v->domain->arch.vtsc_lock); + break; + case RDTSC_READ_RAW_TSC: + rdtsc(eax, edx); + now =3D ((uint64_t)edx << 32) | (uint32_t)eax; + break; + case RDTSC_IS_EMULATED: + now =3D v->domain->arch.vtsc ? 1 : 0; + break; + } + return now; +} +#endif + + +/* * PV SoftTSC Emulation. */ =20 diff -r d2a32e24fe50 xen/arch/x86/x86_32/entry.S --- a/xen/arch/x86/x86_32/entry.S=09Wed Sep 09 16:39:41 2009 +0100 +++ b/xen/arch/x86/x86_32/entry.S=09Fri Sep 11 09:52:18 2009 -0600 @@ -704,6 +704,7 @@ ENTRY(hypercall_table) .long do_domctl .long do_kexec_op .long do_tmem_op + .long do_ni_hypercall /* reserved for x86_64 do_rdtsc_op */ .rept __HYPERVISOR_arch_0-((.-hypercall_table)/4) .long do_ni_hypercall .endr @@ -752,6 +753,7 @@ ENTRY(hypercall_args_table) .byte 1 /* do_domctl */ .byte 2 /* do_kexec_op */ .byte 1 /* do_tmem_op */ + .byte 0 /* x86_64-only do_rdtsc_op */ .rept __HYPERVISOR_arch_0-(.-hypercall_args_table) .byte 0 /* do_ni_hypercall */ .endr diff -r d2a32e24fe50 xen/arch/x86/x86_64/compat/entry.S --- a/xen/arch/x86/x86_64/compat/entry.S=09Wed Sep 09 16:39:41 2009 +0100 +++ b/xen/arch/x86/x86_64/compat/entry.S=09Fri Sep 11 09:52:18 2009 -0600 @@ -409,6 +409,7 @@ ENTRY(compat_hypercall_table) .quad do_domctl .quad compat_kexec_op .quad do_tmem_op + .quad compat_ni_hypercall /* reserved for x86_64 do_rdtsc_op= */ .rept __HYPERVISOR_arch_0-((.-compat_hypercall_table)/8) .quad compat_ni_hypercall .endr @@ -457,6 +458,7 @@ ENTRY(compat_hypercall_args_table) .byte 1 /* do_domctl */ .byte 2 /* compat_kexec_op */ .byte 1 /* do_tmem_op */ + .byte 0 /* x86_64-only do_rdtsc_op */ .rept __HYPERVISOR_arch_0-(.-compat_hypercall_args_table) .byte 0 /* compat_ni_hypercall */ .endr diff -r d2a32e24fe50 xen/arch/x86/x86_64/entry.S --- a/xen/arch/x86/x86_64/entry.S=09Wed Sep 09 16:39:41 2009 +0100 +++ b/xen/arch/x86/x86_64/entry.S=09Fri Sep 11 09:52:18 2009 -0600 @@ -693,6 +693,7 @@ ENTRY(hypercall_table) .quad do_domctl .quad do_kexec_op .quad do_tmem_op + .quad do_rdtsc_op .rept __HYPERVISOR_arch_0-((.-hypercall_table)/8) .quad do_ni_hypercall .endr @@ -741,6 +742,7 @@ ENTRY(hypercall_args_table) .byte 1 /* do_domctl */ .byte 2 /* do_kexec */ .byte 1 /* do_tmem_op */ + .byte 1 /* do_rdtsc */ .rept __HYPERVISOR_arch_0-(.-hypercall_args_table) .byte 0 /* do_ni_hypercall */ .endr diff -r d2a32e24fe50 xen/include/public/xen.h --- a/xen/include/public/xen.h=09Wed Sep 09 16:39:41 2009 +0100 +++ b/xen/include/public/xen.h=09Fri Sep 11 09:52:18 2009 -0600 @@ -92,6 +92,7 @@ DEFINE_XEN_GUEST_HANDLE(xen_pfn_t); #define __HYPERVISOR_domctl 36 #define __HYPERVISOR_kexec_op 37 #define __HYPERVISOR_tmem_op 38 +#define __HYPERVISOR_rdtsc_op 39 /* x86/64 only */ =20 /* Architecture-specific hypercall definitions. */ #define __HYPERVISOR_arch_0 48 @@ -333,6 +334,17 @@ DEFINE_XEN_GUEST_HANDLE(mmuext_op_t); #define VMASST_TYPE_pae_extended_cr3 3 =20 #define MAX_VMASST_TYPE 3 + +/* + * Commands to HYPERVISOR_rdtsc_op() (x86/64 only) + */ + +/* read raw physical cpu TSC value (approx 2-3x faster than trap/emulate) = */ +#define RDTSC_READ_RAW_TSC 0 +/* read monotonically-increasing Xen system time (nsec since guest boot) *= / +#define RDTSC_READ_XEN_TSC 1 +/* is rdtsc emulation enabled for this guest? */ +#define RDTSC_IS_EMULATED 2 =20 #ifndef __ASSEMBLY__ --__12526851098073705abhmt003.oracle.com Content-Type: application/octet-stream; name="hyp-rdtsc-090911.patch" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="hyp-rdtsc-090911.patch" ZGlmZiAtciBkMmEzMmUyNGZlNTAgeGVuL2FyY2gveDg2L3RpbWUuYwotLS0gYS94ZW4vYXJjaC94 ODYvdGltZS5jCVdlZCBTZXAgMDkgMTY6Mzk6NDEgMjAwOSArMDEwMAorKysgYi94ZW4vYXJjaC94 ODYvdGltZS5jCUZyaSBTZXAgMTEgMDk6NTI6MTggMjAwOSAtMDYwMApAQCAtMjIsNiArMjIsNyBA QAogI2luY2x1ZGUgPHhlbi9pcnEuaD4KICNpbmNsdWRlIDx4ZW4vc29mdGlycS5oPgogI2luY2x1 ZGUgPHhlbi9rZXloYW5kbGVyLmg+CisjaW5jbHVkZSA8cHVibGljL3hlbi5oPgogI2luY2x1ZGUg PGFzbS9pby5oPgogI2luY2x1ZGUgPGFzbS9tc3IuaD4KICNpbmNsdWRlIDxhc20vbXBzcGVjLmg+ CkBAIC0xNDM1LDYgKzE0MzYsNDMgQEAgc3RydWN0IHRtIHdhbGxjbG9ja190aW1lKHZvaWQpCiAK IAogLyoKKyAqIHJkdHNjIGh5cGVyY2FsbAorICovCisKKyNpZmRlZiBfX3g4Nl82NF9fCit1aW50 NjRfdCBkb19yZHRzY19vcCh1bnNpZ25lZCBsb25nIHN1Ym9wKQoreworICAgIHN0cnVjdCB2Y3B1 ICp2ID0gY3VycmVudDsKKyAgICB1bnNpZ25lZCBsb25nIGVheCwgZWR4OworICAgIHNfdGltZV90 IG5vdyA9IDA7CisKKyAgICBCVUdfT04oaXNfcHZfMzJvbjY0X3ZjcHUodikpOworICAgIHN3aXRj aCAoc3Vib3ApCisgICAgeworICAgIGNhc2UgUkRUU0NfUkVBRF9YRU5fVFNDOgorCisgICAgICAg IHNwaW5fbG9jaygmdi0+ZG9tYWluLT5hcmNoLnZ0c2NfbG9jayk7CisgICAgICAgIG5vdyA9IGdl dF9zX3RpbWUoKSArIHYtPmRvbWFpbi0+YXJjaC52dHNjX3N0aW1lX29mZnNldDsKKyAgICAgICAg aWYgKCAoaW50NjRfdCkobm93IC0gdi0+ZG9tYWluLT5hcmNoLnZ0c2NfbGFzdCkgPiAwICkKKyAg ICAgICAgICAgIHYtPmRvbWFpbi0+YXJjaC52dHNjX2xhc3QgPSBub3c7CisgICAgICAgIGVsc2UK KyAgICAgICAgICAgIG5vdyA9ICsrdi0+ZG9tYWluLT5hcmNoLnZ0c2NfbGFzdDsKKyAgICAgICAg c3Bpbl91bmxvY2soJnYtPmRvbWFpbi0+YXJjaC52dHNjX2xvY2spOworICAgICAgICBicmVhazsK KyAgICBjYXNlIFJEVFNDX1JFQURfUkFXX1RTQzoKKyAgICAgICAgcmR0c2MoZWF4LCBlZHgpOwor ICAgICAgICBub3cgPSAoKHVpbnQ2NF90KWVkeCA8PCAzMikgfCAodWludDMyX3QpZWF4OworICAg ICAgICBicmVhazsKKyAgICBjYXNlIFJEVFNDX0lTX0VNVUxBVEVEOgorICAgICAgICBub3cgPSB2 LT5kb21haW4tPmFyY2gudnRzYyA/IDEgOiAwOworICAgICAgICBicmVhazsKKyAgICB9CisgICAg cmV0dXJuIG5vdzsKK30KKyNlbmRpZgorCisKKy8qCiAgKiBQViBTb2Z0VFNDIEVtdWxhdGlvbi4K ICAqLwogCmRpZmYgLXIgZDJhMzJlMjRmZTUwIHhlbi9hcmNoL3g4Ni94ODZfMzIvZW50cnkuUwot LS0gYS94ZW4vYXJjaC94ODYveDg2XzMyL2VudHJ5LlMJV2VkIFNlcCAwOSAxNjozOTo0MSAyMDA5 ICswMTAwCisrKyBiL3hlbi9hcmNoL3g4Ni94ODZfMzIvZW50cnkuUwlGcmkgU2VwIDExIDA5OjUy OjE4IDIwMDkgLTA2MDAKQEAgLTcwNCw2ICs3MDQsNyBAQCBFTlRSWShoeXBlcmNhbGxfdGFibGUp CiAgICAgICAgIC5sb25nIGRvX2RvbWN0bAogICAgICAgICAubG9uZyBkb19rZXhlY19vcAogICAg ICAgICAubG9uZyBkb190bWVtX29wCisgICAgICAgIC5sb25nIGRvX25pX2h5cGVyY2FsbCAgICAg ICAvKiByZXNlcnZlZCBmb3IgeDg2XzY0IGRvX3JkdHNjX29wICovCiAgICAgICAgIC5yZXB0IF9f SFlQRVJWSVNPUl9hcmNoXzAtKCguLWh5cGVyY2FsbF90YWJsZSkvNCkKICAgICAgICAgLmxvbmcg ZG9fbmlfaHlwZXJjYWxsCiAgICAgICAgIC5lbmRyCkBAIC03NTIsNiArNzUzLDcgQEAgRU5UUlko aHlwZXJjYWxsX2FyZ3NfdGFibGUpCiAgICAgICAgIC5ieXRlIDEgLyogZG9fZG9tY3RsICAgICAg ICAgICAgKi8KICAgICAgICAgLmJ5dGUgMiAvKiBkb19rZXhlY19vcCAgICAgICAgICAqLwogICAg ICAgICAuYnl0ZSAxIC8qIGRvX3RtZW1fb3AgICAgICAgICAgICovCisgICAgICAgIC5ieXRlIDAg LyogeDg2XzY0LW9ubHkgZG9fcmR0c2Nfb3AgKi8KICAgICAgICAgLnJlcHQgX19IWVBFUlZJU09S X2FyY2hfMC0oLi1oeXBlcmNhbGxfYXJnc190YWJsZSkKICAgICAgICAgLmJ5dGUgMCAvKiBkb19u aV9oeXBlcmNhbGwgICAgICAqLwogICAgICAgICAuZW5kcgpkaWZmIC1yIGQyYTMyZTI0ZmU1MCB4 ZW4vYXJjaC94ODYveDg2XzY0L2NvbXBhdC9lbnRyeS5TCi0tLSBhL3hlbi9hcmNoL3g4Ni94ODZf NjQvY29tcGF0L2VudHJ5LlMJV2VkIFNlcCAwOSAxNjozOTo0MSAyMDA5ICswMTAwCisrKyBiL3hl bi9hcmNoL3g4Ni94ODZfNjQvY29tcGF0L2VudHJ5LlMJRnJpIFNlcCAxMSAwOTo1MjoxOCAyMDA5 IC0wNjAwCkBAIC00MDksNiArNDA5LDcgQEAgRU5UUlkoY29tcGF0X2h5cGVyY2FsbF90YWJsZSkK ICAgICAgICAgLnF1YWQgZG9fZG9tY3RsCiAgICAgICAgIC5xdWFkIGNvbXBhdF9rZXhlY19vcAog ICAgICAgICAucXVhZCBkb190bWVtX29wCisgICAgICAgIC5xdWFkIGNvbXBhdF9uaV9oeXBlcmNh bGwgICAgICAgLyogcmVzZXJ2ZWQgZm9yIHg4Nl82NCBkb19yZHRzY19vcCAqLwogICAgICAgICAu cmVwdCBfX0hZUEVSVklTT1JfYXJjaF8wLSgoLi1jb21wYXRfaHlwZXJjYWxsX3RhYmxlKS84KQog ICAgICAgICAucXVhZCBjb21wYXRfbmlfaHlwZXJjYWxsCiAgICAgICAgIC5lbmRyCkBAIC00NTcs NiArNDU4LDcgQEAgRU5UUlkoY29tcGF0X2h5cGVyY2FsbF9hcmdzX3RhYmxlKQogICAgICAgICAu Ynl0ZSAxIC8qIGRvX2RvbWN0bCAgICAgICAgICAgICAgICAqLwogICAgICAgICAuYnl0ZSAyIC8q IGNvbXBhdF9rZXhlY19vcCAgICAgICAgICAqLwogICAgICAgICAuYnl0ZSAxIC8qIGRvX3RtZW1f b3AgICAgICAgICAgICAgICAqLworICAgICAgICAuYnl0ZSAwIC8qIHg4Nl82NC1vbmx5IGRvX3Jk dHNjX29wICAqLwogICAgICAgICAucmVwdCBfX0hZUEVSVklTT1JfYXJjaF8wLSguLWNvbXBhdF9o eXBlcmNhbGxfYXJnc190YWJsZSkKICAgICAgICAgLmJ5dGUgMCAvKiBjb21wYXRfbmlfaHlwZXJj YWxsICAgICAgKi8KICAgICAgICAgLmVuZHIKZGlmZiAtciBkMmEzMmUyNGZlNTAgeGVuL2FyY2gv eDg2L3g4Nl82NC9lbnRyeS5TCi0tLSBhL3hlbi9hcmNoL3g4Ni94ODZfNjQvZW50cnkuUwlXZWQg U2VwIDA5IDE2OjM5OjQxIDIwMDkgKzAxMDAKKysrIGIveGVuL2FyY2gveDg2L3g4Nl82NC9lbnRy eS5TCUZyaSBTZXAgMTEgMDk6NTI6MTggMjAwOSAtMDYwMApAQCAtNjkzLDYgKzY5Myw3IEBAIEVO VFJZKGh5cGVyY2FsbF90YWJsZSkKICAgICAgICAgLnF1YWQgZG9fZG9tY3RsCiAgICAgICAgIC5x dWFkIGRvX2tleGVjX29wCiAgICAgICAgIC5xdWFkIGRvX3RtZW1fb3AKKyAgICAgICAgLnF1YWQg ZG9fcmR0c2Nfb3AKICAgICAgICAgLnJlcHQgX19IWVBFUlZJU09SX2FyY2hfMC0oKC4taHlwZXJj YWxsX3RhYmxlKS84KQogICAgICAgICAucXVhZCBkb19uaV9oeXBlcmNhbGwKICAgICAgICAgLmVu ZHIKQEAgLTc0MSw2ICs3NDIsNyBAQCBFTlRSWShoeXBlcmNhbGxfYXJnc190YWJsZSkKICAgICAg ICAgLmJ5dGUgMSAvKiBkb19kb21jdGwgICAgICAgICAgICAqLwogICAgICAgICAuYnl0ZSAyIC8q IGRvX2tleGVjICAgICAgICAgICAgICovCiAgICAgICAgIC5ieXRlIDEgLyogZG9fdG1lbV9vcCAg ICAgICAgICAgKi8KKyAgICAgICAgLmJ5dGUgMSAvKiBkb19yZHRzYyAgICAgICAgICAgICAqLwog ICAgICAgICAucmVwdCBfX0hZUEVSVklTT1JfYXJjaF8wLSguLWh5cGVyY2FsbF9hcmdzX3RhYmxl KQogICAgICAgICAuYnl0ZSAwIC8qIGRvX25pX2h5cGVyY2FsbCAgICAgICovCiAgICAgICAgIC5l bmRyCmRpZmYgLXIgZDJhMzJlMjRmZTUwIHhlbi9pbmNsdWRlL3B1YmxpYy94ZW4uaAotLS0gYS94 ZW4vaW5jbHVkZS9wdWJsaWMveGVuLmgJV2VkIFNlcCAwOSAxNjozOTo0MSAyMDA5ICswMTAwCisr KyBiL3hlbi9pbmNsdWRlL3B1YmxpYy94ZW4uaAlGcmkgU2VwIDExIDA5OjUyOjE4IDIwMDkgLTA2 MDAKQEAgLTkyLDYgKzkyLDcgQEAgREVGSU5FX1hFTl9HVUVTVF9IQU5ETEUoeGVuX3Bmbl90KTsK ICNkZWZpbmUgX19IWVBFUlZJU09SX2RvbWN0bCAgICAgICAgICAgICAgIDM2CiAjZGVmaW5lIF9f SFlQRVJWSVNPUl9rZXhlY19vcCAgICAgICAgICAgICAzNwogI2RlZmluZSBfX0hZUEVSVklTT1Jf dG1lbV9vcCAgICAgICAgICAgICAgMzgKKyNkZWZpbmUgX19IWVBFUlZJU09SX3JkdHNjX29wICAg ICAgICAgICAgIDM5IC8qIHg4Ni82NCBvbmx5ICovCiAKIC8qIEFyY2hpdGVjdHVyZS1zcGVjaWZp YyBoeXBlcmNhbGwgZGVmaW5pdGlvbnMuICovCiAjZGVmaW5lIF9fSFlQRVJWSVNPUl9hcmNoXzAg ICAgICAgICAgICAgICA0OApAQCAtMzMzLDYgKzMzNCwxNyBAQCBERUZJTkVfWEVOX0dVRVNUX0hB TkRMRShtbXVleHRfb3BfdCk7CiAjZGVmaW5lIFZNQVNTVF9UWVBFX3BhZV9leHRlbmRlZF9jcjMg ICAgIDMKIAogI2RlZmluZSBNQVhfVk1BU1NUX1RZUEUgICAgICAgICAgICAgICAgICAzCisKKy8q CisgKiBDb21tYW5kcyB0byBIWVBFUlZJU09SX3JkdHNjX29wKCkgKHg4Ni82NCBvbmx5KQorICov CisKKy8qIHJlYWQgcmF3IHBoeXNpY2FsIGNwdSBUU0MgdmFsdWUgKGFwcHJveCAyLTN4IGZhc3Rl ciB0aGFuIHRyYXAvZW11bGF0ZSkgKi8KKyNkZWZpbmUgUkRUU0NfUkVBRF9SQVdfVFNDICAgICAg ICAgICAgICAgMAorLyogcmVhZCBtb25vdG9uaWNhbGx5LWluY3JlYXNpbmcgWGVuIHN5c3RlbSB0 aW1lIChuc2VjIHNpbmNlIGd1ZXN0IGJvb3QpICovCisjZGVmaW5lIFJEVFNDX1JFQURfWEVOX1RT QyAgICAgICAgICAgICAgIDEKKy8qIGlzIHJkdHNjIGVtdWxhdGlvbiBlbmFibGVkIGZvciB0aGlz IGd1ZXN0PyAqLworI2RlZmluZSBSRFRTQ19JU19FTVVMQVRFRCAgICAgICAgICAgICAgICAyCiAK ICNpZm5kZWYgX19BU1NFTUJMWV9fCiAK --__12526851098073705abhmt003.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 --__12526851098073705abhmt003.oracle.com--