The branch main has been updated by kib:
URL:
https://cgit.FreeBSD.org/src/commit/?id=56b9bee63a42dbac712acf540f23a4c3dbd099a9
commit 56b9bee63a42dbac712acf540f23a4c3dbd099a9
Author: Konstantin Belousov <k...@freebsd.org>
AuthorDate: 2021-03-07 23:50:12 +0000
Commit: Konstantin Belousov <k...@freebsd.org>
CommitDate: 2021-03-08 01:48:21 +0000
Make kern.timecounter.hardware tunable
Noted and reviewed by: kevans
MFC after: 1 week
Sponsored by: The FreeBSD Foundation
Differential revision: https://reviews.freebsd.org/D29122
---
sys/kern/kern_tc.c | 22 ++++++++++++++++------
1 file changed, 16 insertions(+), 6 deletions(-)
diff --git a/sys/kern/kern_tc.c b/sys/kern/kern_tc.c
index 07841fd5ca0e..b1dcb18e31be 100644
--- a/sys/kern/kern_tc.c
+++ b/sys/kern/kern_tc.c
@@ -141,6 +141,7 @@ SYSCTL_PROC(_kern_timecounter, OID_AUTO, alloweddeviation,
volatile int rtc_generation = 1;
static int tc_chosen; /* Non-zero if a specific tc was chosen via sysctl. */
+static char tc_from_tunable[16];
static void tc_windup(struct bintime *new_boottimebin);
static void cpu_tick_calibrate(int);
@@ -1215,11 +1216,17 @@ tc_init(struct timecounter *tc)
return;
if (tc->tc_quality < 0)
return;
- if (tc->tc_quality < timecounter->tc_quality)
- return;
- if (tc->tc_quality == timecounter->tc_quality &&
- tc->tc_frequency < timecounter->tc_frequency)
- return;
+ if (tc_from_tunable[0] != '\0' &&
+ strcmp(tc->tc_name, tc_from_tunable) == 0) {
+ tc_chosen = 1;
+ tc_from_tunable[0] = '\0';
+ } else {
+ if (tc->tc_quality < timecounter->tc_quality)
+ return;
+ if (tc->tc_quality == timecounter->tc_quality &&
+ tc->tc_frequency < timecounter->tc_frequency)
+ return;
+ }
(void)tc->tc_get_timecount(tc);
timecounter = tc;
}
@@ -1500,7 +1507,7 @@ sysctl_kern_timecounter_hardware(SYSCTL_HANDLER_ARGS)
}
SYSCTL_PROC(_kern_timecounter, OID_AUTO, hardware,
- CTLTYPE_STRING | CTLFLAG_RW | CTLFLAG_MPSAFE, 0, 0,
+ CTLTYPE_STRING | CTLFLAG_RWTUN | CTLFLAG_NOFETCH | CTLFLAG_MPSAFE, 0, 0,
sysctl_kern_timecounter_hardware, "A",
"Timecounter hardware selected");
@@ -1940,6 +1947,9 @@ inittimehands(void *dummy)
for (i = 1, thp = &ths[0]; i < timehands_count; thp = &ths[i++])
thp->th_next = &ths[i];
thp->th_next = &ths[0];
+
+ TUNABLE_STR_FETCH("kern.timecounter.hardware", tc_from_tunable,
+ sizeof(tc_from_tunable));
}
SYSINIT(timehands, SI_SUB_TUNABLES, SI_ORDER_ANY, inittimehands, NULL);
_______________________________________________
dev-commits-src-main@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/dev-commits-src-main
To unsubscribe, send any mail to "dev-commits-src-main-unsubscr...@freebsd.org"
