From owner-svn-src-head@freebsd.org Wed Oct 4 11:35:05 2017 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 80B2DE36ADB; Wed, 4 Oct 2017 11:35:05 +0000 (UTC) (envelope-from trasz@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 4B303823C1; Wed, 4 Oct 2017 11:35:05 +0000 (UTC) (envelope-from trasz@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v94BZ4Ao003532; Wed, 4 Oct 2017 11:35:04 GMT (envelope-from trasz@FreeBSD.org) Received: (from trasz@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v94BZ4jW003531; Wed, 4 Oct 2017 11:35:04 GMT (envelope-from trasz@FreeBSD.org) Message-Id: <201710041135.v94BZ4jW003531@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: trasz set sender to trasz@FreeBSD.org using -f From: Edward Tomasz Napierala Date: Wed, 4 Oct 2017 11:35:04 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r324261 - head/sys/cam/ctl X-SVN-Group: head X-SVN-Commit-Author: trasz X-SVN-Commit-Paths: head/sys/cam/ctl X-SVN-Commit-Revision: 324261 X-SVN-Commit-Repository: base 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.23 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: Wed, 04 Oct 2017 11:35:05 -0000 Author: trasz Date: Wed Oct 4 11:35:04 2017 New Revision: 324261 URL: https://svnweb.freebsd.org/changeset/base/324261 Log: Fix iSCSI target panics on concurrent session teardown and display (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 Modified: head/sys/cam/ctl/ctl_frontend_iscsi.c Modified: head/sys/cam/ctl/ctl_frontend_iscsi.c ============================================================================== --- head/sys/cam/ctl/ctl_frontend_iscsi.c Wed Oct 4 09:54:59 2017 (r324260) +++ head/sys/cam/ctl/ctl_frontend_iscsi.c Wed Oct 4 11:35:04 2017 (r324261) @@ -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