From owner-svn-src-stable@freebsd.org Mon Jun 4 14:13:05 2018 Return-Path: Delivered-To: svn-src-stable@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E1E76FE5AAF; Mon, 4 Jun 2018 14:13:04 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 9361868C6D; Mon, 4 Jun 2018 14:13:04 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 7478868EA; Mon, 4 Jun 2018 14:13:04 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w54ED48d041301; Mon, 4 Jun 2018 14:13:04 GMT (envelope-from markj@FreeBSD.org) Received: (from markj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w54ED4KI041300; Mon, 4 Jun 2018 14:13:04 GMT (envelope-from markj@FreeBSD.org) Message-Id: <201806041413.w54ED4KI041300@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: markj set sender to markj@FreeBSD.org using -f From: Mark Johnston Date: Mon, 4 Jun 2018 14:13:04 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r334611 - stable/11/sys/geom/mirror X-SVN-Group: stable-11 X-SVN-Commit-Author: markj X-SVN-Commit-Paths: stable/11/sys/geom/mirror X-SVN-Commit-Revision: 334611 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Jun 2018 14:13:05 -0000 Author: markj Date: Mon Jun 4 14:13:04 2018 New Revision: 334611 URL: https://svnweb.freebsd.org/changeset/base/334611 Log: MFC r333278, r333279: Avoid dropping the topology lock in gmirror's dumpconf implementation. Modified: stable/11/sys/geom/mirror/g_mirror.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/geom/mirror/g_mirror.c ============================================================================== --- stable/11/sys/geom/mirror/g_mirror.c Mon Jun 4 11:35:04 2018 (r334610) +++ stable/11/sys/geom/mirror/g_mirror.c Mon Jun 4 14:13:04 2018 (r334611) @@ -275,8 +275,6 @@ g_mirror_ndisks(struct g_mirror_softc *sc, int state) struct g_mirror_disk *disk; u_int n = 0; - sx_assert(&sc->sc_lock, SX_LOCKED); - LIST_FOREACH(disk, &sc->sc_disks, d_next) { if (state == -1 || disk->d_state == state) n++; @@ -493,7 +491,9 @@ g_mirror_destroy_disk(struct g_mirror_disk *disk) sc = disk->d_softc; sx_assert(&sc->sc_lock, SX_XLOCKED); + g_topology_lock(); LIST_REMOVE(disk, d_next); + g_topology_unlock(); g_mirror_event_cancel(disk); if (sc->sc_hint == disk) sc->sc_hint = NULL; @@ -520,6 +520,8 @@ static void g_mirror_free_device(struct g_mirror_softc *sc) { + g_topology_assert(); + mtx_destroy(&sc->sc_queue_mtx); mtx_destroy(&sc->sc_events_mtx); mtx_destroy(&sc->sc_done_mtx); @@ -2624,6 +2626,7 @@ again: DISK_STATE_CHANGED(); disk->d_state = state; + g_topology_lock(); if (LIST_EMPTY(&sc->sc_disks)) LIST_INSERT_HEAD(&sc->sc_disks, disk, d_next); else { @@ -2641,6 +2644,7 @@ again: if (dp != NULL) LIST_INSERT_AFTER(dp, disk, d_next); } + g_topology_unlock(); G_MIRROR_DEBUG(1, "Device %s: provider %s detected.", sc->sc_name, g_mirror_get_diskname(disk)); if (sc->sc_state == G_MIRROR_DEVICE_STATE_STARTING) @@ -3326,24 +3330,20 @@ g_mirror_dumpconf(struct sbuf *sb, const char *indent, disk = cp->private; if (disk == NULL) return; - g_topology_unlock(); - sx_xlock(&sc->sc_lock); sbuf_printf(sb, "%s%u\n", indent, (u_int)disk->d_id); if (disk->d_state == G_MIRROR_DISK_STATE_SYNCHRONIZING) { sbuf_printf(sb, "%s", indent); if (disk->d_sync.ds_offset == 0) sbuf_printf(sb, "0%%"); - else { + else sbuf_printf(sb, "%u%%", (u_int)((disk->d_sync.ds_offset * 100) / - sc->sc_provider->mediasize)); - } + sc->sc_mediasize)); sbuf_printf(sb, "\n"); - if (disk->d_sync.ds_offset > 0) { + if (disk->d_sync.ds_offset > 0) sbuf_printf(sb, "%s%jd" "\n", indent, (intmax_t)disk->d_sync.ds_offset); - } } sbuf_printf(sb, "%s%u\n", indent, disk->d_sync.ds_syncid); @@ -3378,11 +3378,7 @@ g_mirror_dumpconf(struct sbuf *sb, const char *indent, disk->d_priority); sbuf_printf(sb, "%s%s\n", indent, g_mirror_disk_state2str(disk->d_state)); - sx_xunlock(&sc->sc_lock); - g_topology_lock(); } else { - g_topology_unlock(); - sx_xlock(&sc->sc_lock); sbuf_printf(sb, "%s", indent); switch (sc->sc_type) { case G_MIRROR_TYPE_AUTOMATIC: @@ -3434,8 +3430,6 @@ g_mirror_dumpconf(struct sbuf *sb, const char *indent, else sbuf_printf(sb, "%s", "DEGRADED"); sbuf_printf(sb, "\n"); - sx_xunlock(&sc->sc_lock); - g_topology_lock(); } }