diff options
| author | jkim <jkim@FreeBSD.org> | 2011-04-07 23:28:28 +0000 |
|---|---|---|
| committer | jkim <jkim@FreeBSD.org> | 2011-04-07 23:28:28 +0000 |
| commit | 95c723445e6a8035e5b4b318941c66ac674cd16c (patch) | |
| tree | 664d6632a866948517ff612d5ccfb37cd5bf91db /sys/contrib | |
| parent | 824b228f1c496d62e28a46c5b32fbd974d60a42e (diff) | |
| download | FreeBSD-src-95c723445e6a8035e5b4b318941c66ac674cd16c.zip FreeBSD-src-95c723445e6a8035e5b4b318941c66ac674cd16c.tar.gz | |
Use atomic load & store for TSC frequency. It may be overkill for amd64 but
safer for i386 because it can be easily over 4 GHz now. More worse, it can
be easily changed by user with 'machdep.tsc_freq' tunable (directly) or
cpufreq(4) (indirectly). Note it is intentionally not used in performance
critical paths to avoid performance regression (but we should, in theory).
Alternatively, we may add "virtual TSC" with lower frequency if maximum
frequency overflows 32 bits (and ignore possible incoherency as we do now).
Diffstat (limited to 'sys/contrib')
| -rw-r--r-- | sys/contrib/altq/altq/altq_subr.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sys/contrib/altq/altq/altq_subr.c b/sys/contrib/altq/altq/altq_subr.c index 524e752..f5fe990 100644 --- a/sys/contrib/altq/altq/altq_subr.c +++ b/sys/contrib/altq/altq/altq_subr.c @@ -929,7 +929,8 @@ init_machclk_setup(void) #if defined(__amd64__) || defined(__i386__) /* check if TSC is available */ #ifdef __FreeBSD__ - if ((cpu_feature & CPUID_TSC) == 0 || tsc_freq == 0) + if ((cpu_feature & CPUID_TSC) == 0 || + atomic_load_acq_64(&tsc_freq) == 0) #else if ((cpu_feature & CPUID_TSC) == 0) #endif @@ -964,7 +965,7 @@ init_machclk(void) */ #if defined(__amd64__) || defined(__i386__) #ifdef __FreeBSD__ - machclk_freq = tsc_freq; + machclk_freq = atomic_load_acq_64(&tsc_freq); #elif defined(__NetBSD__) machclk_freq = (u_int32_t)cpu_tsc_freq; #elif defined(__OpenBSD__) && (defined(I586_CPU) || defined(I686_CPU)) |
