DF-3965 / fix.diff
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 | --- a/sys/dev/raid/hptiop/hptiop.c 2026-09-17 06:16:59.056779292 +0000 +++ b/sys/dev/raid/hptiop/hptiop.c 2026-09-17 06:16:59.128778373 +0000 @@ -390,21 +390,22 @@ srb_complete: goto scsi_done; } + /* release the map on ALL completions, not only success */ + switch (ccb->ccb_h.flags & CAM_DIR_MASK) { + case CAM_DIR_IN: + bus_dmamap_sync(hba->io_dmat, + srb->dma_map, BUS_DMASYNC_POSTREAD); + bus_dmamap_unload(hba->io_dmat, srb->dma_map); + break; + case CAM_DIR_OUT: + bus_dmamap_sync(hba->io_dmat, + srb->dma_map, BUS_DMASYNC_POSTWRITE); + bus_dmamap_unload(hba->io_dmat, srb->dma_map); + break; + } + switch (result) { case IOP_RESULT_SUCCESS: - switch (ccb->ccb_h.flags & CAM_DIR_MASK) { - case CAM_DIR_IN: - bus_dmamap_sync(hba->io_dmat, - srb->dma_map, BUS_DMASYNC_POSTREAD); - bus_dmamap_unload(hba->io_dmat, srb->dma_map); - break; - case CAM_DIR_OUT: - bus_dmamap_sync(hba->io_dmat, - srb->dma_map, BUS_DMASYNC_POSTWRITE); - bus_dmamap_unload(hba->io_dmat, srb->dma_map); - break; - } - ccb->ccb_h.status = CAM_REQ_CMP; break; @@ -544,20 +545,22 @@ static void hptiop_request_callback_mv(s if (context & MVIOP_MU_QUEUE_REQUEST_RESULT_BIT) req->header.result = IOP_RESULT_SUCCESS; + /* release the map on ALL completions, not only success */ + switch (ccb->ccb_h.flags & CAM_DIR_MASK) { + case CAM_DIR_IN: + bus_dmamap_sync(hba->io_dmat, + srb->dma_map, BUS_DMASYNC_POSTREAD); + bus_dmamap_unload(hba->io_dmat, srb->dma_map); + break; + case CAM_DIR_OUT: + bus_dmamap_sync(hba->io_dmat, + srb->dma_map, BUS_DMASYNC_POSTWRITE); + bus_dmamap_unload(hba->io_dmat, srb->dma_map); + break; + } + switch (req->header.result) { case IOP_RESULT_SUCCESS: - switch (ccb->ccb_h.flags & CAM_DIR_MASK) { - case CAM_DIR_IN: - bus_dmamap_sync(hba->io_dmat, - srb->dma_map, BUS_DMASYNC_POSTREAD); - bus_dmamap_unload(hba->io_dmat, srb->dma_map); - break; - case CAM_DIR_OUT: - bus_dmamap_sync(hba->io_dmat, - srb->dma_map, BUS_DMASYNC_POSTWRITE); - bus_dmamap_unload(hba->io_dmat, srb->dma_map); - break; - } ccb->ccb_h.status = CAM_REQ_CMP; break; case IOP_RESULT_BAD_TARGET: @@ -651,20 +654,22 @@ static void hptiop_request_callback_mvfr if (_tag & MVFREYIOPMU_QUEUE_REQUEST_RESULT_BIT) req->header.result = IOP_RESULT_SUCCESS; + /* release the map on ALL completions, not only success */ + switch (ccb->ccb_h.flags & CAM_DIR_MASK) { + case CAM_DIR_IN: + bus_dmamap_sync(hba->io_dmat, + srb->dma_map, BUS_DMASYNC_POSTREAD); + bus_dmamap_unload(hba->io_dmat, srb->dma_map); + break; + case CAM_DIR_OUT: + bus_dmamap_sync(hba->io_dmat, + srb->dma_map, BUS_DMASYNC_POSTWRITE); + bus_dmamap_unload(hba->io_dmat, srb->dma_map); + break; + } + switch (req->header.result) { case IOP_RESULT_SUCCESS: - switch (ccb->ccb_h.flags & CAM_DIR_MASK) { - case CAM_DIR_IN: - bus_dmamap_sync(hba->io_dmat, - srb->dma_map, BUS_DMASYNC_POSTREAD); - bus_dmamap_unload(hba->io_dmat, srb->dma_map); - break; - case CAM_DIR_OUT: - bus_dmamap_sync(hba->io_dmat, - srb->dma_map, BUS_DMASYNC_POSTWRITE); - bus_dmamap_unload(hba->io_dmat, srb->dma_map); - break; - } ccb->ccb_h.status = CAM_REQ_CMP; break; case IOP_RESULT_BAD_TARGET: |