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

Fix iSCSI target panics on concurrent session teardown and display

Browse Source 
(eg removing a target and doing "ctladm islist -v" at the same time).

Reviewed by:	manu
Tested by:	manu
MFC after:	2 weeks
Sponsored by:	DARPA, AFRL
This commit is contained in:
trasz 2017-10-04 11:35:04 +00:00
parent 0540e9667e
commit 8467241e6a
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1308,18 +1308,17 @@ cfiscsi_session_delete(struct cfiscsi_session *cs)
KASSERT(TAILQ_EMPTY(&cs->cs_waiting_for_data_out),
("destroying session with non-empty queue"));
mtx_lock(&softc->lock);
TAILQ_REMOVE(&softc->sessions, cs, cs_next);
mtx_unlock(&softc->lock);
cfiscsi_session_unregister_initiator(cs);
if (cs->cs_target != NULL)
cfiscsi_target_release(cs->cs_target);
icl_conn_close(cs->cs_conn);
icl_conn_free(cs->cs_conn);
mtx_lock(&softc->lock);
TAILQ_REMOVE(&softc->sessions, cs, cs_next);
cv_signal(&softc->sessions_cv);
mtx_unlock(&softc->lock);
free(cs, M_CFISCSI);
cv_signal(&softc->sessions_cv);
}
static int