From nobody Wed Jun 29 18:32:12 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 0BDE487E73D; Wed, 29 Jun 2022 18:32:13 +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 4LY96h6m6Tz4csL; Wed, 29 Jun 2022 18:32:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656527533; 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=wxS6YqcviKdvnx11iAtlggIivOSGe5Y8cl22+/O2u5o=; b=xfrBLVLhMpoKW/VheSqZxF4xtX7KmZ3dZJvifeYfy4JZ5sxp1++WRAhTNnZ63NWN9h+Edj TKNijwm/TnEtONhSgvUxqQsjrw5BbgCsmm8bB6dE6e960sX4skRS1nvLhYpvyHhEkY97YN DL68DVq8klGi3qwlcK8cpzSE1b6xhwD2RDfKJF9onm7jxshNvqWXOfgdceMI+KdUVOicUh CUfRmcq1/jPhrSxuy66/olDNEcXF6cHWewK4FOFfMJD/9nJV01ECQbsVdMvIhU3svTaAzS CzHzH3LFi7iIzKMdFv2bBpgvWmowSMnXeLH2oXcdSXGjYOcozbQrL8deO4ZABw== 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 C7E7A16DCA; Wed, 29 Jun 2022 18:32:12 +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 25TIWCHi051688; Wed, 29 Jun 2022 18:32:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25TIWC6T051687; Wed, 29 Jun 2022 18:32:12 GMT (envelope-from git) Date: Wed, 29 Jun 2022 18:32:12 GMT Message-Id: <202206291832.25TIWC6T051687@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 1e54362824f6 - main - vfs_op_exit(): assert that mnt_vfs_ops stays non-zero for unmount or suspend 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1e54362824f62a9d43585e94422d1d3d5f0268f9 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656527533; 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=wxS6YqcviKdvnx11iAtlggIivOSGe5Y8cl22+/O2u5o=; b=I5NF8xGNhzakM1ddltlNj6dX8nPPKr60Q0FaRnRpLdmjpIXLYGRSoIc85NLq0mGFc/KLHQ EoVd8aQLDnEIR1XYFKrron2/BHZ5F1/gvsP2i8rGz3qJyjnTBYYL68b7FMgKPsB/9nwVew Vuv4Q6Z7fZTj0NocGWc3KdJ9AgIe8X4mmIFggGD4b66pMk5W+nBhI0U+3suROuR/Fu4wZJ L9pocYkdM5JZ9vSaXtS/6tInvWe6T3F9JUyCloWL5uCwhb8arNErFMHiNMY90O3ZqqSrgC bGkLVqhMVIxNbA1l+eCudb/gGen37bGjxpcrVHWH1uJpWfWjtAF6eO0zCXf0Zg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1656527533; a=rsa-sha256; cv=none; b=NxYHMpPfgaQnkVRnmNk/gJ5dsgtFmcNQnkxMsB7P3gv8PJtuG1dwHLlB+g9xfcfaquFjp9 BkMyPhnWnpk6k19fj5rR1s6mYqA1qn3fl3HsbhEHdNu3VAiarFgaNvN9Xyfs9AvHaEjqrY QiCt/Q88kP5+dtnpo6Ty16RWxo1naJxcLaktZVsXHyolwpN7NC9vk0TEPdKkt0mN9xmu1v asZbv0AoVJgog4QfDwDTHJ+pKJS5eGNzJ/SSTAoRAlC7aPkOG0RECsSqAZ5QhW+KL50gh0 QPp4LaO75Mory7w+TekxIZOzc4UkVuPDgoP3PzdR6AgcGKsNSrAC9eMXm01yuw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=1e54362824f62a9d43585e94422d1d3d5f0268f9 commit 1e54362824f62a9d43585e94422d1d3d5f0268f9 Author: Konstantin Belousov AuthorDate: 2022-06-20 15:54:44 +0000 Commit: Konstantin Belousov CommitDate: 2022-06-29 18:31:47 +0000 vfs_op_exit(): assert that mnt_vfs_ops stays non-zero for unmount or suspend Reviewed by: mjg Tested by: pho Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D35639 --- sys/kern/vfs_mount.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/kern/vfs_mount.c b/sys/kern/vfs_mount.c index 155e397b7f5e..73cc34da79ea 100644 --- a/sys/kern/vfs_mount.c +++ b/sys/kern/vfs_mount.c @@ -1763,6 +1763,10 @@ vfs_op_exit_locked(struct mount *mp) if (mp->mnt_vfs_ops <= 0) panic("%s: invalid vfs_ops count %d for mp %p\n", __func__, mp->mnt_vfs_ops, mp); + KASSERT(mp->mnt_vfs_ops > 1 || + (mp->mnt_kern_flag & (MNTK_UNMOUNT | MNTK_SUSPEND)) == 0, + ("%s: vfs_ops too low (%d) for mp %p in unmount or suspend", + __func__, mp->mnt_vfs_ops, mp)); mp->mnt_vfs_ops--; }