From owner-dev-commits-src-main@freebsd.org Fri Jul 30 00:09:58 2021 Return-Path: Delivered-To: dev-commits-src-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 04B2E657381; Fri, 30 Jul 2021 00:09:58 +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 4GbST16Rqhz4tLK; Fri, 30 Jul 2021 00:09:57 +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 C5EDD1B062; Fri, 30 Jul 2021 00:09:57 +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 16U09vbi004444; Fri, 30 Jul 2021 00:09:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 16U09vhB004443; Fri, 30 Jul 2021 00:09:57 GMT (envelope-from git) Date: Fri, 30 Jul 2021 00:09:57 GMT Message-Id: <202107300009.16U09vhB004443@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 419d406e4ee0 - main - geom_vfs: Pre-allocate event for g_vfs_destroy. MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 419d406e4ee068644218fb881bc80f79f8191970 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for the main branch of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 30 Jul 2021 00:09:58 -0000 The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=419d406e4ee068644218fb881bc80f79f8191970 commit 419d406e4ee068644218fb881bc80f79f8191970 Author: John Baldwin AuthorDate: 2021-07-30 00:09:23 +0000 Commit: John Baldwin CommitDate: 2021-07-30 00:09:23 +0000 geom_vfs: Pre-allocate event for g_vfs_destroy. When an active g_vfs is orphaned due to an underlying disk going away the destroy is deferred until the filesystem is unmounted in g_vfs_done(). However, g_vfs_done() is invoked from a non-sleepable context and cannot use M_WAITOK to allocate the event. Instead, allocate the event in g_vfs_orphan() and save it in the softc to be retrieved by the last call to g_vfs_done(). Reported by: Jithesh Arakkan @ Chelsio Reviewed by: imp Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D31354 --- sys/geom/geom_vfs.c | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/sys/geom/geom_vfs.c b/sys/geom/geom_vfs.c index f01765b8ee30..592062b8b12a 100644 --- a/sys/geom/geom_vfs.c +++ b/sys/geom/geom_vfs.c @@ -53,6 +53,7 @@ __FBSDID("$FreeBSD$"); struct g_vfs_softc { struct mtx sc_mtx; struct bufobj *sc_bo; + struct g_event *sc_event; int sc_active; int sc_orphaned; int sc_enxio_active; @@ -96,6 +97,7 @@ static void g_vfs_done(struct bio *bip) { struct g_consumer *cp; + struct g_event *event; struct g_vfs_softc *sc; struct buf *bp; int destroy; @@ -157,9 +159,14 @@ g_vfs_done(struct bio *bip) mtx_lock(&sc->sc_mtx); destroy = ((--sc->sc_active) == 0 && sc->sc_orphaned); + if (destroy) { + event = sc->sc_event; + sc->sc_event = NULL; + } else + event = NULL; mtx_unlock(&sc->sc_mtx); if (destroy) - g_post_event(g_vfs_destroy, cp, M_WAITOK, NULL); + g_post_event_ep(g_vfs_destroy, cp, event, NULL); bufdone(bp); } @@ -212,6 +219,7 @@ static void g_vfs_orphan(struct g_consumer *cp) { struct g_geom *gp; + struct g_event *event; struct g_vfs_softc *sc; int destroy; @@ -222,12 +230,20 @@ g_vfs_orphan(struct g_consumer *cp) sc = gp->softc; if (sc == NULL) return; + event = g_alloc_event(M_WAITOK); mtx_lock(&sc->sc_mtx); + KASSERT(sc->sc_event == NULL, ("g_vfs %p already has an event", sc)); sc->sc_orphaned = 1; destroy = (sc->sc_active == 0); + if (!destroy) { + sc->sc_event = event; + event = NULL; + } mtx_unlock(&sc->sc_mtx); - if (destroy) + if (destroy) { + g_free(event); g_vfs_destroy(cp, 0); + } /* * Do not destroy the geom. Filesystem will do that during unmount. @@ -297,5 +313,6 @@ g_vfs_close(struct g_consumer *cp) mtx_destroy(&sc->sc_mtx); if (!sc->sc_orphaned || cp->provider == NULL) g_wither_geom_close(gp, ENXIO); + KASSERT(sc->sc_event == NULL, ("g_vfs %p event is non-NULL", sc)); g_free(sc); }