From owner-svn-src-all@FreeBSD.ORG Mon May 19 16:05:43 2014
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id 4EB6ED5B;
Mon, 19 May 2014 16:05:43 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 3C3DA2A1D;
Mon, 19 May 2014 16:05:43 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4JG5hTc043015;
Mon, 19 May 2014 16:05:43 GMT (envelope-from ae@svn.freebsd.org)
Received: (from ae@localhost)
by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4JG5hIm043014;
Mon, 19 May 2014 16:05:43 GMT (envelope-from ae@svn.freebsd.org)
Message-Id: <201405191605.s4JG5hIm043014@svn.freebsd.org>
From: "Andrey V. Elsukov" <ae@FreeBSD.org>
Date: Mon, 19 May 2014 16:05:43 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-head@freebsd.org
Subject: svn commit: r266444 - head/sys/geom
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for "
user" and " projects" \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 19 May 2014 16:05:43 -0000
Author: ae
Date: Mon May 19 16:05:42 2014
New Revision: 266444
URL: http://svnweb.freebsd.org/changeset/base/266444
Log:
We have two functions from where a geom orphan method could be called:
g_orphan_register and g_resize_provider_event. Both are called from the
event queue. Also we have GEOM_DEV class, which does deferred destroy
for its consumers via g_dev_destroy (also called from the event queue).
So it is possible, that for some consumers an orphan method will be
called twice. This triggers panic in g_dev_orphan.
Check that consumer isn't already orphaned before call orphan method.
MFC after: 2 weeks
Modified:
head/sys/geom/geom_event.c
Modified: head/sys/geom/geom_event.c
==============================================================================
--- head/sys/geom/geom_event.c Mon May 19 14:01:48 2014 (r266443)
+++ head/sys/geom/geom_event.c Mon May 19 16:05:42 2014 (r266444)
@@ -206,6 +206,14 @@ g_orphan_register(struct g_provider *pp)
KASSERT(cp->geom->orphan != NULL,
("geom %s has no orphan, class %s",
cp->geom->name, cp->geom->class->name));
+ /*
+ * XXX: g_dev_orphan method does deferred destroying
+ * and it is possible, that other event could already
+ * call the orphan method. Check consumer's flags to
+ * do not schedule it twice.
+ */
+ if (cp->flags & G_CF_ORPHAN)
+ continue;
cp->flags |= G_CF_ORPHAN;
cp->geom->orphan(cp);
}