From nobody Wed Jan 12 19:31:00 2022 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 E4C9D1946B19; Wed, 12 Jan 2022 19:31:01 +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 4JYyN50myXz4qkk; Wed, 12 Jan 2022 19:31:01 +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 D2D0512D1F; Wed, 12 Jan 2022 19:31:00 +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 20CJV0Fd054101; Wed, 12 Jan 2022 19:31:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20CJV05i054100; Wed, 12 Jan 2022 19:31:00 GMT (envelope-from git) Date: Wed, 12 Jan 2022 19:31:00 GMT Message-Id: <202201121931.20CJV05i054100@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 72f61780a47d - stable/13 - vfs_mountroot: Wait for GEOM idle post root holds 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/stable/13 X-Git-Reftype: branch X-Git-Commit: 72f61780a47dd6b299b30787ad7ac8cc68e83a65 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642015861; 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=O+gJ5jTvuE8FF30TILquOxYs7vfk2tmddKMz92IJXrw=; b=yBYRuINZUjNf3qMQ4ZnUkph+K9miQOE49hWp194SlQJQuXPVDibW3f98uacv+h/6hwz14I zh7Q8rwciYl/6DvylM5BCvCxcM0qjLpRmlh4MSXH/t3knJD22GQET8/jDkTprTnP/ojGLe irLjMLMMk5BVP8jHyQSNaGnzg3kcJUXFh4GLKIYp515CyLBgKeybbjAHKgkh93M6Ak4wgh KtSfpkymMUbMYDEGbHp3/bT4punUMLn157tuonFVvq9/3LEBe7Lp01s9XERU+Q1I1UzGS6 /V2Vi3HIHhJku9qB5dzg2Q/ye42ylNg9Cgxk3DwRSjxVRl/Jzh8bQDHMIZJb/g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1642015861; a=rsa-sha256; cv=none; b=R/prN1jyEob1mrMG2nXOOPLTt+h21LVnYTBsZXBY4T1s9wNmNLBTzQ3JPddhAPmukWydFW O+cJjSdSBkUHucAZ2I68SkFXk0nq+jL6hL2nnIdS4Hbsm270OdbdPvzT5kMIZfTyLqS/1y +GOVZtzqsFr7gZsbh3BLRmFzsY2MJcEVWZgxPilzL7GM2DBtFDm2ZnMO3mByF3mnNHgbTk oqEuU8bjnelrPYAcZdaorOmrC86Yhk3YkYI5F1hp9cWy2UEX8kpcn2s5Crhiv98ADjITBC vNJYlwvLMJzMy7Bg2tBOIdGHdIO8m47IxcMqjH7HqrFAdLhBbDVDA9iDIUroQQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=72f61780a47dd6b299b30787ad7ac8cc68e83a65 commit 72f61780a47dd6b299b30787ad7ac8cc68e83a65 Author: Colin Percival AuthorDate: 2021-12-20 17:51:34 +0000 Commit: Colin Percival CommitDate: 2022-01-12 19:29:48 +0000 vfs_mountroot: Wait for GEOM idle post root holds In the case of a root hold related to the initialization of a disk device, a flurry of GEOM tasting is likely to take place as soon as the device is initialized and the root hold is released. If we don't wait for GEOM idle it's easy for vfs_mountroot to "win" the race and proceed before the root filesystem GEOM is ready. Reviewed by: imp Sponsored by: https://www.patreon.com/cperciva Differential Revision: https://reviews.freebsd.org/D33592 (cherry picked from commit 19a172158cc12b3bdd848fead732f2151c36e526) --- 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 3ea9a7397d06..851a9c839669 100644 --- a/sys/kern/vfs_mountroot.c +++ b/sys/kern/vfs_mountroot.c @@ -1006,6 +1006,7 @@ vfs_mountroot_wait(void) hz); TSUNWAIT("root mount"); } + g_waitidle(); TSEXIT(); }