Page MenuHomeFreeBSD
Files F145957699

D15453.diff
No OneTemporary
Actions

D15453.diff
View Options

Index: sys/cam/scsi/scsi_da.c
===================================================================
--- sys/cam/scsi/scsi_da.c
+++ sys/cam/scsi/scsi_da.c
@@ -310,7 +310,7 @@
struct cam_iosched_softc *cam_iosched;
struct bio_queue_head delete_run_queue;
LIST_HEAD(, ccb_hdr) pending_ccbs;
- int refcount; /* Active xpt_action() calls */
+ int refcount; /* Active CCBs and xpt_action calls */
da_state state;
da_flags flags;
da_quirks quirks;
@@ -3296,10 +3296,23 @@
}
start_ccb->ccb_h.ccb_bp = bp;
- softc->refcount++;
+ /*
+ * Take two references out. One guards against the completion
+ * routine triggered by start_ccb finishing, triggering a geom
+ * wither and call to daclose before we can get to the
+ * cam_periph_lock. The other reference guards against us
+ * returning, wither + daclose because geom falsely thinks all
+ * its transactions are done (it shouldn't do this, but it's
+ * better to fail safe in the face of geom bugs and it's easy to
+ * do with an extra reference here) and then this transaction
+ * completing.
+ */
+ softc->refcount++; /* For submission */
+ softc->refcount++; /* For completion */
cam_periph_unlock(periph);
xpt_action(start_ccb);
cam_periph_lock(periph);
+ softc->refcount--; /* Done submitting */
/* May have more work to do, so ensure we stay scheduled */
daschedule(periph);
@@ -4450,7 +4463,7 @@
cam_iosched_bio_complete(softc->cam_iosched, bp, done_ccb);
xpt_release_ccb(done_ccb);
KASSERT(softc->refcount >= 1, ("dadone softc %p refcount %d", softc, softc->refcount));
- softc->refcount--;
+ softc->refcount--; /* Done with completion */
if (state == DA_CCB_DELETE) {
TAILQ_HEAD(, bio) queue;

File Metadata

Mime Type
text/plain
Expires
Fri, Feb 27, 1:02 PM (6 h, 10 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
29030525
Default Alt Text
D15453.diff (1 KB)

Event Timeline