git: 0cd6e85e242b - main - iscsi: Abort data-out tasks queued on a terminating session.

[John Baldwin]

The branch main has been updated by jhb:

URL: https://cgit.FreeBSD.org/src/commit/?id=0cd6e85e242bb07a33df9a6314e90bcb0ba99576

commit 0cd6e85e242bb07a33df9a6314e90bcb0ba99576
Author:     John Baldwin <jhb at FreeBSD.org>
AuthorDate: 2021-09-15 20:25:30 +0000
Commit:     John Baldwin <jhb at FreeBSD.org>
CommitDate: 2021-09-15 20:25:30 +0000

    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
---
 sys/cam/ctl/ctl_frontend_iscsi.c | 5 +++++
 1 file changed, 5 insertions(+)

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);