Date: Fri, 21 Nov 2014 18:05:03 +0000 (UTC) From: Alexander Motin <mav@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r274805 - head/sys/cam/ctl Message-ID: <201411211805.sALI53e8086025@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mav Date: Fri Nov 21 18:05:02 2014 New Revision: 274805 URL: https://svnweb.freebsd.org/changeset/base/274805 Log: Make cfiscsi_offline() synchronous, waiting for connections termination before return. This should make ctld restart more clean and predictable. MFC after: 2 weeks Modified: head/sys/cam/ctl/ctl_frontend_iscsi.c head/sys/cam/ctl/ctl_frontend_iscsi.h Modified: head/sys/cam/ctl/ctl_frontend_iscsi.c ============================================================================== --- head/sys/cam/ctl/ctl_frontend_iscsi.c Fri Nov 21 18:00:00 2014 (r274804) +++ head/sys/cam/ctl/ctl_frontend_iscsi.c Fri Nov 21 18:05:02 2014 (r274805) @@ -1274,6 +1274,7 @@ cfiscsi_session_delete(struct cfiscsi_se mtx_lock(&softc->lock); TAILQ_REMOVE(&softc->sessions, cs, cs_next); + cv_signal(&softc->sessions_cv); mtx_unlock(&softc->lock); free(cs, M_CFISCSI); @@ -1290,6 +1291,7 @@ cfiscsi_init(void) bzero(softc, sizeof(*softc)); mtx_init(&softc->lock, "cfiscsi", NULL, MTX_DEF); + cv_init(&softc->sessions_cv, "cfiscsi_sessions"); #ifdef ICL_KERNEL_PROXY cv_init(&softc->accept_cv, "cfiscsi_accept"); #endif @@ -1374,6 +1376,14 @@ cfiscsi_offline(void *arg) if (cs->cs_target == ct) cfiscsi_session_terminate(cs); } + do { + TAILQ_FOREACH(cs, &softc->sessions, cs_next) { + if (cs->cs_target == ct) + break; + } + if (cs != NULL) + cv_wait(&softc->sessions_cv, &softc->lock); + } while (cs != NULL && ct->ct_online == 0); mtx_unlock(&softc->lock); if (online > 0) return; Modified: head/sys/cam/ctl/ctl_frontend_iscsi.h ============================================================================== --- head/sys/cam/ctl/ctl_frontend_iscsi.h Fri Nov 21 18:00:00 2014 (r274804) +++ head/sys/cam/ctl/ctl_frontend_iscsi.h Fri Nov 21 18:05:02 2014 (r274805) @@ -115,6 +115,7 @@ struct cfiscsi_softc { unsigned int last_session_id; TAILQ_HEAD(, cfiscsi_target) targets; TAILQ_HEAD(, cfiscsi_session) sessions; + struct cv sessions_cv; #ifdef ICL_KERNEL_PROXY struct icl_listen *listener; struct cv accept_cv;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201411211805.sALI53e8086025>