From nobody Wed Dec 29 20:41:24 2021 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 C315119245FE; Wed, 29 Dec 2021 20:41:24 +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 4JPNbm37ttz584b; Wed, 29 Dec 2021 20:41:24 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 4CD513793; Wed, 29 Dec 2021 20:41:24 +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 1BTKfOsU099524; Wed, 29 Dec 2021 20:41:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BTKfOA9099523; Wed, 29 Dec 2021 20:41:24 GMT (envelope-from git) Date: Wed, 29 Dec 2021 20:41:24 GMT Message-Id: <202112292041.1BTKfOA9099523@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Colin Percival Subject: git: e6db5eb9ec7b - main - vfs_mountroot: Skip 'Root mount waiting' < 1 s 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: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e6db5eb9ec7ba9edfc564fd5ade5fb40df9acebb Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1640810484; 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=T0odYHG4G7x637uU9SLZErjzZqWJOiJEDQMN2hNyeiI=; b=Kxy7JEWKJY2kfhyElkJs0/K58AV2soW7qykIupasS2ZhFAAXPWYnxTkdpkxPIgRNJdQlAH 4Zp4KIlj2MyETDqYobghEFSJ2mrBs6zghaHlkZe/eN++HjkuKZhUyRW0afAfrnzMOU4oTG /MCLVHGIexDIlLROgfMvPH+1OLDcRQdFjO2SHDE2g0JG4xWYpKdUzTtTNhFDVdnUkBoan5 4xkzoIL+TfF43h14ZXvkv6y8qrRAf9qePQj/zmOQR8cTPVjntS8fDRshTN9GnejNDTgu8n 8uPCy7iHOH5zV2qhxMiCXiq79ZmEFzz2sqfOQhM/onX7/SFw6A/oCS85xohJTQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1640810484; a=rsa-sha256; cv=none; b=T13O+qatbanXnlj2PN3EYc2pOZUvoil+0gnIETilmDnDEJOQj8WgA+C0+E8kxxYK646ew9 DnY5p67E2FPlGT5z2ZOQpLJWP5K9DktMWalZr0CTNK6DiG9ClPaDnvgNdX+H92DJ4URzv2 FBSA55Nw2UWJdx9mkBZJUZPmeT3x0MoW8+VJ8sDHEsT3sEokx6+y9X4lamHRSh8bEYGm1a 42Mm8ykDAz9qu09U54jc38+3bxOL2ZD3BYSalpTJ6idTk1e7r48XGA+H9N7YlbNnoBrvrC 3MHN0k//k0M9tlloW0mw72emBvXNN2UGkpG4Mai+ekU+EMi+xHl4fYEh2QLdVQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=e6db5eb9ec7ba9edfc564fd5ade5fb40df9acebb commit e6db5eb9ec7ba9edfc564fd5ade5fb40df9acebb Author: Colin Percival AuthorDate: 2021-12-20 15:17:25 +0000 Commit: Colin Percival CommitDate: 2021-12-29 20:41:08 +0000 vfs_mountroot: Skip 'Root mount waiting' < 1 s While the message is technically correct, it's not particularly helpful in the case where we're only waiting a few ms; this case occurs frequently on EC2 arm64 instances with CAM initialization racing to release its root hold before vfs_mountroot reaches this point. Only print the message if we end up waiting for more than one second. Sponsored by: https://www.patreon.com/cperciva Differential Revision: https://reviews.freebsd.org/D33591 --- sys/kern/vfs_mountroot.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/kern/vfs_mountroot.c b/sys/kern/vfs_mountroot.c index 9f3959f06b86..bb431c38a6f6 100644 --- a/sys/kern/vfs_mountroot.c +++ b/sys/kern/vfs_mountroot.c @@ -986,6 +986,7 @@ vfs_mountroot_wait(void) curfail = 0; lastfail.tv_sec = 0; + ppsratecheck(&lastfail, &curfail, 1); while (1) { g_waitidle(); mtx_lock(&root_holds_mtx);