Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix system freeze when trying to write to a raw iSCSI device with MAXPHYS

Browse Source 
bytes.  Newfs does large writes when initializing the filesystem.
First, don't copy the head of a TAILQ to make a copy - the first entry will
still point back to the original head.  This caused the ccb list to link to
itself, resulting in a continous loop processing the same ccb and blocked
interrupts.  Use TAILQ_CONCAT() to copy the list.
Next, the ccb disposition was not set in the ccb when the ccb was throttled,
losing the CCBDISP_SCSIPI, so when a throttled ccb was resent, it failed to
call scscipi_done(), and left that I/O hanging.
I am now able to newfs an iSCSI device, was well as issued large writes
using dd.
This commit is contained in:
mhitch 2012-06-05 16:36:06 +00:00
parent 1d0360b1c9
commit cb21df7acc
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/dev/iscsi/iscsi_rcv.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: iscsi_rcv.c,v 1.1 2011/10/23 21:15:02 agc Exp $ */
/* $NetBSD: iscsi_rcv.c,v 1.2 2012/06/05 16:36:06 mhitch Exp $ */
/*-
* Copyright (c) 2004,2005,2006,2011 The NetBSD Foundation, Inc.
@ -1138,8 +1138,8 @@ receive_pdu(connection_t *conn, pdu_t *pdu)
DEBC(conn, 1, ("Unthrottling - MaxCmdSN = %d\n", MaxCmdSN));
CS_BEGIN;
waiting = sess->ccbs_throttled;
TAILQ_INIT(&sess->ccbs_throttled);
TAILQ_INIT(&waiting);
TAILQ_CONCAT(&waiting, &sess->ccbs_throttled, chain);
CS_END;
while ((req_ccb = TAILQ_FIRST(&waiting)) != NULL) {
TAILQ_REMOVE(&waiting, req_ccb, chain);

4
sys/dev/iscsi/iscsi_send.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: iscsi_send.c,v 1.1 2011/10/23 21:15:02 agc Exp $ */
/* $NetBSD: iscsi_send.c,v 1.2 2012/06/05 16:36:07 mhitch Exp $ */
/*-
* Copyright (c) 2004,2005,2006,2011 The NetBSD Foundation, Inc.
@ -1345,6 +1345,7 @@ send_command(ccb_t *ccb, ccb_disp_t disp, bool waitok, bool immed)
if (/*CONSTCOND*/ISCSI_TROTTLING_ENABLED &&
/*CONSTCOND*/ISCSI_SERVER_TRUSTED &&
!sn_a_le_b(sess->CmdSN, sess->MaxCmdSN)) {
ccb->disp = disp;
TAILQ_INSERT_TAIL(&sess->ccbs_throttled, ccb, chain);
splx(s);
PDEBOUT(("Throttling S - CmdSN = %d, MaxCmdSN = %d\n",
@ -1363,6 +1364,7 @@ send_command(ccb_t *ccb, ccb_disp_t disp, bool waitok, bool immed)
while (/*CONSTCOND*/ISCSI_TROTTLING_ENABLED &&
/*CONSTCOND*/ISCSI_SERVER_TRUSTED &&
!sn_a_le_b(sess->CmdSN, sess->MaxCmdSN)) {
ccb->disp = disp;
ccb->flags |= CCBF_WAITING;
TAILQ_INSERT_TAIL(&sess->ccbs_throttled, ccb, chain);
PDEBOUT(("Throttling W - CmdSN = %d, MaxCmdSN = %d\n",