diff options
| author | mav <mav@FreeBSD.org> | 2015-10-05 10:47:18 +0000 |
|---|---|---|
| committer | mav <mav@FreeBSD.org> | 2015-10-05 10:47:18 +0000 |
| commit | 12a42fc40ce7d3d581868f50c38b0ad5abcbc75d (patch) | |
| tree | 306e7e0142c1363405edbbc36b27f7b97e1a6004 /sys/cam | |
| parent | 69c008272b62e065af4d3bb91aa56cbf7ee1ae84 (diff) | |
| download | FreeBSD-src-12a42fc40ce7d3d581868f50c38b0ad5abcbc75d.zip FreeBSD-src-12a42fc40ce7d3d581868f50c38b0ad5abcbc75d.tar.gz | |
MFC r288021: Mark with DMA flag I/Os waiting for iSCSI write data after R2T.
Reads and immediate writes are not blocking, so don't bother.
Diffstat (limited to 'sys/cam')
| -rw-r--r-- | sys/cam/ctl/ctl_frontend_iscsi.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sys/cam/ctl/ctl_frontend_iscsi.c b/sys/cam/ctl/ctl_frontend_iscsi.c index 53d0512..eb300c0 100644 --- a/sys/cam/ctl/ctl_frontend_iscsi.c +++ b/sys/cam/ctl/ctl_frontend_iscsi.c @@ -963,6 +963,7 @@ cfiscsi_pdu_handle_data_out(struct icl_pdu *request) done = (io->scsiio.ext_data_filled != cdw->cdw_r2t_end || io->scsiio.ext_data_filled == io->scsiio.kern_data_len); uma_zfree(cfiscsi_data_wait_zone, cdw); + io->io_hdr.flags &= ~CTL_FLAG_DMA_INPROG; if (done) io->scsiio.be_move_done(io); else @@ -1136,6 +1137,7 @@ cfiscsi_session_terminate_tasks(struct cfiscsi_session *cs) * assuming that the data transfer actually succeeded * and writing uninitialized data to disk. */ + cdw->cdw_ctl_io->io_hdr.flags &= ~CTL_FLAG_DMA_INPROG; cdw->cdw_ctl_io->scsiio.io_hdr.port_status = 42; cdw->cdw_ctl_io->scsiio.be_move_done(cdw->cdw_ctl_io); uma_zfree(cfiscsi_data_wait_zone, cdw); @@ -2665,6 +2667,7 @@ cfiscsi_datamove_out(union ctl_io *io) cfiscsi_session_terminate(cs); return; } + io->io_hdr.flags |= CTL_FLAG_DMA_INPROG; bhsr2t = (struct iscsi_bhs_r2t *)response->ip_bhs; bhsr2t->bhsr2t_opcode = ISCSI_BHS_OPCODE_R2T; bhsr2t->bhsr2t_flags = 0x80; @@ -2841,6 +2844,8 @@ cfiscsi_task_management_done(union ctl_io *io) #endif TAILQ_REMOVE(&cs->cs_waiting_for_data_out, cdw, cdw_next); + io->io_hdr.flags &= ~CTL_FLAG_DMA_INPROG; + cdw->cdw_ctl_io->scsiio.io_hdr.port_status = 43; cdw->cdw_ctl_io->scsiio.be_move_done(cdw->cdw_ctl_io); uma_zfree(cfiscsi_data_wait_zone, cdw); } |
