summaryrefslogtreecommitdiff
path: root/lib/libc/sys
diff options
context:
space:
mode:
authorScott Soule Cheloha <cheloha@cvs.openbsd.org>2022-07-23 22:58:52 +0000
committerScott Soule Cheloha <cheloha@cvs.openbsd.org>2022-07-23 22:58:52 +0000
commite8dc4d372a4edfe54061f8c6c5338474b87b111e (patch)
treea2d8d036e6290a33d8ac094392c7efa0d888172b /lib/libc/sys
parentd969f3953b6cbc3c85b4d2951270b787eae189c0 (diff)
timecounting: use full 96-bit product when computing elapsed time
The timecounting subsystem computes elapsed time by scaling (64 bits) the difference between two counter values (32 bits at most) up into a struct bintime (128 bits). Under normal circumstances it is sufficient to do this with 64-bit multiplication, like this: struct bintime bt; bt.sec = 0; bt.frac = th->tc_scale * tc_delta(th); However, if tc_delta() exceeds 1 second's worth of counter ticks, that multiplication overflows. The result is that the monotonic clock appears to jump backwards. When can this happen? In practice, I have seen it when trying to compile LLVM on an EdgeRouter Lite when using an SD card as the backing disk. The box gets stuck in swap, the hardclock(9) is delayed, and we appear to "lose time". To avoid this overflow we need to compute the full 96-bit product of the delta and the scale. This commit adds TIMECOUNT_TO_BINTIME(), a function for computing that full product, to sys/time.h. The patch puts the new function to use in lib/libc/sys/microtime.c and sys/kern/kern_tc.c. (The commit also reorganizes some of our high resolution bintime code so that we always read the timecounter first.) Doing the full 96-bit multiplication is between 0% and 15% slower than doing the cheaper 64-bit multiplication on amd64. Measuring a precise difference is extremely difficult because the computation is already quite fast. I would guess that the cost is slightly higher than that on 32-bit platforms. Nobody ever volunteered to test, so this remains a guess. Thread: https://marc.info/?l=openbsd-tech&m=163424607918042&w=2 6 month bump: https://marc.info/?l=openbsd-tech&m=165124251401342&w=2 Committed after 9 months without review.
Diffstat (limited to 'lib/libc/sys')
-rw-r--r--lib/libc/sys/microtime.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/lib/libc/sys/microtime.c b/lib/libc/sys/microtime.c
index e85a86a78de..9084e5813cf 100644
--- a/lib/libc/sys/microtime.c
+++ b/lib/libc/sys/microtime.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: microtime.c,v 1.1 2020/07/06 13:33:06 pirofti Exp $ */
+/* $OpenBSD: microtime.c,v 1.2 2022/07/23 22:58:51 cheloha Exp $ */
/*
* Copyright (c) 2000 Poul-Henning Kamp <phk@FreeBSD.org>
* Copyright (c) 2020 Paul Irofti <paul@irofti.net>
@@ -45,10 +45,10 @@ binuptime(struct bintime *bt, struct timekeep *tk)
do {
gen = tk->tk_generation;
membar_consumer();
- *bt = tk->tk_offset;
if (tc_delta(tk, &delta))
return -1;
- bintimeaddfrac(bt, tk->tk_scale * delta, bt);
+ TIMECOUNT_TO_BINTIME(delta, tk->tk_scale, bt);
+ bintimeadd(bt, &tk->tk_offset, bt);
membar_consumer();
} while (gen == 0 || gen != tk->tk_generation);
@@ -65,7 +65,8 @@ binruntime(struct bintime *bt, struct timekeep *tk)
membar_consumer();
if (tc_delta(tk, &delta))
return -1;
- bintimeaddfrac(&tk->tk_offset, tk->tk_scale * delta, bt);
+ TIMECOUNT_TO_BINTIME(delta, tk->tk_scale, bt);
+ bintimeadd(bt, &tk->tk_offset, bt);
bintimesub(bt, &tk->tk_naptime, bt);
membar_consumer();
} while (gen == 0 || gen != tk->tk_generation);
@@ -81,10 +82,10 @@ bintime(struct bintime *bt, struct timekeep *tk)
do {
gen = tk->tk_generation;
membar_consumer();
- *bt = tk->tk_offset;
if (tc_delta(tk, &delta))
return -1;
- bintimeaddfrac(bt, tk->tk_scale * delta, bt);
+ TIMECOUNT_TO_BINTIME(delta, tk->tk_scale, bt);
+ bintimeadd(bt, &tk->tk_offset, bt);
bintimeadd(bt, &tk->tk_boottime, bt);
membar_consumer();
} while (gen == 0 || gen != tk->tk_generation);