From owner-freebsd-net@FreeBSD.ORG Wed Aug 8 14:20:18 2012 Return-Path: Delivered-To: freebsd-net@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 9B0FC106566C for ; Wed, 8 Aug 2012 14:20:18 +0000 (UTC) (envelope-from aboyer@averesystems.com) Received: from mail.averesystems.com (mail.averesystems.com [208.70.68.85]) by mx1.freebsd.org (Postfix) with ESMTP id 6CE128FC17 for ; Wed, 8 Aug 2012 14:20:18 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.averesystems.com (Postfix) with ESMTP id 5F460480741 for ; Wed, 8 Aug 2012 10:20:15 -0400 (EDT) X-Virus-Scanned: amavisd-new at mail.averesystems.com Received: from mail.averesystems.com ([127.0.0.1]) by localhost (mail.averesystems.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id RvA4joDuuBYe for ; Wed, 8 Aug 2012 10:20:14 -0400 (EDT) Received: from riven.arriad.com (206.193.225.214.nauticom.net [206.193.225.214]) by mail.averesystems.com (Postfix) with ESMTPSA id 4D68F4804F7 for ; Wed, 8 Aug 2012 10:20:14 -0400 (EDT) From: Andrew Boyer Content-Type: multipart/mixed; boundary="Apple-Mail=_10FF126D-3158-48F4-BDA7-2E21CA77CA6D" Date: Wed, 8 Aug 2012 10:20:10 -0400 Message-Id: <1B3C868C-6CA7-40A0-88A2-315EE6B95BDB@averesystems.com> To: freebsd-net@freebsd.org Mime-Version: 1.0 (Apple Message framework v1278) X-Mailer: Apple Mail (2.1278) Subject: [patch] e1000 stats cleanup X-BeenThere: freebsd-net@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Networking and TCP/IP with FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 08 Aug 2012 14:20:18 -0000 --Apple-Mail=_10FF126D-3158-48F4-BDA7-2E21CA77CA6D Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=us-ascii This patch fixes a nit in the em, lem, and igb driver statistics, = similar to what I proposed for ixgbe a few days ago. Increment = adapter->dropped_pkts instead of if_ierrors because if_ierrors is = overwritten by hw stats collection. Comments welcome. -Andrew --Apple-Mail=_10FF126D-3158-48F4-BDA7-2E21CA77CA6D Content-Disposition: attachment; filename=e1000_stats.diff Content-Type: application/octet-stream; name="e1000_stats.diff" Content-Transfer-Encoding: 7bit Index: sys/dev/e1000/if_igb.c =================================================================== --- sys/dev/e1000/if_igb.c (revision 239139) +++ sys/dev/e1000/if_igb.c (working copy) @@ -4759,7 +4759,7 @@ /* Make sure all segments of a bad packet are discarded */ if (((staterr & E1000_RXDEXT_ERR_FRAME_ERR_MASK) != 0) || (rxr->discard)) { - ifp->if_ierrors++; + adapter->dropped_pkts++; ++rxr->rx_discarded; if (!eop) /* Catch subsequent segs */ rxr->discard = TRUE; Index: sys/dev/e1000/if_lem.c =================================================================== --- sys/dev/e1000/if_lem.c (revision 239139) +++ sys/dev/e1000/if_lem.c (working copy) @@ -3562,7 +3561,7 @@ adapter->lmp = NULL; } } else { - ifp->if_ierrors++; + adapter->dropped_pkts++; discard: /* Reuse loaded DMA map and just update mbuf chain */ mp = adapter->rx_buffer_area[i].m_head; Index: sys/dev/e1000/if_em.c =================================================================== --- sys/dev/e1000/if_em.c (revision 239139) +++ sys/dev/e1000/if_em.c (working copy) @@ -4434,7 +4434,7 @@ if ((cur->errors & E1000_RXD_ERR_FRAME_ERR_MASK) || (rxr->discard == TRUE)) { - ifp->if_ierrors++; + adapter->dropped_pkts++; ++rxr->rx_discarded; if (!eop) /* Catch subsequent segs */ rxr->discard = TRUE; --Apple-Mail=_10FF126D-3158-48F4-BDA7-2E21CA77CA6D Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=us-ascii -------------------------------------------------- Andrew Boyer aboyer@averesystems.com --Apple-Mail=_10FF126D-3158-48F4-BDA7-2E21CA77CA6D--