mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2024-12-17 10:26:15 +00:00
Code Issues Releases Activity

Convert to if_get_counter().

Browse Source
This commit is contained in:
Gleb Smirnoff 2014-09-28 07:29:45 +00:00
parent 08f06f0ace
commit 058a38660e
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=272240
1 changed files with 35 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
sys/dev/ixgbe/ixgbe.c
View File

@ -120,6 +120,7 @@ static int ixgbe_ioctl(struct ifnet *, u_long, caddr_t);
static void ixgbe_init(void *);
static void ixgbe_init_locked(struct adapter *);
static void ixgbe_stop(void *);
static uint64_t ixgbe_get_counter(struct ifnet *, ift_counter);
static void ixgbe_media_status(struct ifnet *, struct ifmediareq *);
static int ixgbe_media_change(struct ifnet *);
static void ixgbe_identify_hardware(struct adapter *);
@ -2721,6 +2722,7 @@ ixgbe_setup_interface(device_t dev, struct adapter *adapter)
ifp->if_softc = adapter;
ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
ifp->if_ioctl = ixgbe_ioctl;
ifp->if_get_counter = ixgbe_get_counter;
#ifndef IXGBE_LEGACY_TX
ifp->if_transmit = ixgbe_mq_start;
ifp->if_qflush = ixgbe_qflush;
@ -5364,10 +5366,8 @@ ixgbe_reinit_fdir(void *context, int pending)
static void
ixgbe_update_stats_counters(struct adapter *adapter)
{
struct ifnet *ifp = adapter->ifp;
struct ixgbe_hw *hw = &adapter->hw;
u32 missed_rx = 0, bprc, lxon, lxoff, total;
u64 total_missed_rx = 0;
adapter->stats.crcerrs += IXGBE_READ_REG(hw, IXGBE_CRCERRS);
adapter->stats.illerrc += IXGBE_READ_REG(hw, IXGBE_ILLERRC);
@ -5386,8 +5386,6 @@ ixgbe_update_stats_counters(struct adapter *adapter)
missed_rx += mp;
/* global total per queue */
adapter->stats.mpc[i] += mp;
/* Running comprehensive total for stats display */
total_missed_rx += adapter->stats.mpc[i];
if (hw->mac.type == ixgbe_mac_82598EB) {
adapter->stats.rnbc[i] +=
IXGBE_READ_REG(hw, IXGBE_RNBC(i));
@ -5497,19 +5495,41 @@ ixgbe_update_stats_counters(struct adapter *adapter)
adapter->stats.fcoedwrc += IXGBE_READ_REG(hw, IXGBE_FCOEDWRC);
adapter->stats.fcoedwtc += IXGBE_READ_REG(hw, IXGBE_FCOEDWTC);
}
}
/* Fill out the OS statistics structure */
ifp->if_ipackets = adapter->stats.gprc;
ifp->if_opackets = adapter->stats.gptc;
ifp->if_ibytes = adapter->stats.gorc;
ifp->if_obytes = adapter->stats.gotc;
ifp->if_imcasts = adapter->stats.mprc;
ifp->if_omcasts = adapter->stats.mptc;
ifp->if_collisions = 0;
static uint64_t
ixgbe_get_counter(struct ifnet *ifp, ift_counter cnt)
{
struct adapter *adapter;
uint64_t rv;
/* Rx Errors */
ifp->if_iqdrops = total_missed_rx;
ifp->if_ierrors = adapter->stats.crcerrs + adapter->stats.rlec;
adapter = if_getsoftc(ifp);
switch (cnt) {
case IFCOUNTER_IPACKETS:
return (adapter->stats.gprc);
case IFCOUNTER_OPACKETS:
return (adapter->stats.gptc);
case IFCOUNTER_IBYTES:
return (adapter->stats.gorc);
case IFCOUNTER_OBYTES:
return (adapter->stats.gotc);
case IFCOUNTER_IMCASTS:
return (adapter->stats.mprc);
case IFCOUNTER_OMCASTS:
return (adapter->stats.mptc);
case IFCOUNTER_COLLISIONS:
return (0);
case IFCOUNTER_IQDROPS:
rv = 0;
for (int i = 0; i < 8; i++)
rv += adapter->stats.mpc[i];
return (rv);
case IFCOUNTER_IERRORS:
return (adapter->stats.crcerrs + adapter->stats.rlec);
default:
return (if_get_counter_default(ifp, cnt));
}
}
/** ixgbe_sysctl_tdh_handler - Handler function