From nobody Sat Oct 19 12:56:27 2024 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 4XW1mC2GSwz5b4LD; Sat, 19 Oct 2024 12:56:27 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XW1mC1lb7z4NHZ; Sat, 19 Oct 2024 12:56:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729342587; 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=L26R4/JxDBPEStmnhrxAaseeip6OfnPPTGQBEw0ZhDo=; b=xyoYWHNPqWo9qCCPk/aYzjX5feWx3+M5WqD5VcqrFkCLyWbXKE1kqw/FB588j1PXKmPJUp ejjtg49suFnuD3rHhhIA8YuP269T9jYPAL4zfiXAots5Mpfr1dsO5Bb37bUez0McLrlPp4 N+jRadN8nOP03R5hc27rugn9Hizfh834BDb0bLMHEX2oDrsXWywY7b3QMRWAmaLNpb8rD/ jAPJiBWBZ2dGYuHj5MKh8ZIvpkohmGvXz2kyFvq2j1qklRFlwaOK9g3EComzSV4gnbNsNt ePmbqlFh0+A0Zsm7ujYhPOM0xO9jkHVWKqgTlJUKvpsrPZ1IA79wUFpU9pn9sA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729342587; 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=L26R4/JxDBPEStmnhrxAaseeip6OfnPPTGQBEw0ZhDo=; b=TevreBRr0mnNNbYI6kAqH/2IcXVIjZeiIeGL+PWDogrbLOWSs0e1EQ8y/wuCqXrH3jvKIm JgPtkC0qVPjBmMoWWlZRK7tDZ7gfLA1VViqoa+7Q9/OVoPYGougLRQ5l56c+OrDEd+Rmiw BFflSAM3soouLIXjNQrnYOpmsRvTeyavvtV9laVti09LGY3qY8B0BYw6nyE+CT234ywVJs CbOUljAApAEJpFe4KyqMj+BlYQyHX2Kvzyctj4Bh53y5h86sIdbyS+bw1XcdrUvuHFaudw zqcbcDNdYIeIJW4/qAax3wMgK+8XLcPZq2R77U0DPdknkTOXp0u44AAiIEdqmw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729342587; a=rsa-sha256; cv=none; b=n5oUvXv/jiFHiVzMMXALRGn3KUXAYL43uHlEX2GlbJ3UIN1t/ll4PvmhVUE+i0FNVRZhso w/lvEgkUCqYba74A+c/n5PWVtQqNniz1yPHMWFwTfjcnftrK2BWNi/+bMxw2QdfQHe4Etu hZnAJ0akHZfHIsn0zizySL2gtwUsRXsEwGy6PdjG4MiNu4IjXsr+/jkOgbYc+/+pOtXhnx XgF8+2KXEKcgnBlH5w1KOW80pD33bL3BfUBRie8ubYenk3D+sZoWaIqBCelWCV9272x0BG lA+NGYNvtOFFZr4oiRzrzf2WE6rUyGKXgg3XRcYBFk/4mKEllCGKgkFu3+iokw== 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 4XW1mC1LwhzJZF; Sat, 19 Oct 2024 12:56:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49JCuRY2064975; Sat, 19 Oct 2024 12:56:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49JCuRmk064972; Sat, 19 Oct 2024 12:56:27 GMT (envelope-from git) Date: Sat, 19 Oct 2024 12:56:27 GMT Message-Id: <202410191256.49JCuRmk064972@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 23b44ad101ca - stable/14 - ggate: Avoid dropping the GEOM topology lock in dumpconf 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 23b44ad101ca2381186aa565b6c04a978c02a35e Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=23b44ad101ca2381186aa565b6c04a978c02a35e commit 23b44ad101ca2381186aa565b6c04a978c02a35e Author: Mark Johnston AuthorDate: 2024-10-04 14:53:57 +0000 Commit: Mark Johnston CommitDate: 2024-10-18 12:27:13 +0000 ggate: Avoid dropping the GEOM topology lock in dumpconf In general it's not safe to drop the topology lock in these routines, as GEOM assumes that the mesh will be consistent during traversal. However, there's no reason we can't hold the topology lock across calls to g_gate_release(). (Note that g_gate_hold() can be called with the topology lock held.) PR: 238814 MFC after: 2 weeks (cherry picked from commit b37b2543a23b44c78f6d78823dcfcedba46570db) --- sys/geom/gate/g_gate.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/sys/geom/gate/g_gate.c b/sys/geom/gate/g_gate.c index 820f18ba220c..8d0e96fce124 100644 --- a/sys/geom/gate/g_gate.c +++ b/sys/geom/gate/g_gate.c @@ -330,7 +330,6 @@ static void g_gate_release(struct g_gate_softc *sc) { - g_topology_assert_not(); mtx_lock(&g_gate_units_lock); sc->sc_ref--; KASSERT(sc->sc_ref >= 0, ("Negative sc_ref for %s.", sc->sc_name)); @@ -454,9 +453,7 @@ g_gate_dumpconf(struct sbuf *sb, const char *indent, struct g_geom *gp, sc->sc_queue_size); sbuf_printf(sb, "%s%u\n", indent, sc->sc_ref); sbuf_printf(sb, "%s%d\n", indent, sc->sc_unit); - g_topology_unlock(); g_gate_release(sc); - g_topology_lock(); } static int