From owner-svn-src-user@FreeBSD.ORG Sat Jun 6 06:44:13 2009 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id ED3061065673; Sat, 6 Jun 2009 06:44:13 +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 C1A8E8FC1A; Sat, 6 Jun 2009 06:44:13 +0000 (UTC) (envelope-from kmacy@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n566iDYq051114; Sat, 6 Jun 2009 06:44:13 GMT (envelope-from kmacy@svn.freebsd.org) Received: (from kmacy@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n566iDkd051113; Sat, 6 Jun 2009 06:44:13 GMT (envelope-from kmacy@svn.freebsd.org) Message-Id: <200906060644.n566iDkd051113@svn.freebsd.org> From: Kip Macy Date: Sat, 6 Jun 2009 06:44:13 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r193570 - user/kmacy/releng_7_2_fcs/sys/dev/cxgb X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 06 Jun 2009 06:44:14 -0000 Author: kmacy Date: Sat Jun 6 06:44:13 2009 New Revision: 193570 URL: http://svn.freebsd.org/changeset/base/193570 Log: - set software descriptor unconditionally and clear as needed - tunq_coalesce is a quad Modified: user/kmacy/releng_7_2_fcs/sys/dev/cxgb/cxgb_sge.c Modified: user/kmacy/releng_7_2_fcs/sys/dev/cxgb/cxgb_sge.c ============================================================================== --- user/kmacy/releng_7_2_fcs/sys/dev/cxgb/cxgb_sge.c Sat Jun 6 06:29:15 2009 (r193569) +++ user/kmacy/releng_7_2_fcs/sys/dev/cxgb/cxgb_sge.c Sat Jun 6 06:44:13 2009 (r193570) @@ -1327,9 +1327,7 @@ t3_encap(struct sge_qset *qs, struct mbu return (err); } KASSERT(m0->m_pkthdr.len, ("empty packet nsegs=%d", nsegs)); - - if ((m0->m_pkthdr.len > PIO_LEN) || (nsegs > 1)) - txsd->m = m0; + txsd->m = m0; if (m0->m_nextpkt != NULL) { struct cpl_tx_pkt_batch *cpl_batch = (struct cpl_tx_pkt_batch *)txd; @@ -1337,7 +1335,6 @@ t3_encap(struct sge_qset *qs, struct mbu if (nsegs > 7) panic("trying to coalesce %d packets in to one WR", nsegs); - wrp = (struct work_request_hdr *)txd; flits = nsegs*2 + 1; txq_prod(txq, 1, &txqs); @@ -1429,6 +1426,7 @@ t3_encap(struct sge_qset *qs, struct mbu */ DPRINTF("**5592 Fix** mbuf=%p,len=%d,tso_segsz=%d,csum_flags=%#x,flags=%#x", m0, mlen, m0->m_pkthdr.tso_segsz, m0->m_pkthdr.csum_flags, m0->m_flags); + txsd->m = NULL; txq_prod(txq, 1, &txqs); m_copydata(m0, 0, mlen, (caddr_t)&txd->flit[3]); flits = (mlen + 7) / 8 + 3; @@ -1457,6 +1455,7 @@ t3_encap(struct sge_qset *qs, struct mbu cpl->len = htonl(mlen | 0x80000000); if (mlen <= PIO_LEN) { + txsd->m = NULL; txq_prod(txq, 1, &txqs); m_copydata(m0, 0, mlen, (caddr_t)&txd->flit[2]); flits = (mlen + 7) / 8 + 2; @@ -3430,7 +3429,7 @@ t3_add_attach_sysctls(adapter_t *sc) "enable_debug", CTLFLAG_RW, &cxgb_debug, 0, "enable verbose debugging output"); - SYSCTL_ADD_ULONG(ctx, children, OID_AUTO, "tunq_coalesce", + SYSCTL_ADD_QUAD(ctx, children, OID_AUTO, "tunq_coalesce", CTLFLAG_RD, &sc->tunq_coalesce, "#tunneled packets freed"); SYSCTL_ADD_INT(ctx, children, OID_AUTO,