diff options
| author | John Baldwin <jhb@FreeBSD.org> | 2021-09-15 20:25:30 +0000 |
|---|---|---|
| committer | John Baldwin <jhb@FreeBSD.org> | 2021-10-29 23:43:48 +0000 |
| commit | b2f1beeeff10e24b4da21f6d97a88f70163c7bf0 (patch) | |
| tree | 1cfb8d0033e166dbf5676b721847c29a1b8ffc18 /sys/cam/ctl | |
| parent | c1d6b0cdca19a3045b24c0437b447092c3b45118 (diff) | |
iscsi: Abort data-out tasks queued on a terminating session.
cfiscsi_datamove_out() can race with cfiscsi_session_terminate_tasks()
and enqueue a new task after the latter function has aborted existing
tasks. This could result in a deadlock as
cfiscsi_session_terminate_tasks() waited forever for this task to
complete.
Reviewed by: mav
Sponsored by: Chelsio Communications
Differential Revision: https://reviews.freebsd.org/D31892
(cherry picked from commit 0cd6e85e242bb07a33df9a6314e90bcb0ba99576)
Diffstat (limited to 'sys/cam/ctl')
| -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 ac94a786a701..b8ab25e89eb9 100644 --- a/sys/cam/ctl/ctl_frontend_iscsi.c +++ b/sys/cam/ctl/ctl_frontend_iscsi.c @@ -2783,6 +2783,11 @@ cfiscsi_datamove_out(union ctl_io *io) cdw->cdw_r2t_end = io->scsiio.ext_data_filled + r2t_len; CFISCSI_SESSION_LOCK(cs); + if (cs->cs_terminating) { + CFISCSI_SESSION_UNLOCK(cs); + cfiscsi_data_wait_abort(cs, cdw, 44); + return; + } TAILQ_INSERT_TAIL(&cs->cs_waiting_for_data_out, cdw, cdw_next); CFISCSI_SESSION_UNLOCK(cs); |