From owner-svn-src-head@freebsd.org Mon Sep 9 12:42:48 2019 Return-Path: Delivered-To: svn-src-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id B894AD1581; Mon, 9 Sep 2019 12:42:48 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46Rnr84R7Jz3x96; Mon, 9 Sep 2019 12:42:48 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 7CFE1DC8B; Mon, 9 Sep 2019 12:42:48 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x89CgmMZ008987; Mon, 9 Sep 2019 12:42:48 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x89CgmJr008986; Mon, 9 Sep 2019 12:42:48 GMT (envelope-from kib@FreeBSD.org) Message-Id: <201909091242.x89CgmJr008986@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Mon, 9 Sep 2019 12:42:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r352060 - head/sys/kern X-SVN-Group: head X-SVN-Commit-Author: kib X-SVN-Commit-Paths: head/sys/kern X-SVN-Commit-Revision: 352060 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Sep 2019 12:42:48 -0000 Author: kib Date: Mon Sep 9 12:42:48 2019 New Revision: 352060 URL: https://svnweb.freebsd.org/changeset/base/352060 Log: Initialize timehands linkage much earlier. Reported and tested by: trasz Sponsored by: The FreeBSD Foundation MFC after: 1 week Modified: head/sys/kern/kern_tc.c Modified: head/sys/kern/kern_tc.c ============================================================================== --- head/sys/kern/kern_tc.c Mon Sep 9 11:29:58 2019 (r352059) +++ head/sys/kern/kern_tc.c Mon Sep 9 12:42:48 2019 (r352060) @@ -113,7 +113,8 @@ SYSCTL_INT(_kern_timecounter, OID_AUTO, stepwarnings, ×tepwarnings, 0, "Log time steps"); static int timehands_count = 2; -SYSCTL_INT(_kern_timecounter, OID_AUTO, timehands_count, CTLFLAG_RDTUN, +SYSCTL_INT(_kern_timecounter, OID_AUTO, timehands_count, + CTLFLAG_RDTUN | CTLFLAG_NOFETCH, &timehands_count, 0, "Count of timehands in rotation"); struct bintime bt_timethreshold; @@ -1958,12 +1959,30 @@ done: return (0); } +/* Set up the requested number of timehands. */ static void -inittimecounter(void *dummy) +inittimehands(void *dummy) { struct timehands *thp; + int i; + + TUNABLE_INT_FETCH("kern.timecounter.timehands_count", + &timehands_count); + if (timehands_count < 1) + timehands_count = 1; + if (timehands_count > nitems(ths)) + timehands_count = nitems(ths); + for (i = 1, thp = &ths[0]; i < timehands_count; thp = &ths[i++]) + thp->th_next = &ths[i]; + thp->th_next = &ths[0]; +} +SYSINIT(timehands, SI_SUB_TUNABLES, SI_ORDER_ANY, inittimehands, NULL); + +static void +inittimecounter(void *dummy) +{ u_int p; - int i, tick_rate; + int tick_rate; /* * Set the initial timeout to @@ -1989,15 +2008,6 @@ inittimecounter(void *dummy) #ifdef FFCLOCK ffclock_init(); #endif - - /* Set up the requested number of timehands. */ - if (timehands_count < 1) - timehands_count = 1; - if (timehands_count > nitems(ths)) - timehands_count = nitems(ths); - for (i = 1, thp = &ths[0]; i < timehands_count; thp = &ths[i++]) - thp->th_next = &ths[i]; - thp->th_next = &ths[0]; /* warm up new timecounter (again) and get rolling. */ (void)timecounter->tc_get_timecount(timecounter);