From nobody Mon Feb 27 22:12:18 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PQZVV6hDBz3tDSj; Mon, 27 Feb 2023 22:12:18 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PQZVV3cNvz3QWZ; Mon, 27 Feb 2023 22:12:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677535938; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9NKCTdyHMybvLfldt48HbbyexCtoN5kDQmQwrwIjY+c=; b=S0ds4HxcYWu0uL/IdvWBBSTU7M18Z3XzKKCVFjJs6ZMYWUs4Gc3o6ALajJyod2eHlzXj2D 0BB5QK8yspJo3ddo9n8aKQFvGTrKEJ1Dix9LKeE6l9uEXoAdptApfFLLk1MuSW/7RHAhof 1eowi7IxlcMILX34GdCpzpMIEgS8ZM9qsbOhkQceNszdOb8NcQ434hXaP5nb9Py911iBJ6 Kvm8hSFL0Gc/zZ0CaOFBIW/ro9JRqyuWSYuIo5Yx0xELQmfl1KVm8TzknIMb+KuA9U57tU DFq/nkCkpSSYvFXa7EfTueh71KuD/5uD5odeXyKupiMthRfldNOPAjo3iiHhpA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677535938; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9NKCTdyHMybvLfldt48HbbyexCtoN5kDQmQwrwIjY+c=; b=NdnYl7CaRlODsBgRM6+yJcKNg7dK7SlpyaXw43V+z63xhrggLEu8i7cJwlb6sL8vXfwTHn +dawvNXR8PYJSxpeTIFeLxCPFuzYdXKrvxrGBvqyJMr2oqTZYWFCmLpJciJMbi58Z+povR Hq0JHIxKKay1Za3ismjHoaMM3Qh2vaFCweql6wKuAGEoGVIFhTp4aQ2dCHYWkTrlVO6My0 FFQc38deW99uijPi10dIfe0ptPKDeFerF8pOQChYTPA/1L3u1FlZ1yz+jKDzCs9x7BUZZe yZNzle8ZjvmkyGywxaA7l+9kgr/CIzenmm1ro3FPmQkMY5S+b0fCd6hi29+KSw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677535938; a=rsa-sha256; cv=none; b=iAiq7DI3yt863+l4Jq0FN/F/H2uYUmrLoWSKUuvUqTxTfZ7H7RgDhSX6lO3I85VCWKBsZ/ wyK26wMH7DjFLuJ0fUPDlOS1OIFZsWjX0cmIiwAeVYRIw11ICsPvO4hGDsmSdxG/6934lK 4TmG1uD1G9F0UZY/jyAHjL2O1431pkERz2kKjI8jnSp14qqc5eASXB0Q4JVRJODBHejrTE wv3O3PH3vpPZuDgSu1KKoSEIOyAjV1umsSs2Da9/C+pInKlKSaMZTV3OM2RrAs6IM8/tPh cFg/lqNzS5wMDjufY2it1zgnaRIFc4wlbWvftLCc2Fxc6NK7TfVQj4C/4woBrw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PQZVV2k3lzjXg; Mon, 27 Feb 2023 22:12:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 31RMCIis028777; Mon, 27 Feb 2023 22:12:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31RMCILE028776; Mon, 27 Feb 2023 22:12:18 GMT (envelope-from git) Date: Mon, 27 Feb 2023 22:12:18 GMT Message-Id: <202302272212.31RMCILE028776@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: cb2a028b152b - main - pps: Load timecounter once in pps_capture() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cb2a028b152b09c1dc49d40d8031d27ce34b1585 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=cb2a028b152b09c1dc49d40d8031d27ce34b1585 commit cb2a028b152b09c1dc49d40d8031d27ce34b1585 Author: Sebastian Huber AuthorDate: 2023-02-27 21:49:09 +0000 Commit: Warner Losh CommitDate: 2023-02-27 22:10:54 +0000 pps: Load timecounter once in pps_capture() This ensures that the timecounter and the tc_get_timecount handler belong together. Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/604 --- sys/kern/kern_tc.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sys/kern/kern_tc.c b/sys/kern/kern_tc.c index 37287df4d1fd..20520adc0aba 100644 --- a/sys/kern/kern_tc.c +++ b/sys/kern/kern_tc.c @@ -1761,6 +1761,7 @@ void pps_capture(struct pps_state *pps) { struct timehands *th; + struct timecounter *tc; KASSERT(pps != NULL, ("NULL pps pointer in pps_capture")); th = timehands; @@ -1769,7 +1770,8 @@ pps_capture(struct pps_state *pps) #ifdef FFCLOCK pps->capffth = fftimehands; #endif - pps->capcount = th->th_counter->tc_get_timecount(th->th_counter); + tc = th->th_counter; + pps->capcount = tc->tc_get_timecount(tc); atomic_thread_fence_acq(); if (pps->capgen != th->th_generation) pps->capgen = 0;