From owner-svn-src-head@FreeBSD.ORG Fri Nov 21 18:05:03 2014 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D3654932; Fri, 21 Nov 2014 18:05:03 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A669C36F; Fri, 21 Nov 2014 18:05:03 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sALI53XZ086034; Fri, 21 Nov 2014 18:05:03 GMT (envelope-from mav@FreeBSD.org) Received: (from mav@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sALI53e8086025; Fri, 21 Nov 2014 18:05:03 GMT (envelope-from mav@FreeBSD.org) Message-Id: <201411211805.sALI53e8086025@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: mav set sender to mav@FreeBSD.org using -f From: Alexander Motin Date: Fri, 21 Nov 2014 18:05:03 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r274805 - head/sys/cam/ctl X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 21 Nov 2014 18:05:03 -0000 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;