X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=gettime.c;h=8991703fd0662fad4616ed8ab66f154f12c0ade9;hp=f29edcb7bd64bb2085a03cae25c0ae25057c22aa;hb=9ee1c647001865a20324cbc2d7c1d68f0f24503e;hpb=d5e3f5d8ef7fab70288aa57c8660bc3d2199655f

diff --git a/gettime.c b/gettime.c
index f29edcb7..8991703f 100644
--- a/gettime.c
+++ b/gettime.c
@@ -21,11 +21,11 @@ int tsc_reliable = 0;
 
 struct tv_valid {
 	struct timeval last_tv;
+	uint64_t last_cycles;
 	int last_tv_valid;
-	unsigned long last_cycles;
 };
 #ifdef CONFIG_TLS_THREAD
-static struct tv_valid __thread static_tv_valid;
+static __thread struct tv_valid static_tv_valid;
 #else
 static pthread_key_t tv_tls_key;
 #endif
@@ -168,7 +168,7 @@ static void *__fio_gettime(struct timeval *tp)
 #endif
 #ifdef ARCH_HAVE_CPU_CLOCK
 	case CS_CPUCLOCK: {
-		unsigned long long usecs, t;
+		uint64_t usecs, t;
 
 		t = get_cpu_clock();
 		if (tv && t < tv->last_cycles) {
@@ -205,7 +205,7 @@ void fio_gettime(struct timeval *tp, void fio_unused *caller)
 
 	gtod_log_caller(caller);
 #endif
-	if (fio_tv) {
+	if (fio_unlikely(fio_tv)) {
 		memcpy(tp, fio_tv, sizeof(*tp));
 		return;
 	}
@@ -233,7 +233,7 @@ void fio_gettime(struct timeval *tp, void fio_unused *caller)
 static unsigned long get_cycles_per_usec(void)
 {
 	struct timeval s, e;
-	unsigned long long c_s, c_e;
+	uint64_t c_s, c_e;
 	enum fio_cs old_cs = fio_clock_source;
 
 #ifdef CONFIG_CLOCK_GETTIME
@@ -245,7 +245,7 @@ static unsigned long get_cycles_per_usec(void)
 
 	c_s = get_cpu_clock();
 	do {
-		unsigned long long elapsed;
+		uint64_t elapsed;
 
 		__fio_gettime(&e);
 
@@ -262,10 +262,10 @@ static unsigned long get_cycles_per_usec(void)
 
 #define NR_TIME_ITERS	50
 
-static void calibrate_cpu_clock(void)
+static int calibrate_cpu_clock(void)
 {
 	double delta, mean, S;
-	unsigned long avg, cycles[NR_TIME_ITERS];
+	uint64_t avg, cycles[NR_TIME_ITERS];
 	int i, samples;
 
 	cycles[0] = get_cycles_per_usec();
@@ -279,6 +279,13 @@ static void calibrate_cpu_clock(void)
 		}
 	}
 
+	/*
+	 * The most common platform clock breakage is returning zero
+	 * indefinitely. Check for that and return failure.
+	 */
+	if (!cycles[0] && !cycles[NR_TIME_ITERS - 1])
+		return 1;
+
 	S = sqrt(S / (NR_TIME_ITERS - 1.0));
 
 	samples = avg = 0;
@@ -295,20 +302,23 @@ static void calibrate_cpu_clock(void)
 	mean /= 10.0;
 
 	for (i = 0; i < NR_TIME_ITERS; i++)
-		dprint(FD_TIME, "cycles[%d]=%lu\n", i, cycles[i] / 10);
+		dprint(FD_TIME, "cycles[%d]=%llu\n", i,
+					(unsigned long long) cycles[i] / 10);
 
 	avg /= samples;
 	avg = (avg + 5) / 10;
-	dprint(FD_TIME, "avg: %lu\n", avg);
+	dprint(FD_TIME, "avg: %llu\n", (unsigned long long) avg);
 	dprint(FD_TIME, "mean=%f, S=%f\n", mean, S);
 
 	cycles_per_usec = avg;
 	inv_cycles_per_usec = 16777216UL / cycles_per_usec;
 	dprint(FD_TIME, "inv_cycles_per_usec=%lu\n", inv_cycles_per_usec);
+	return 0;
 }
 #else
-static void calibrate_cpu_clock(void)
+static int calibrate_cpu_clock(void)
 {
+	return 1;
 }
 #endif
 
@@ -317,7 +327,7 @@ void fio_local_clock_init(int is_thread)
 {
 	struct tv_valid *t;
 
-	t = calloc(sizeof(*t), 1);
+	t = calloc(1, sizeof(*t));
 	if (pthread_setspecific(tv_tls_key, t))
 		log_err("fio: can't set TLS key\n");
 }
@@ -343,7 +353,9 @@ void fio_clock_init(void)
 #endif
 
 	fio_clock_source_inited = fio_clock_source;
-	calibrate_cpu_clock();
+
+	if (calibrate_cpu_clock())
+		tsc_reliable = 0;
 
 	/*
 	 * If the arch sets tsc_reliable != 0, then it must be good enough
@@ -429,9 +441,9 @@ uint64_t time_since_now(struct timeval *s)
 #define CLOCK_ENTRIES	100000
 
 struct clock_entry {
-	unsigned long seq;
-	unsigned long tsc;
-	unsigned long cpu;
+	uint32_t seq;
+	uint32_t cpu;
+	uint64_t tsc;
 };
 
 struct clock_thread {
@@ -439,11 +451,11 @@ struct clock_thread {
 	int cpu;
 	pthread_mutex_t lock;
 	pthread_mutex_t started;
-	uint64_t *seq;
+	uint32_t *seq;
 	struct clock_entry *entries;
 };
 
-static inline uint64_t atomic64_inc_return(uint64_t *seq)
+static inline uint32_t atomic32_inc_return(uint32_t *seq)
 {
 	return 1 + __sync_fetch_and_add(seq, 1);
 }
@@ -453,6 +465,7 @@ static void *clock_thread_fn(void *data)
 	struct clock_thread *t = data;
 	struct clock_entry *c;
 	os_cpu_mask_t cpu_mask;
+	uint32_t last_seq;
 	int i;
 
 	memset(&cpu_mask, 0, sizeof(cpu_mask));
@@ -466,13 +479,17 @@ static void *clock_thread_fn(void *data)
 	pthread_mutex_lock(&t->lock);
 	pthread_mutex_unlock(&t->started);
 
+	last_seq = 0;
 	c = &t->entries[0];
 	for (i = 0; i < CLOCK_ENTRIES; i++, c++) {
-		uint64_t seq, tsc;
+		uint32_t seq;
+		uint64_t tsc;
 
 		c->cpu = t->cpu;
 		do {
-			seq = atomic64_inc_return(t->seq);
+			seq = atomic32_inc_return(t->seq);
+			if (seq < last_seq)
+				break;
 			tsc = get_cpu_clock();
 		} while (seq != *t->seq);
 
@@ -480,7 +497,16 @@ static void *clock_thread_fn(void *data)
 		c->tsc = tsc;
 	}
 
-	log_info("cs: cpu%3d: %lu clocks seen\n", t->cpu, t->entries[CLOCK_ENTRIES - 1].tsc - t->entries[0].tsc);
+	log_info("cs: cpu%3d: %llu clocks seen\n", t->cpu,
+		(unsigned long long) t->entries[i - 1].tsc - t->entries[0].tsc);
+
+	/*
+	 * The most common platform clock breakage is returning zero
+	 * indefinitely. Check for that and return failure.
+	 */
+	if (!t->entries[i - 1].tsc && !t->entries[0].tsc)
+		return (void *) 1;
+
 	return NULL;
 }
 
@@ -501,7 +527,8 @@ int fio_monotonic_clocktest(void)
 	unsigned int nr_cpus = cpus_online();
 	struct clock_entry *entries;
 	unsigned long tentries, failed;
-	uint64_t seq = 0;
+	struct clock_entry *prev, *this;
+	uint32_t seq = 0;
 	int i;
 
 	log_info("cs: reliable_tsc: %s\n", tsc_reliable ? "yes" : "no");
@@ -551,14 +578,14 @@ int fio_monotonic_clocktest(void)
 	free(threads);
 
 	if (failed) {
-		log_err("Clocksource test: %u threads failed\n", failed);
+		log_err("Clocksource test: %lu threads failed\n", failed);
 		goto err;
 	}
 
 	qsort(entries, tentries, sizeof(struct clock_entry), clock_cmp);
 
 	for (failed = i = 0; i < tentries; i++) {
-		struct clock_entry *prev, *this = &entries[i];
+		this = &entries[i];
 
 		if (!i) {
 			prev = this;
@@ -568,9 +595,10 @@ int fio_monotonic_clocktest(void)
 		if (prev->tsc > this->tsc) {
 			uint64_t diff = prev->tsc - this->tsc;
 
-			log_info("cs: CPU clock mismatch (diff=%lu):\n", diff);
-			log_info("\t CPU%3lu: TSC=%lu, SEQ=%lu\n", prev->cpu, prev->tsc, prev->seq);
-			log_info("\t CPU%3lu: TSC=%lu, SEQ=%lu\n", this->cpu, this->tsc, this->seq);
+			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);
+			log_info("\t CPU%3u: TSC=%llu, SEQ=%u\n", this->cpu, (unsigned long long) this->tsc, this->seq);
 			failed++;
 		}