Date: Fri, 4 May 2012 17:12:31 +0000 (UTC) From: Kip Macy <kmacy@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r235020 - projects/iscsi_opt/sys/dev/iscsi/initiator Message-ID: <201205041712.q44HCVE1014103@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kmacy Date: Fri May 4 17:12:31 2012 New Revision: 235020 URL: http://svn.freebsd.org/changeset/base/235020 Log: check that the queue wasn't already frozen while we didn't hold the lock 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 17:02:34 2012 (r235019) +++ projects/iscsi_opt/sys/dev/iscsi/initiator/isc_cam.c Fri May 4 17:12:31 2012 (r235020) @@ -251,18 +251,16 @@ ic_action(struct cam_sim *sim, union ccb if (rc == EWOULDBLOCK) { if ((sp->cam_flags & ISC_QFROZEN) == 0) { - 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] != 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; + if ((sp->cam_flags & ISC_QFROZEN) == 0) { + sp->cam_flags |= ISC_QFROZEN; + xpt_freeze_simq(sim, 1); + soupcall_set(sp->soc, SO_SND, isc_so_snd_upcall, sp); } - soupcall_set(sp->soc, SO_SND, isc_so_snd_upcall, sp); + /* else we lost the race and someone else froze it for us oh well */ SOCKBUF_UNLOCK(&sp->soc->so_snd); - } status = ccb->ccb_h.status &= ~CAM_STATUS_MASK; csio->ccb_h.status = status | CAM_REQUEUE_REQ;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201205041712.q44HCVE1014103>