Page Menu
Home
FreeBSD
Search
Configure Global Search
Log In
Files
F131790058
D38341.id116426.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Flag For Later
Award Token
Size
2 KB
Referenced Files
None
Subscribers
None
D38341.id116426.diff
View Options
diff --git a/lib/libc/x86/sys/__vdso_gettc.c b/lib/libc/x86/sys/__vdso_gettc.c
--- a/lib/libc/x86/sys/__vdso_gettc.c
+++ b/lib/libc/x86/sys/__vdso_gettc.c
@@ -101,6 +101,13 @@
return (rdtsc32());
}
+static uint64_t
+rdtsc_mb_lfence(void)
+{
+ lfence();
+ return (rdtsc());
+}
+
static u_int
rdtsc32_mb_mfence(void)
{
@@ -108,38 +115,62 @@
return (rdtsc32());
}
+static uint64_t
+rdtsc_mb_mfence(void)
+{
+ mfence();
+ return (rdtsc());
+}
+
static u_int
rdtsc32_mb_none(void)
{
return (rdtsc32());
}
+static uint64_t
+rdtsc_mb_none(void)
+{
+ return (rdtsc());
+}
+
static u_int
rdtscp32_(void)
{
return (rdtscp32());
}
+static uint64_t
+rdtscp_(void)
+{
+ return (rdtscp());
+}
+
struct tsc_selector_tag {
u_int (*ts_rdtsc32)(void);
+ uint64_t (*ts_rdtsc)(void);
u_int (*ts_rdtsc_low)(const struct vdso_timehands *);
};
static const struct tsc_selector_tag tsc_selector[] = {
[0] = { /* Intel, LFENCE */
.ts_rdtsc32 = rdtsc32_mb_lfence,
+ .ts_rdtsc = rdtsc_mb_lfence,
.ts_rdtsc_low = rdtsc_low_mb_lfence,
},
[1] = { /* AMD, MFENCE */
.ts_rdtsc32 = rdtsc32_mb_mfence,
+ .ts_rdtsc = rdtsc_mb_mfence,
.ts_rdtsc_low = rdtsc_low_mb_mfence,
},
[2] = { /* No SSE2 */
- .ts_rdtsc32 = rdtsc32_mb_none,
- .ts_rdtsc_low = rdtsc_low_mb_none,
+ .ts_rdtsc32 = rdtsc32_mb_none,
+ .ts_rdtsc = rdtsc_mb_none,
+ .ts_rdtsc_low = rdtsc_low_mb_none,
},
[3] = { /* RDTSCP */
.ts_rdtsc32 = rdtscp32_,
+ .ts_rdtsc = rdtscp_,
.ts_rdtsc_low = rdtscp_low,
},
};
@@ -193,6 +224,11 @@
return (tsc_selector[tsc_selector_idx(cpu_feature)].ts_rdtsc32);
}
+DEFINE_UIFUNC(static, uint64_t, __vdso_gettc_rdtsc, (void))
+{
+ return (tsc_selector[tsc_selector_idx(cpu_feature)].ts_rdtsc);
+}
+
#define HPET_DEV_MAP_MAX 10
static volatile char *hpet_dev_map[HPET_DEV_MAP_MAX];
@@ -325,7 +361,7 @@
version = atomic_load_acq_32(&ti->version);
stable = (ti->flags & th->th_x86_pvc_stable_mask) != 0;
if (stable) {
- tsc = rdtscp();
+ tsc = __vdso_gettc_rdtsc();
} else {
(void)rdtscp_aux(&cpuid_ti);
ti = &pvclock_timeinfos[cpuid_ti];
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Sun, Oct 12, 4:39 AM (10 h, 50 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
23599504
Default Alt Text
D38341.id116426.diff (2 KB)
Attached To
Mode
D38341: libc: Fall back to rdtsc when using pvclock and rdtscp is not available
Attached
Detach File
Event Timeline
Log In to Comment