From owner-svn-src-stable@FreeBSD.ORG Fri Jun 5 15:57:08 2009 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4B6A91065670; Fri, 5 Jun 2009 15:57:08 +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 301458FC17; Fri, 5 Jun 2009 15:57:08 +0000 (UTC) (envelope-from gnn@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 n55Fv7jo030519; Fri, 5 Jun 2009 15:57:07 GMT (envelope-from gnn@svn.freebsd.org) Received: (from gnn@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n55Fv7ct030518; Fri, 5 Jun 2009 15:57:07 GMT (envelope-from gnn@svn.freebsd.org) Message-Id: <200906051557.n55Fv7ct030518@svn.freebsd.org> From: "George V. Neville-Neil" Date: Fri, 5 Jun 2009 15:57:07 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r193515 - in stable/7/sys: . contrib/pf dev/ath/ath_hal dev/cxgb X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Jun 2009 15:57:08 -0000 Author: gnn Date: Fri Jun 5 15:57:07 2009 New Revision: 193515 URL: http://svn.freebsd.org/changeset/base/193515 Log: MFC of 185506 and 185508 Proper fix for tracking ifnet statistics Update internal mac stats every time the tick task is called if we don't do this "netstat -w 1" will frequently see negative differences in packets sent Modified: stable/7/sys/ (props changed) stable/7/sys/contrib/pf/ (props changed) stable/7/sys/dev/ath/ath_hal/ (props changed) stable/7/sys/dev/cxgb/ (props changed) stable/7/sys/dev/cxgb/cxgb_main.c Modified: stable/7/sys/dev/cxgb/cxgb_main.c ============================================================================== --- stable/7/sys/dev/cxgb/cxgb_main.c Fri Jun 5 15:32:41 2009 (r193514) +++ stable/7/sys/dev/cxgb/cxgb_main.c Fri Jun 5 15:57:07 2009 (r193515) @@ -2305,7 +2305,7 @@ cxgb_tick(void *arg) if(sc->flags & CXGB_SHUTDOWN) return; - taskqueue_enqueue(sc->tq, &sc->tick_task); + taskqueue_enqueue(sc->tq, &sc->tick_task); callout_reset(&sc->cxgb_tick_ch, CXGB_TICKS(sc), cxgb_tick, sc); } @@ -2323,6 +2323,7 @@ cxgb_tick_handler(void *arg, int count) if (p->linkpoll_period) check_link_status(sc); + sc->check_task_cnt++; /* @@ -2334,17 +2335,59 @@ cxgb_tick_handler(void *arg, int count) if (p->rev == T3_REV_B2 && p->nports < 4 && sc->open_device_map) check_t3b2_mac(sc); - /* Update MAC stats if it's time to do so */ - if (!p->linkpoll_period || - (sc->check_task_cnt * p->linkpoll_period) / 10 >= - p->stats_update_period) { - for_each_port(sc, i) { - struct port_info *port = &sc->port[i]; - PORT_LOCK(port); - t3_mac_update_stats(&port->mac); - PORT_UNLOCK(port); - } - sc->check_task_cnt = 0; + for (i = 0; i < sc->params.nports; i++) { + struct port_info *pi = &sc->port[i]; + struct ifnet *ifp = pi->ifp; + struct mac_stats *mstats = &pi->mac.stats; + PORT_LOCK(pi); + t3_mac_update_stats(&pi->mac); + PORT_UNLOCK(pi); + + + ifp->if_opackets = + mstats->tx_frames_64 + + mstats->tx_frames_65_127 + + mstats->tx_frames_128_255 + + mstats->tx_frames_256_511 + + mstats->tx_frames_512_1023 + + mstats->tx_frames_1024_1518 + + mstats->tx_frames_1519_max; + + ifp->if_ipackets = + mstats->rx_frames_64 + + mstats->rx_frames_65_127 + + mstats->rx_frames_128_255 + + mstats->rx_frames_256_511 + + mstats->rx_frames_512_1023 + + mstats->rx_frames_1024_1518 + + mstats->rx_frames_1519_max; + + ifp->if_obytes = mstats->tx_octets; + ifp->if_ibytes = mstats->rx_octets; + ifp->if_omcasts = mstats->tx_mcast_frames; + ifp->if_imcasts = mstats->rx_mcast_frames; + + ifp->if_collisions = + mstats->tx_total_collisions; + + ifp->if_iqdrops = mstats->rx_cong_drops; + + ifp->if_oerrors = + mstats->tx_excess_collisions + + mstats->tx_underrun + + mstats->tx_len_errs + + mstats->tx_mac_internal_errs + + mstats->tx_excess_deferral + + mstats->tx_fcs_errs; + ifp->if_ierrors = + mstats->rx_jabber + + mstats->rx_data_errs + + mstats->rx_sequence_errs + + mstats->rx_runt + + mstats->rx_too_long + + mstats->rx_mac_internal_errs + + mstats->rx_short + + mstats->rx_fcs_errs; } }