From owner-svn-src-projects@FreeBSD.ORG Fri May 4 17:02:34 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 AA9A31065670; Fri, 4 May 2012 17:02:34 +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 968968FC17; Fri, 4 May 2012 17:02:34 +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 q44H2YUH013765; Fri, 4 May 2012 17:02:34 GMT (envelope-from kmacy@svn.freebsd.org) Received: (from kmacy@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q44H2YHY013763; Fri, 4 May 2012 17:02:34 GMT (envelope-from kmacy@svn.freebsd.org) Message-Id: <201205041702.q44H2YHY013763@svn.freebsd.org> From: Kip Macy Date: Fri, 4 May 2012 17:02:34 +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: r235019 - 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 17:02:34 -0000 Author: kmacy Date: Fri May 4 17:02:34 2012 New Revision: 235019 URL: http://svn.freebsd.org/changeset/base/235019 Log: queue freeze count may not be zero initially Modified: projects/iscsi_opt/sys/dev/iscsi/initiator/isc_cam.c Modified: projects/iscsi_opt/sys/dev/iscsi/initiator/isc_cam.c ============================================================================== --- projects/iscsi_opt/sys/dev/iscsi/initiator/isc_cam.c Fri May 4 16:53:43 2012 (r235018) +++ projects/iscsi_opt/sys/dev/iscsi/initiator/isc_cam.c Fri May 4 17:02:34 2012 (r235019) @@ -251,14 +251,14 @@ ic_action(struct cam_sim *sim, union ccb if (rc == EWOULDBLOCK) { if ((sp->cam_flags & ISC_QFROZEN) == 0) { - xpt_freeze_simq(sim, 1); + int freeze_count = xpt_freeze_simq(sim, 1); sp->cam_flags |= ISC_QFROZEN; CAM_UNLOCK(sp); SOCKBUF_LOCK(&sp->soc->so_snd); CAM_LOCK(sp); - if (sp->cam_sim->devq->send_queue.qfrozen_cnt[0] != 1) { - printf("lost race when acquiring socket buffer lock qfrozen_cnt=%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] != freeze_count) { + printf("lost race when acquiring socket buffer lock qfrozen_cnt=%d freeze_count=%d\n", sp->cam_sim->devq->send_queue.qfrozen_cnt[0], freeze_count); + sp->cam_sim->devq->send_queue.qfrozen_cnt[0] = freeze_count; } soupcall_set(sp->soc, SO_SND, isc_so_snd_upcall, sp); SOCKBUF_UNLOCK(&sp->soc->so_snd);