From nobody Mon Feb 07 09:50:54 2022 X-Original-To: dev-commits-src-branches@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 9982419C14C6; Mon, 7 Feb 2022 09:51:00 +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 4JshGl2c5dz3sLQ; Mon, 7 Feb 2022 09:50:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644227459; 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=BDq5YdcExLhGqfKGYxDAy7NIaZ7xfUqSjFpjK+keEwc=; b=OmheatqDAKQdJkumIBikZqFFxGAD1tCcpiwVV58A3Dx+eyJ61JyYLiQmXaG2wlb5PN2GLC DKszeJo8k5sCpLgj3/z/ak2RS6+v57mzLNeX5AQGjnQaIUyC3eRu1liWlmHDlzyTJL9noW mvtvNwBOrsARGgHeh1uBu5hWDY474Ey0qQxINV5j6DhIqqOMv9sq51ayeipIe3G6Ha094J PpUaQkTtD00Q7MwBayQWpxdpLd7/CF/QCRoG9PhNcDN6+sqjKo8YVSYO9BiFXc2vpMYZDl NIX8oLftoate3DgtQ4JOHFy/u5i168SJWIDMlEZZMsslUr46AUTEtMYFwRJImQ== 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 8279623745; Mon, 7 Feb 2022 09:50:54 +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 2179osIb059056; Mon, 7 Feb 2022 09:50:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2179osUR059055; Mon, 7 Feb 2022 09:50:54 GMT (envelope-from git) Date: Mon, 7 Feb 2022 09:50:54 GMT Message-Id: <202202070950.2179osUR059055@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 773d9d7e40db - stable/13 - ffs_snapblkfree(): add a comment explaining lockmgr invocation List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: 773d9d7e40dbd1d37517ba20d983fc7d31f5cc8b Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644227459; 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=BDq5YdcExLhGqfKGYxDAy7NIaZ7xfUqSjFpjK+keEwc=; b=dyps/sTMzAAci9keEWkZ2TQgvdOqJleClKFMT6od26U23M2Ml626mmH4kgjGiSlRlOuDX3 XsuZPWEgnwYekn1tNRnUnTjNwyUYZPLCVEORXdHjSDEhhCozV411vcmJ/ag2jC5SB0+dSB PPJ0yE/EQnUUJoRc1suYfQVXAx3LhPOyVfyUkklhaRo7qQDaSpzCemwRTDdw1UBswJPl5w 4irmZi09wgWDc7uwVFwKiGwmfnJaaoqCt7nibNGmSCTc0pa1V+NhG+iof+qSONZmVK00dl 9aZaZi/k3FxUenH4rN1itT3n7wdxUMrwe2WbVRk0grXA6N4VD98d/R4ksp4Zaw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644227459; a=rsa-sha256; cv=none; b=puUzOqjyAl7dFIm6WWR+0UIKlTs5LFdAtgh9cAyPIq3woejVfCzpK0qE0PbwfcY9qEybbu ihOfjFpqGrX+AZN+/Izn6Xp9O/tCLSMqEBLH542IBzpa2zl7/H/E9tjaAzOPHO+BmR1fKr N0pjtX943v2+MJisdFnuKLzOJKWcvcn0w8FKsIlpU+ZB/L35JbOLfhJ66D6mn9WSreNnaJ nfU9s2weGMVvD0n8fvIpdnIwhXPu2oS52MAEV963w0wk4AiSIIlUvbpWAYli56ZjDpLkUy eEnKUKLl+S73wMqhVtGRLmT0HrZQlGIPUFfsb11gDvloIb1tOK+kRpOMWKNH3A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=773d9d7e40dbd1d37517ba20d983fc7d31f5cc8b commit 773d9d7e40dbd1d37517ba20d983fc7d31f5cc8b Author: Konstantin Belousov AuthorDate: 2022-01-23 00:33:18 +0000 Commit: Konstantin Belousov CommitDate: 2022-02-07 09:38:50 +0000 ffs_snapblkfree(): add a comment explaining lockmgr invocation (cherry picked from commit 4559700a0a99376640a8913d08bdf0cfb0124d4a) --- sys/ufs/ffs/ffs_snapshot.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/sys/ufs/ffs/ffs_snapshot.c b/sys/ufs/ffs/ffs_snapshot.c index a0d16d9eccef..cb5c4f5e2481 100644 --- a/sys/ufs/ffs/ffs_snapshot.c +++ b/sys/ufs/ffs/ffs_snapshot.c @@ -1807,9 +1807,15 @@ retry: VI_UNLOCK(devvp); return (0); } + + /* + * Use LK_SLEEPFAIL because sn might be freed under us while + * both devvp interlock and snaplk are not owned. + */ if (lockmgr(&sn->sn_lock, LK_INTERLOCK | LK_EXCLUSIVE | LK_SLEEPFAIL, VI_MTX(devvp)) != 0) goto retry; + TAILQ_FOREACH(ip, &sn->sn_head, i_nextsnap) { vp = ITOV(ip); if (DOINGSOFTDEP(vp))