d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

iscsi: Abort data-out tasks queued on a terminating session.

Browse Source 
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
This commit is contained in:
John Baldwin 2021-09-15 13:25:30 -07:00
parent 529364b032
commit 0cd6e85e24
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sys/cam/ctl/ctl_frontend_iscsi.c
View File

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