From owner-svn-src-head@FreeBSD.ORG Fri Jul 23 17:53:42 2010 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 168561065672; Fri, 23 Jul 2010 17:53:42 +0000 (UTC) (envelope-from gnn@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 05A318FC1C; Fri, 23 Jul 2010 17:53:42 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o6NHrfWM072279; Fri, 23 Jul 2010 17:53:41 GMT (envelope-from gnn@svn.freebsd.org) Received: (from gnn@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o6NHresT072278; Fri, 23 Jul 2010 17:53:40 GMT (envelope-from gnn@svn.freebsd.org) Message-Id: <201007231753.o6NHresT072278@svn.freebsd.org> From: "George V. Neville-Neil" Date: Fri, 23 Jul 2010 17:53:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r210428 - head/sys/dev/e1000 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 23 Jul 2010 17:53:42 -0000 Author: gnn Date: Fri Jul 23 17:53:39 2010 New Revision: 210428 URL: http://svn.freebsd.org/changeset/base/210428 Log: Fix a bug in the statistics code for tracking the head and tail pointers of the tx and rx queues. We needed a SYSCTL_PROC to correctly get the values at run time. Submitted by: Andrew Boyer aboyer at averesystems.com MFC after: 1 week Modified: head/sys/dev/e1000/if_igb.c Modified: head/sys/dev/e1000/if_igb.c ============================================================================== --- head/sys/dev/e1000/if_igb.c Fri Jul 23 17:44:01 2010 (r210427) +++ head/sys/dev/e1000/if_igb.c Fri Jul 23 17:53:39 2010 (r210428) @@ -4927,6 +4927,74 @@ igb_update_vf_stats_counters(struct adap } +/** igb_sysctl_tdh_handler - Handler function + * Retrieves the TDH value from the hardware + */ +static int igb_sysctl_tdh_handler(SYSCTL_HANDLER_ARGS) +{ + int error; + + struct tx_ring *txr = ((struct tx_ring *)oidp->oid_arg1); + if (!txr) return 0; + + unsigned val = E1000_READ_REG(&txr->adapter->hw, E1000_TDH(txr->me)); + error = sysctl_handle_int(oidp, &val, 0, req); + if (error || !req->newptr) + return error; + return 0; +} + +/** igb_sysctl_tdt_handler - Handler function + * Retrieves the TDT value from the hardware + */ +static int igb_sysctl_tdt_handler(SYSCTL_HANDLER_ARGS) +{ + int error; + + struct tx_ring *txr = ((struct tx_ring *)oidp->oid_arg1); + if (!txr) return 0; + + unsigned val = E1000_READ_REG(&txr->adapter->hw, E1000_TDT(txr->me)); + error = sysctl_handle_int(oidp, &val, 0, req); + if (error || !req->newptr) + return error; + return 0; +} + +/** igb_sysctl_rdh_handler - Handler function + * Retrieves the RDH value from the hardware + */ +static int igb_sysctl_rdh_handler(SYSCTL_HANDLER_ARGS) +{ + int error; + + struct rx_ring *rxr = ((struct rx_ring *)oidp->oid_arg1); + if (!rxr) return 0; + + unsigned val = E1000_READ_REG(&rxr->adapter->hw, E1000_RDH(rxr->me)); + error = sysctl_handle_int(oidp, &val, 0, req); + if (error || !req->newptr) + return error; + return 0; +} + +/** igb_sysctl_rdt_handler - Handler function + * Retrieves the RDT value from the hardware + */ +static int igb_sysctl_rdt_handler(SYSCTL_HANDLER_ARGS) +{ + int error; + + struct rx_ring *rxr = ((struct rx_ring *)oidp->oid_arg1); + if (!rxr) return 0; + + unsigned val = E1000_READ_REG(&rxr->adapter->hw, E1000_RDT(rxr->me)); + error = sysctl_handle_int(oidp, &val, 0, req); + if (error || !req->newptr) + return error; + return 0; +} + /* * Add sysctl variables, one per statistic, to the system. */ @@ -4992,12 +5060,14 @@ igb_add_hw_stats(struct adapter *adapter CTLFLAG_RD, NULL, "Queue Name"); queue_list = SYSCTL_CHILDREN(queue_node); - SYSCTL_ADD_UINT(ctx, queue_list, OID_AUTO, "txd_head", - CTLFLAG_RD, &txr->tdh, 0, - "Transmit Descriptor Head"); - SYSCTL_ADD_UINT(ctx, queue_list, OID_AUTO, "txd_tail", - CTLFLAG_RD, &txr->tdt, 0, - "Transmit Descriptor Tail"); + SYSCTL_ADD_PROC(ctx, queue_list, OID_AUTO, "txd_head", + CTLFLAG_RD, txr, sizeof(txr), + igb_sysctl_tdh_handler, "IU", + "Transmit Descriptor Head"); + SYSCTL_ADD_PROC(ctx, queue_list, OID_AUTO, "txd_tail", + CTLFLAG_RD, txr, sizeof(txr), + igb_sysctl_tdt_handler, "IU", + "Transmit Descriptor Tail"); SYSCTL_ADD_QUAD(ctx, queue_list, OID_AUTO, "no_desc_avail", CTLFLAG_RD, &txr->no_desc_avail, "Queue No Descriptor Available"); @@ -5019,11 +5089,13 @@ igb_add_hw_stats(struct adapter *adapter CTLFLAG_RD, NULL, "Queue Name"); queue_list = SYSCTL_CHILDREN(queue_node); - SYSCTL_ADD_UINT(ctx, queue_list, OID_AUTO, "rxd_head", - CTLFLAG_RD, &rxr->rdh, 0, + SYSCTL_ADD_PROC(ctx, queue_list, OID_AUTO, "rxd_head", + CTLFLAG_RD, rxr, sizeof(rxr), + igb_sysctl_rdh_handler, "IU", "Receive Descriptor Head"); - SYSCTL_ADD_UINT(ctx, queue_list, OID_AUTO, "rxd_tail", - CTLFLAG_RD, &rxr->rdt, 0, + SYSCTL_ADD_PROC(ctx, queue_list, OID_AUTO, "rxd_tail", + CTLFLAG_RD, rxr, sizeof(rxr), + igb_sysctl_rdt_handler, "IU", "Receive Descriptor Tail"); SYSCTL_ADD_QUAD(ctx, queue_list, OID_AUTO, "rx_packets", CTLFLAG_RD, &rxr->rx_packets,