From owner-p4-projects@FreeBSD.ORG  Mon Jun  8 03:27:17 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id D1F9E106566C; Mon,  8 Jun 2009 03:27:16 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 87341106566B
	for <perforce@freebsd.org>; Mon,  8 Jun 2009 03:27:16 +0000 (UTC)
	(envelope-from scottl@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 5AF8D8FC0C
	for <perforce@freebsd.org>; Mon,  8 Jun 2009 03:27:16 +0000 (UTC)
	(envelope-from scottl@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n583RG3w051674
	for <perforce@freebsd.org>; Mon, 8 Jun 2009 03:27:16 GMT
	(envelope-from scottl@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n583RGca051672
	for perforce@freebsd.org; Mon, 8 Jun 2009 03:27:16 GMT
	(envelope-from scottl@freebsd.org)
Date: Mon, 8 Jun 2009 03:27:16 GMT
Message-Id: <200906080327.n583RGca051672@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	scottl@freebsd.org using -f
From: Scott Long <scottl@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 163754 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 08 Jun 2009 03:27:17 -0000

http://perforce.freebsd.org/chv.cgi?CH=163754

Change 163754 by scottl@scottl-deimos on 2009/06/08 03:26:36

	Add locking to the remainder of the devclass methods.

Affected files ...

.. //depot/projects/scottl-camlock/src/sys/kern/subr_bus.c#24 edit

Differences ...

==== //depot/projects/scottl-camlock/src/sys/kern/subr_bus.c#24 (text+ko) ====

@@ -1518,12 +1518,14 @@
 
 	/* If we were given a wired unit number, check for existing device */
 	/* XXX imp XXX */
+	mtx_lock(&devclasses_mtx);
 	if (unit != -1) {
 		if (unit >= 0 && unit < dc->maxunit &&
 		    dc->devices[unit] != NULL) {
 			if (bootverbose)
 				printf("%s: %s%d already exists; skipping it\n",
 				    dc->name, dc->name, *unitp);
+			mtx_unlock(&devclasses_mtx);
 			return (EEXIST);
 		}
 	} else {
@@ -1566,8 +1568,10 @@
 		if (oldlist != NULL)
 			free(oldlist, M_BUS);
 	}
+	dc->devices[unit] = dev;
+	mtx_unlock(&devclasses_mtx);
+
 	PDEBUG(("now: unit %d in devclass %s", unit, DEVCLANAME(dc)));
-
 	*unitp = unit;
 	return (0);
 }
@@ -1607,8 +1611,11 @@
 		dev->nameunit = NULL;
 		return (error);
 	}
-	dc->devices[dev->unit] = dev;
+	mtx_lock(&devclasses_mtx);
+	DC_REF(dc);
+	DT_REF(dev);
 	dev->devclass = dc;
+	mtx_unlock(&devclasses_mtx);
 	snprintf(dev->nameunit, buflen, "%s%d", dc->name, dev->unit);
 
 	return (0);
@@ -1634,14 +1641,18 @@
 
 	PDEBUG(("%s in devclass %s", DEVICENAME(dev), DEVCLANAME(dc)));
 
+	mtx_lock(&devclasses_mtx);
 	if (dev->devclass != dc || dc->devices[dev->unit] != dev)
 		panic("devclass_delete_device: inconsistent device class");
+	DT_UNREF(dev);
+	DC_UNREF(dc);
 	dc->devices[dev->unit] = NULL;
 	if (dev->flags & DF_WILDCARD)
 		dev->unit = -1;
 	dev->devclass = NULL;
 	free(dev->nameunit, M_BUS);
 	dev->nameunit = NULL;
+	mtx_unlock(&devclasses_mtx);
 
 	return (0);
 }
@@ -1707,8 +1718,10 @@
 
 	dev->state = DS_NOTPRESENT;
 
+	mtx_lock(&devclasses_mtx);
 	TAILQ_INSERT_TAIL(&bus_data_devices, dev, devlink);
 	bus_data_generation_update();
+	mtx_unlock(&devclasses_mtx);
 
 	return (dev);
 }