Date: Thu, 27 May 2010 09:43:32 -0700 From: Matthew Jacob <mj@feral.com> To: freebsd-scsi@freebsd.org Subject: New patches for CAM SCSI probing, etc. Message-ID: <4BFEA134.3000609@feral.com> In-Reply-To: <4BFD6C17.3020709@FreeBSD.org> References: <4BFB3985.1030301@FreeBSD.org> <mailpost.1274804732.4568033.10040.mailing.freebsd.scsi@FreeBSD.cs.nctu.edu.tw> <4BFC1C57.4080703@FreeBSD.org> <4BFD6698.9040100@feral.com> <4BFD6C17.3020709@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
This is a multi-part message in MIME format.
--------------060708090509030007000202
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
I've radically shrunk this patch to pretty much just include the periph
driver list protection that Alexander produced plus a couple of
protections by me.
With this, plus the DA and GEOM patches, my 'vfaulty' test passes over
night, so that's "good enough".
Comments? I liked redoing the probe code a bit, but I'd rather just get
fixes in sooner rather than later.
--------------060708090509030007000202
Content-Type: text/plain;
name="CAM_PROBE.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
filename="CAM_PROBE.patch"
diff -r 9c91d501ccc3 sys/cam/cam_periph.c
--- a/sys/cam/cam_periph.c Wed May 26 17:43:23 2010 -0700
+++ b/sys/cam/cam_periph.c Thu May 27 09:21:45 2010 -0700
@@ -185,17 +185,6 @@
init_level++;
- xpt_lock_buses();
- for (p_drv = periph_drivers; *p_drv != NULL; p_drv++) {
- if (strcmp((*p_drv)->driver_name, name) == 0)
- break;
- }
- xpt_unlock_buses();
- if (*p_drv == NULL) {
- printf("cam_periph_alloc: invalid periph name '%s'\n", name);
- free(periph, M_CAMPERIPH);
- return (CAM_REQ_INVALID);
- }
sim = xpt_path_sim(path);
path_id = xpt_path_path_id(path);
@@ -208,7 +197,6 @@
periph->periph_oninval = periph_oninvalidate;
periph->type = type;
periph->periph_name = name;
- periph->unit_number = camperiphunit(*p_drv, path_id, target_id, lun_id);
periph->immediate_priority = CAM_PRIORITY_NONE;
periph->refcount = 0;
periph->sim = sim;
@@ -216,26 +204,39 @@
status = xpt_create_path(&path, periph, path_id, target_id, lun_id);
if (status != CAM_REQ_CMP)
goto failure;
+ periph->path = path;
- periph->path = path;
- init_level++;
-
- status = xpt_add_periph(periph);
-
- if (status != CAM_REQ_CMP)
- goto failure;
-
+ xpt_lock_buses();
+ for (p_drv = periph_drivers; *p_drv != NULL; p_drv++) {
+ if (strcmp((*p_drv)->driver_name, name) == 0)
+ break;
+ }
+ if (*p_drv == NULL) {
+ printf("cam_periph_alloc: invalid periph name '%s'\n", name);
+ xpt_free_path(periph->path);
+ free(periph, M_CAMPERIPH);
+ xpt_unlock_buses();
+ return (CAM_REQ_INVALID);
+ }
+ periph->unit_number = camperiphunit(*p_drv, path_id, target_id, lun_id);
cur_periph = TAILQ_FIRST(&(*p_drv)->units);
while (cur_periph != NULL
&& cur_periph->unit_number < periph->unit_number)
cur_periph = TAILQ_NEXT(cur_periph, unit_links);
-
- if (cur_periph != NULL)
+ if (cur_periph != NULL) {
+ KASSERT(cur_periph->unit_number != periph->unit_number, ("duplicate units on periph list"));
TAILQ_INSERT_BEFORE(cur_periph, periph, unit_links);
- else {
+ } else {
TAILQ_INSERT_TAIL(&(*p_drv)->units, periph, unit_links);
(*p_drv)->generation++;
}
+ xpt_unlock_buses();
+
+ init_level++;
+
+ status = xpt_add_periph(periph);
+ if (status != CAM_REQ_CMP)
+ goto failure;
init_level++;
@@ -250,10 +251,12 @@
/* Initialized successfully */
break;
case 3:
- TAILQ_REMOVE(&(*p_drv)->units, periph, unit_links);
xpt_remove_periph(periph);
/* FALLTHROUGH */
case 2:
+ xpt_lock_buses();
+ TAILQ_REMOVE(&(*p_drv)->units, periph, unit_links);
+ xpt_unlock_buses();
xpt_free_path(periph->path);
/* FALLTHROUGH */
case 1:
@@ -288,6 +291,7 @@
TAILQ_FOREACH(periph, &(*p_drv)->units, unit_links) {
if (xpt_path_comp(periph->path, path) == 0) {
xpt_unlock_buses();
+ mtx_assert(periph->sim->mtx, MA_OWNED);
return(periph);
}
}
@@ -322,8 +326,13 @@
return;
xpt_lock_buses();
- if ((--periph->refcount == 0)
- && (periph->flags & CAM_PERIPH_INVALID)) {
+ if (periph->refcount != 0) {
+ periph->refcount--;
+ } else {
+ xpt_print(periph->path, "%s: release %p when refcount is zero\n ", __func__, periph);
+ }
+ if (periph->refcount == 0
+ && (periph->flags & CAM_PERIPH_INVALID)) {
camperiphfree(periph);
}
xpt_unlock_buses();
diff -r 9c91d501ccc3 sys/cam/cam_xpt.c
--- a/sys/cam/cam_xpt.c Wed May 26 17:43:23 2010 -0700
+++ b/sys/cam/cam_xpt.c Thu May 27 09:21:45 2010 -0700
@@ -2138,6 +2138,7 @@
retval = 1;
+ xpt_lock_buses();
for (periph = (start_periph ? start_periph :
TAILQ_FIRST(&(*pdrv)->units)); periph != NULL;
periph = next_periph) {
@@ -2145,9 +2146,12 @@
next_periph = TAILQ_NEXT(periph, unit_links);
retval = tr_func(periph, arg);
- if (retval == 0)
+ if (retval == 0) {
+ xpt_unlock_buses();
return(retval);
+ }
}
+ xpt_unlock_buses();
return(retval);
}
@@ -2323,7 +2327,6 @@
CAM_DEBUG(start_ccb->ccb_h.path, CAM_DEBUG_TRACE, ("xpt_action_default\n"));
-
switch (start_ccb->ccb_h.func_code) {
case XPT_SCSI_IO:
{
@@ -2670,7 +2673,9 @@
xptedtmatch(cdm);
break;
case CAM_DEV_POS_PDRV:
+ xpt_lock_buses();
xptperiphlistmatch(cdm);
+ xpt_unlock_buses();
break;
default:
cdm->status = CAM_DEV_MATCH_ERROR;
--------------060708090509030007000202--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?4BFEA134.3000609>