From owner-svn-src-projects@FreeBSD.ORG Fri May 4 18:12:54 2012 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 452AA106566B; Fri, 4 May 2012 18:12:54 +0000 (UTC) (envelope-from kmacy@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 17C2A8FC08; Fri, 4 May 2012 18:12:54 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q44ICrx5016531; Fri, 4 May 2012 18:12:53 GMT (envelope-from kmacy@svn.freebsd.org) Received: (from kmacy@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q44ICrip016528; Fri, 4 May 2012 18:12:53 GMT (envelope-from kmacy@svn.freebsd.org) Message-Id: <201205041812.q44ICrip016528@svn.freebsd.org> From: Kip Macy Date: Fri, 4 May 2012 18:12:53 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r235022 - projects/iscsi_opt/sys/dev/iscsi/initiator X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 May 2012 18:12:54 -0000 Author: kmacy Date: Fri May 4 18:12:53 2012 New Revision: 235022 URL: http://svn.freebsd.org/changeset/base/235022 Log: unfreeze and run queue from isc_out context Modified: projects/iscsi_opt/sys/dev/iscsi/initiator/isc_sm.c projects/iscsi_opt/sys/dev/iscsi/initiator/iscsivar.h Modified: projects/iscsi_opt/sys/dev/iscsi/initiator/isc_sm.c ============================================================================== --- projects/iscsi_opt/sys/dev/iscsi/initiator/isc_sm.c Fri May 4 17:18:02 2012 (r235021) +++ projects/iscsi_opt/sys/dev/iscsi/initiator/isc_sm.c Fri May 4 18:12:53 2012 (r235022) @@ -370,14 +370,17 @@ isc_so_snd_upcall(struct socket *so, voi if (sp->cam_sim->devq->send_queue.qfrozen_cnt[0] != 0) printf("qfrozen_cnt went to bad value %d\n", sp->cam_sim->devq->send_queue.qfrozen_cnt[0]); - sp->cam_sim->devq->send_queue.qfrozen_cnt[0] = 1; } - if (sp->cam_sim->devq->send_queue.qfrozen_cnt[0] > 0) - xpt_release_simq(sp->cam_sim, 0); - else + if (sp->cam_sim->devq->send_queue.qfrozen_cnt[0] > 0) { + sp->flags |= ISC_QUNFREEZE; + + mtx_lock(&sp->io_mtx); + if (sp->flags & ISC_OWAITING) + wakeup(&sp->flags); + mtx_unlock(&sp->io_mtx); + } else printf("queue already released !!! %d\n", sp->cam_sim->devq->send_queue.qfrozen_cnt[0]); - sp->cam_flags &= ~ISC_QFROZEN; mtx_unlock(sp->cam_sim->mtx); return (SU_OK); @@ -643,6 +646,12 @@ ism_out(void *vp) sp->flags |= ISC_SM_RUNNING; sdebug(3, "started sp->flags=%x", sp->flags); do { + CAM_LOCK(sp); + if (sp->flags & ISC_QUNFREEZE) { + xpt_release_simq(sp->cam_sim, 1); + sp->flags &= ~(ISC_QUNFREEZE|ISC_QFROZEN); + } + CAM_UNLOCK(sp); if((sp->flags & ISC_HOLD) == 0) { error = 0; if (sx_try_xlock(&sp->tx_sx)) { Modified: projects/iscsi_opt/sys/dev/iscsi/initiator/iscsivar.h ============================================================================== --- projects/iscsi_opt/sys/dev/iscsi/initiator/iscsivar.h Fri May 4 17:18:02 2012 (r235021) +++ projects/iscsi_opt/sys/dev/iscsi/initiator/iscsivar.h Fri May 4 18:12:53 2012 (r235022) @@ -199,7 +199,10 @@ typedef struct isc_session { struct cam_sim *cam_sim; struct cam_path *cam_path; struct mtx cam_mtx; -#define ISC_QFROZEN 0x1 +#define ISC_QFROZEN 0x1 +#define ISC_QUNFREEZE 0x2 + + int cam_flags; /* | sysctl stuff