diff options
| author | Warner Losh <imp@FreeBSD.org> | 2018-05-15 22:22:10 +0000 |
|---|---|---|
| committer | Warner Losh <imp@FreeBSD.org> | 2018-05-15 22:22:10 +0000 |
| commit | d9a7a61b2bdde172bc1db1e3c0b12f27aa8b466e (patch) | |
| tree | 854593f246b5027d52b61e515bd4e8b8dfcf208f /sys/cam | |
| parent | 40f242e4400ed9b62ab2c107bc85d11089fee426 (diff) | |
| download | src-d9a7a61b2bdde172bc1db1e3c0b12f27aa8b466e.tar.gz src-d9a7a61b2bdde172bc1db1e3c0b12f27aa8b466e.zip | |
Hold the reference count until the CCB is released
When a disk disappears and the periph is invalidated, any I/Os that
are pending with the controller can cause a crash when they
complete. Move to holding the softc reference count taken in dastart()
until the I/O is complete rather than only until xpt_action()
returns. (This approach was suggested by Ken Merry.) This extends
the method used in da to ada, nda, and mda.
Sponsored by: Netflix
Submitted by: Chuck Silvers
Notes
Notes:
svn path=/head/; revision=333651
Diffstat (limited to 'sys/cam')
| -rw-r--r-- | sys/cam/ata/ata_da.c | 6 | ||||
| -rw-r--r-- | sys/cam/mmc/mmc_da.c | 6 | ||||
| -rw-r--r-- | sys/cam/nvme/nvme_da.c | 6 |
3 files changed, 14 insertions, 4 deletions
diff --git a/sys/cam/ata/ata_da.c b/sys/cam/ata/ata_da.c index 9bc625088925..ac04b3d23076 100644 --- a/sys/cam/ata/ata_da.c +++ b/sys/cam/ata/ata_da.c @@ -2458,7 +2458,6 @@ out: cam_periph_unlock(periph); xpt_action(start_ccb); cam_periph_lock(periph); - softc->refcount--; /* May have more work to do, so ensure we stay scheduled */ adaschedule(periph); @@ -2856,10 +2855,13 @@ adadone(struct cam_periph *periph, union ccb *done_ccb) * We need to call cam_iosched before we call biodone so that we * don't measure any activity that happens in the completion * routine, which in the case of sendfile can be quite - * extensive. + * extensive. Release the periph refcount taken in adastart() + * for each CCB. */ cam_iosched_bio_complete(softc->cam_iosched, bp, done_ccb); xpt_release_ccb(done_ccb); + KASSERT(softc->refcount >= 1, ("adadone softc %p refcount %d", softc, softc->refcount)); + softc->refcount--; if (state == ADA_CCB_TRIM) { TAILQ_HEAD(, bio) queue; struct bio *bp1; diff --git a/sys/cam/mmc/mmc_da.c b/sys/cam/mmc/mmc_da.c index 84095f48f6ef..6f3806c1df9f 100644 --- a/sys/cam/mmc/mmc_da.c +++ b/sys/cam/mmc/mmc_da.c @@ -1357,7 +1357,6 @@ sddastart(struct cam_periph *periph, union ccb *start_ccb) cam_periph_unlock(periph); xpt_action(start_ccb); cam_periph_lock(periph); - softc->refcount--; /* May have more work to do, so ensure we stay scheduled */ sddaschedule(periph); @@ -1418,6 +1417,11 @@ sddadone(struct cam_periph *periph, union ccb *done_ccb) softc->outstanding_cmds--; xpt_release_ccb(done_ccb); + /* + * Release the periph refcount taken in mdastart() for each CCB. + */ + KASSERT(softc->refcount >= 1, ("mdadone softc %p refcount %d", softc, softc->refcount)); + softc->refcount--; biodone(bp); } diff --git a/sys/cam/nvme/nvme_da.c b/sys/cam/nvme/nvme_da.c index 65155386f68a..76e60be3ed93 100644 --- a/sys/cam/nvme/nvme_da.c +++ b/sys/cam/nvme/nvme_da.c @@ -990,7 +990,6 @@ out: cam_periph_unlock(periph); xpt_action(start_ccb); cam_periph_lock(periph); - softc->refcount--; /* May have more work to do, so ensure we stay scheduled */ ndaschedule(periph); @@ -1101,6 +1100,11 @@ ndadone(struct cam_periph *periph, union ccb *done_ccb) biodone(bp2); } } + /* + * Release the periph refcount taken in mdastart() for each CCB. + */ + KASSERT(softc->refcount >= 1, ("ndadone softc %p refcount %d", softc, softc->refcount)); + softc->refcount--; return; } case NDA_CCB_DUMP: |