X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=gettime.c;h=f40abc7a5ad347a00a57092375c3b728ae1fbd16;hp=a95b5452e5d5b3dcb382fb40ad7f79715ebfdc73;hb=e66d7f908a2681cbdcd718b8c2c0247d0857c229;hpb=73df3e072e210c93934d21668cc8adba4ae74d77 diff --git a/gettime.c b/gettime.c index a95b5452..f40abc7a 100644 --- a/gettime.c +++ b/gettime.c @@ -26,11 +26,13 @@ struct tv_valid { int last_tv_valid; int warned; }; +#ifdef ARCH_HAVE_CPU_CLOCK #ifdef CONFIG_TLS_THREAD static __thread struct tv_valid static_tv_valid; #else static pthread_key_t tv_tls_key; #endif +#endif enum fio_cs fio_clock_source = FIO_PREFERRED_CLOCK_SOURCE; int fio_clock_source_set = 0; @@ -137,14 +139,6 @@ static int fill_clock_gettime(struct timespec *ts) static void __fio_gettime(struct timeval *tp) { - struct tv_valid *tv; - -#ifdef CONFIG_TLS_THREAD - tv = &static_tv_valid; -#else - tv = pthread_getspecific(tv_tls_key); -#endif - switch (fio_clock_source) { #ifdef CONFIG_GETTIMEOFDAY case CS_GTOD: @@ -168,15 +162,20 @@ static void __fio_gettime(struct timeval *tp) #ifdef ARCH_HAVE_CPU_CLOCK case CS_CPUCLOCK: { uint64_t usecs, t; + struct tv_valid *tv; + +#ifdef CONFIG_TLS_THREAD + tv = &static_tv_valid; +#else + tv = pthread_getspecific(tv_tls_key); +#endif t = get_cpu_clock(); if (t < cycles_start && !cycles_wrap) cycles_wrap = 1; - else if (cycles_wrap && t >= cycles_start) { - if (!tv->warned) { - log_err("fio: double CPU clock wrap\n"); - tv->warned = 1; - } + else if (cycles_wrap && t >= cycles_start && !tv->warned) { + log_err("fio: double CPU clock wrap\n"); + tv->warned = 1; } t -= cycles_start; @@ -255,7 +254,7 @@ static unsigned long get_cycles_per_usec(void) static int calibrate_cpu_clock(void) { double delta, mean, S; - uint64_t avg, cycles[NR_TIME_ITERS]; + uint64_t minc, maxc, avg, cycles[NR_TIME_ITERS]; int i, samples; cycles[0] = get_cycles_per_usec(); @@ -278,10 +277,14 @@ static int calibrate_cpu_clock(void) S = sqrt(S / (NR_TIME_ITERS - 1.0)); - samples = avg = 0; + minc = -1ULL; + maxc = samples = avg = 0; for (i = 0; i < NR_TIME_ITERS; i++) { double this = cycles[i]; + minc = min(cycles[i], minc); + maxc = max(cycles[i], maxc); + if ((fmax(this, mean) - fmin(this, mean)) > S) continue; samples++; @@ -297,8 +300,12 @@ static int calibrate_cpu_clock(void) avg /= samples; avg = (avg + 5) / 10; + minc /= 10; + maxc /= 10; dprint(FD_TIME, "avg: %llu\n", (unsigned long long) avg); - dprint(FD_TIME, "mean=%f, S=%f\n", mean, S); + dprint(FD_TIME, "min=%llu, max=%llu, mean=%f, S=%f\n", + (unsigned long long) minc, + (unsigned long long) maxc, mean, S); cycles_per_usec = avg; inv_cycles_per_usec = 16777216UL / cycles_per_usec; @@ -362,7 +369,7 @@ void fio_clock_init(void) * runs at a constant rate and is synced across CPU cores. */ if (tsc_reliable) { - if (!fio_clock_source_set) + if (!fio_clock_source_set && !fio_monotonic_clocktest(0)) fio_clock_source = CS_CPUCLOCK; } else if (fio_clock_source == CS_CPUCLOCK) log_info("fio: clocksource=cpu may not be reliable\n"); @@ -437,7 +444,8 @@ uint64_t time_since_now(const struct timeval *s) #if defined(FIO_HAVE_CPU_AFFINITY) && defined(ARCH_HAVE_CPU_CLOCK) && \ defined(CONFIG_SFAA) -#define CLOCK_ENTRIES 100000 +#define CLOCK_ENTRIES_DEBUG 100000 +#define CLOCK_ENTRIES_TEST 10000 struct clock_entry { uint32_t seq; @@ -448,8 +456,10 @@ struct clock_entry { struct clock_thread { pthread_t thread; int cpu; + int debug; pthread_mutex_t lock; pthread_mutex_t started; + unsigned long nr_entries; uint32_t *seq; struct clock_entry *entries; }; @@ -471,7 +481,9 @@ static void *clock_thread_fn(void *data) fio_cpu_set(&cpu_mask, t->cpu); if (fio_setaffinity(gettid(), cpu_mask) == -1) { - log_err("clock setaffinity failed\n"); + int __err = errno; + + log_err("clock setaffinity failed: %s\n", strerror(__err)); return (void *) 1; } @@ -480,7 +492,7 @@ static void *clock_thread_fn(void *data) last_seq = 0; c = &t->entries[0]; - for (i = 0; i < CLOCK_ENTRIES; i++, c++) { + for (i = 0; i < t->nr_entries; i++, c++) { uint32_t seq; uint64_t tsc; @@ -496,8 +508,12 @@ static void *clock_thread_fn(void *data) c->tsc = tsc; } - log_info("cs: cpu%3d: %llu clocks seen\n", t->cpu, - (unsigned long long) t->entries[i - 1].tsc - t->entries[0].tsc); + if (t->debug) { + unsigned long long clocks; + + clocks = t->entries[i - 1].tsc - t->entries[0].tsc; + log_info("cs: cpu%3d: %llu clocks seen\n", t->cpu, clocks); + } /* * The most common platform clock breakage is returning zero @@ -520,38 +536,49 @@ static int clock_cmp(const void *p1, const void *p2) return c1->seq - c2->seq; } -int fio_monotonic_clocktest(void) +int fio_monotonic_clocktest(int debug) { struct clock_thread *cthreads; unsigned int nr_cpus = cpus_online(); struct clock_entry *entries; - unsigned long tentries, failed = 0; + unsigned long nr_entries, tentries, failed = 0; struct clock_entry *prev, *this; uint32_t seq = 0; unsigned int i; - log_info("cs: reliable_tsc: %s\n", tsc_reliable ? "yes" : "no"); + if (debug) { + log_info("cs: reliable_tsc: %s\n", tsc_reliable ? "yes" : "no"); #ifdef FIO_INC_DEBUG - fio_debug |= 1U << FD_TIME; + fio_debug |= 1U << FD_TIME; #endif + nr_entries = CLOCK_ENTRIES_DEBUG; + } else + nr_entries = CLOCK_ENTRIES_TEST; + calibrate_cpu_clock(); + + if (debug) { #ifdef FIO_INC_DEBUG - fio_debug &= ~(1U << FD_TIME); + fio_debug &= ~(1U << FD_TIME); #endif + } cthreads = malloc(nr_cpus * sizeof(struct clock_thread)); - tentries = CLOCK_ENTRIES * nr_cpus; + tentries = nr_entries * nr_cpus; entries = malloc(tentries * sizeof(struct clock_entry)); - log_info("cs: Testing %u CPUs\n", nr_cpus); + if (debug) + log_info("cs: Testing %u CPUs\n", nr_cpus); for (i = 0; i < nr_cpus; i++) { struct clock_thread *t = &cthreads[i]; t->cpu = i; + t->debug = debug; t->seq = &seq; - t->entries = &entries[i * CLOCK_ENTRIES]; + t->nr_entries = nr_entries; + t->entries = &entries[i * nr_entries]; pthread_mutex_init(&t->lock, NULL); pthread_mutex_init(&t->started, NULL); pthread_mutex_lock(&t->lock); @@ -585,7 +612,8 @@ int fio_monotonic_clocktest(void) free(cthreads); if (failed) { - log_err("Clocksource test: %lu threads failed\n", failed); + if (debug) + log_err("Clocksource test: %lu threads failed\n", failed); goto err; } @@ -602,6 +630,11 @@ int fio_monotonic_clocktest(void) if (prev->tsc > this->tsc) { uint64_t diff = prev->tsc - this->tsc; + if (!debug) { + failed++; + break; + } + log_info("cs: CPU clock mismatch (diff=%llu):\n", (unsigned long long) diff); log_info("\t CPU%3u: TSC=%llu, SEQ=%u\n", prev->cpu, (unsigned long long) prev->tsc, prev->seq); @@ -612,11 +645,12 @@ int fio_monotonic_clocktest(void) prev = this; } - if (failed) - log_info("cs: Failed: %lu\n", failed); - else - log_info("cs: Pass!\n"); - + if (debug) { + if (failed) + log_info("cs: Failed: %lu\n", failed); + else + log_info("cs: Pass!\n"); + } err: free(entries); return !!failed; @@ -624,10 +658,11 @@ err: #else /* defined(FIO_HAVE_CPU_AFFINITY) && defined(ARCH_HAVE_CPU_CLOCK) */ -int fio_monotonic_clocktest(void) +int fio_monotonic_clocktest(int debug) { - log_info("cs: current platform does not support CPU clocks\n"); - return 0; + if (debug) + log_info("cs: current platform does not support CPU clocks\n"); + return 1; } #endif