From owner-svn-src-user@FreeBSD.ORG Sun Jun 7 01:36:27 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 E6B561065670; Sun, 7 Jun 2009 01:36:27 +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 D53038FC0A; Sun, 7 Jun 2009 01:36:27 +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 n571aRK0077843; Sun, 7 Jun 2009 01:36:27 GMT (envelope-from kmacy@svn.freebsd.org) Received: (from kmacy@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n571aRkv077841; Sun, 7 Jun 2009 01:36:27 GMT (envelope-from kmacy@svn.freebsd.org) Message-Id: <200906070136.n571aRkv077841@svn.freebsd.org> From: Kip Macy Date: Sun, 7 Jun 2009 01:36:27 +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: r193605 - 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: Sun, 07 Jun 2009 01:36:28 -0000 Author: kmacy Date: Sun Jun 7 01:36:27 2009 New Revision: 193605 URL: http://svn.freebsd.org/changeset/base/193605 Log: track coalesced packets Modified: user/kmacy/releng_7_2_fcs/sys/dev/cxgb/cxgb_adapter.h user/kmacy/releng_7_2_fcs/sys/dev/cxgb/cxgb_sge.c Modified: user/kmacy/releng_7_2_fcs/sys/dev/cxgb/cxgb_adapter.h ============================================================================== --- user/kmacy/releng_7_2_fcs/sys/dev/cxgb/cxgb_adapter.h Sun Jun 7 01:21:17 2009 (r193604) +++ user/kmacy/releng_7_2_fcs/sys/dev/cxgb/cxgb_adapter.h Sun Jun 7 01:36:27 2009 (r193605) @@ -244,9 +244,9 @@ struct sge_txq { struct ifaltq *txq_ifq; struct callout txq_timer; struct callout txq_watchdog; + uint64_t txq_coalesced; uint32_t txq_drops; uint32_t txq_skipped; - uint32_t txq_coalesced; uint32_t txq_enqueued; uint32_t txq_dump_start; uint32_t txq_dump_count; 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 Sun Jun 7 01:21:17 2009 (r193604) +++ user/kmacy/releng_7_2_fcs/sys/dev/cxgb/cxgb_sge.c Sun Jun 7 01:36:27 2009 (r193605) @@ -1379,6 +1379,7 @@ t3_encap(struct sge_qset *qs, struct mbu if (nsegs > 7) panic("trying to coalesce %d packets in to one WR", nsegs); + txq->txq_coalesced += nsegs wrp = (struct work_request_hdr *)txd; flits = nsegs*2 + 1; txq_prod(txq, 1, &txqs); @@ -3607,7 +3608,7 @@ t3_add_configured_sysctls(adapter_t *sc) SYSCTL_ADD_UINT(ctx, txqpoidlist, OID_AUTO, "skipped", CTLFLAG_RD, &txq->txq_skipped, 0, "#tunneled packet descriptors skipped"); - SYSCTL_ADD_UINT(ctx, txqpoidlist, OID_AUTO, "coalesced", + SYSCTL_ADD_QUAD(ctx, txqpoidlist, OID_AUTO, "coalesced", CTLFLAG_RD, &txq->txq_coalesced, 0, "#tunneled packets coalesced"); SYSCTL_ADD_UINT(ctx, txqpoidlist, OID_AUTO, "enqueued",