From owner-svn-src-projects@FreeBSD.ORG Thu May 10 20:31:09 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 292FC106564A; Thu, 10 May 2012 20:31:09 +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 EF6508FC0C; Thu, 10 May 2012 20:31:08 +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 q4AKV8ap050579; Thu, 10 May 2012 20:31:08 GMT (envelope-from kmacy@svn.freebsd.org) Received: (from kmacy@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q4AKV8Sc050575; Thu, 10 May 2012 20:31:08 GMT (envelope-from kmacy@svn.freebsd.org) Message-Id: <201205102031.q4AKV8Sc050575@svn.freebsd.org> From: Kip Macy Date: Thu, 10 May 2012 20:31:08 +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: r235242 - 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: Thu, 10 May 2012 20:31:09 -0000 Author: kmacy Date: Thu May 10 20:31:08 2012 New Revision: 235242 URL: http://svn.freebsd.org/changeset/base/235242 Log: don't send a reject unless it corresponds to a ccb increase debug noise when isc_in has a problem Modified: projects/iscsi_opt/sys/dev/iscsi/initiator/isc_sm.c projects/iscsi_opt/sys/dev/iscsi/initiator/isc_soc.c projects/iscsi_opt/sys/dev/iscsi/initiator/iscsi_subr.c Modified: projects/iscsi_opt/sys/dev/iscsi/initiator/isc_sm.c ============================================================================== --- projects/iscsi_opt/sys/dev/iscsi/initiator/isc_sm.c Thu May 10 20:28:33 2012 (r235241) +++ projects/iscsi_opt/sys/dev/iscsi/initiator/isc_sm.c Thu May 10 20:31:08 2012 (r235242) @@ -113,9 +113,9 @@ _reject(isc_session_t *sp, pduq_t *pq) pdu = mtod(pq->mp, pdu_t *); itt = pdu->ipdu.bhs.itt; reject = &pq->pdu.ipdu.reject; - sdebug(2, "itt=%x reason=0x%x", ntohl(itt), reject->reason); + sdebug(2, "itt=%x rejected reason=0x%x", ntohl(itt), reject->reason); opq = i_search_hld(sp, itt, 0); - if(opq != NULL) + if(opq != NULL && opq->ccb != NULL) iscsi_reject(sp, opq, pq); else { switch(pq->pdu.ipdu.bhs.opcode) { Modified: projects/iscsi_opt/sys/dev/iscsi/initiator/isc_soc.c ============================================================================== --- projects/iscsi_opt/sys/dev/iscsi/initiator/isc_soc.c Thu May 10 20:28:33 2012 (r235241) +++ projects/iscsi_opt/sys/dev/iscsi/initiator/isc_soc.c Thu May 10 20:31:08 2012 (r235242) @@ -617,13 +617,15 @@ isc_in(void *vp) } mtx_unlock(&sp->io_mtx); } else if(error == EPIPE) { + debug(2, "sp->soc=%p error=EPIPE", sp->soc); break; } else if(error == EAGAIN) { + debug(2, "sp->soc=%p error=EAGAIN", sp->soc); isc_in_sleep++; if(so->so_state & SS_ISCONNECTED) // there seems to be a problem in 6.0 ... - tsleep(sp, PRIBIO, "isc_soc", 2*hz); + tsleep(sp, PRIBIO, "isc_soc", hz>>2); } } sdebug(2, "terminated, flags=%x so_count=%d so_state=%x error=%d proc=%p", Modified: projects/iscsi_opt/sys/dev/iscsi/initiator/iscsi_subr.c ============================================================================== --- projects/iscsi_opt/sys/dev/iscsi/initiator/iscsi_subr.c Thu May 10 20:28:33 2012 (r235241) +++ projects/iscsi_opt/sys/dev/iscsi/initiator/iscsi_subr.c Thu May 10 20:31:08 2012 (r235242) @@ -409,7 +409,7 @@ iscsi_reject(isc_session_t *sp, pduq_t * union ccb *ccb = opq->ccb; //reject_t *reject = &pq->pdu.ipdu.reject; - debug_called(8); + debug_called(3); //XXX: check RFC 10.17.1 (page 176) ccb->ccb_h.status = CAM_REQ_ABORTED; XPT_DONE(sp, ccb);