Module Name: src Committed By: thorpej Date: Thu Jan 30 14:02:14 UTC 2020
Modified Files: src/sys/dev/pci: if_lii.c if_mcx.c if_vioif.c src/sys/dev/pci/ixgbe: ix_txrx.c Log Message: Adopt <net/if_stats.h>. To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 src/sys/dev/pci/if_lii.c cvs rdiff -u -r1.9 -r1.10 src/sys/dev/pci/if_mcx.c cvs rdiff -u -r1.51 -r1.52 src/sys/dev/pci/if_vioif.c cvs rdiff -u -r1.60 -r1.61 src/sys/dev/pci/ixgbe/ix_txrx.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/dev/pci/if_lii.c diff -u src/sys/dev/pci/if_lii.c:1.27 src/sys/dev/pci/if_lii.c:1.28 --- src/sys/dev/pci/if_lii.c:1.27 Wed Sep 18 00:09:42 2019 +++ src/sys/dev/pci/if_lii.c Thu Jan 30 14:02:14 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: if_lii.c,v 1.27 2019/09/18 00:09:42 msaitoh Exp $ */ +/* $NetBSD: if_lii.c,v 1.28 2020/01/30 14:02:14 thorpej Exp $ */ /* * Copyright (c) 2008 The NetBSD Foundation. @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_lii.c,v 1.27 2019/09/18 00:09:42 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_lii.c,v 1.28 2020/01/30 14:02:14 thorpej Exp $"); #include <sys/param.h> @@ -985,13 +985,13 @@ lii_rxintr(struct lii_softc *sc) sc->sc_rxcur = (sc->sc_rxcur + 1) % AT_RXD_NUM; rxp->rxp_update = 0; if (!(rxp->rxp_flags & ATL2_RXF_SUCCESS)) { - ++ifp->if_ierrors; + if_statinc(ifp, if_ierrors); continue; } MGETHDR(m, M_DONTWAIT, MT_DATA); if (m == NULL) { - ++ifp->if_ierrors; + if_statinc(ifp, if_ierrors); continue; } size = rxp->rxp_size - ETHER_CRC_LEN; @@ -999,7 +999,7 @@ lii_rxintr(struct lii_softc *sc) MCLGET(m, M_DONTWAIT); if ((m->m_flags & M_EXT) == 0) { m_freem(m); - ++ifp->if_ierrors; + if_statinc(ifp, if_ierrors); continue; } } @@ -1049,9 +1049,9 @@ lii_txintr(struct lii_softc *sc) sc->sc_txd_ack %= AT_TXD_BUFFER_SIZE; if (txs->txps_flags & ATL2_TXF_SUCCESS) - ++ifp->if_opackets; + if_statinc(ifp, if_opackets); else - ++ifp->if_oerrors; + if_statinc(ifp, if_oerrors); ifp->if_flags &= ~IFF_OACTIVE; } @@ -1132,7 +1132,7 @@ lii_watchdog(struct ifnet *ifp) struct lii_softc *sc = ifp->if_softc; aprint_error_dev(sc->sc_dev, "watchdog timeout\n"); - ++ifp->if_oerrors; + if_statinc(ifp, if_oerrors); lii_init(ifp); } Index: src/sys/dev/pci/if_mcx.c diff -u src/sys/dev/pci/if_mcx.c:1.9 src/sys/dev/pci/if_mcx.c:1.10 --- src/sys/dev/pci/if_mcx.c:1.9 Fri Nov 29 15:17:14 2019 +++ src/sys/dev/pci/if_mcx.c Thu Jan 30 14:02:14 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: if_mcx.c,v 1.9 2019/11/29 15:17:14 msaitoh Exp $ */ +/* $NetBSD: if_mcx.c,v 1.10 2020/01/30 14:02:14 thorpej Exp $ */ /* $OpenBSD: if_mcx.c,v 1.33 2019/09/12 04:23:59 jmatthew Exp $ */ /* @@ -6438,7 +6438,7 @@ mcx_start(struct ifnet *ifp) if (mcx_load_mbuf(sc, ms, m) != 0) { m_freem(m); - ifp->if_oerrors++; + if_statinc(ifp, if_oerrors); continue; } bf = (uint64_t *)sqe; Index: src/sys/dev/pci/if_vioif.c diff -u src/sys/dev/pci/if_vioif.c:1.51 src/sys/dev/pci/if_vioif.c:1.52 --- src/sys/dev/pci/if_vioif.c:1.51 Tue Oct 1 18:00:08 2019 +++ src/sys/dev/pci/if_vioif.c Thu Jan 30 14:02:14 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: if_vioif.c,v 1.51 2019/10/01 18:00:08 chs Exp $ */ +/* $NetBSD: if_vioif.c,v 1.52 2020/01/30 14:02:14 thorpej Exp $ */ /* * Copyright (c) 2010 Minoura Makoto. @@ -26,7 +26,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_vioif.c,v 1.51 2019/10/01 18:00:08 chs Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_vioif.c,v 1.52 2020/01/30 14:02:14 thorpej Exp $"); #ifdef _KERNEL_OPT #include "opt_net_mpsafe.h" @@ -1239,9 +1239,11 @@ vioif_transmit(struct ifnet *ifp, struct return ENOBUFS; } - ifp->if_obytes += m->m_pkthdr.len; + net_stat_ref_t nsr = IF_STAT_GETREF(ifp); + if_statadd_ref(nsr, if_obytes, m->m_pkthdr.len); if (m->m_flags & M_MCAST) - ifp->if_omcasts++; + if_statinc_ref(nsr, if_omcasts); + IF_STAT_PUTREF(ifp); if (mutex_tryenter(txq->txq_lock)) { if (!txq->txq_stopping) @@ -1570,7 +1572,7 @@ vioif_tx_vq_done_locked(struct virtqueue bus_dmamap_unload(virtio_dmat(vsc), txq->txq_dmamaps[slot]); txq->txq_mbufs[slot] = NULL; virtio_dequeue_commit(vsc, vq, slot); - ifp->if_opackets++; + if_statinc(ifp, if_opackets); m_freem(m); } Index: src/sys/dev/pci/ixgbe/ix_txrx.c diff -u src/sys/dev/pci/ixgbe/ix_txrx.c:1.60 src/sys/dev/pci/ixgbe/ix_txrx.c:1.61 --- src/sys/dev/pci/ixgbe/ix_txrx.c:1.60 Tue Jan 21 14:55:55 2020 +++ src/sys/dev/pci/ixgbe/ix_txrx.c Thu Jan 30 14:02:14 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: ix_txrx.c,v 1.60 2020/01/21 14:55:55 msaitoh Exp $ */ +/* $NetBSD: ix_txrx.c,v 1.61 2020/01/30 14:02:14 thorpej Exp $ */ /****************************************************************************** @@ -540,12 +540,11 @@ retry: ++txr->total_packets.ev_count; IXGBE_WRITE_REG(&adapter->hw, txr->tail, i); - /* - * XXXX NOMPSAFE: ifp->if_data should be percpu. - */ - ifp->if_obytes += m_head->m_pkthdr.len; + net_stat_ref_t nsr = IF_STAT_GETREF(ifp); + if_statadd_ref(nsr, if_obytes, m_head->m_pkthdr.len); if (m_head->m_flags & M_MCAST) - ifp->if_omcasts++; + if_statinc_ref(nsr, if_omcasts); + IF_STAT_PUTREF(ifp); /* Mark queue as having work */ if (txr->busy == 0) @@ -1191,7 +1190,7 @@ ixgbe_txeof(struct tx_ring *txr) } ++txr->packets; ++processed; - ++ifp->if_opackets; + if_statinc(ifp, if_opackets); /* Try the next packet */ ++txd;