ixgbe: remove obsolete irq_sem, add driver state checking code
Subsystems (2)
PATCH 1/8 ixgbe: remove obsolete irq_sem, add driver state checking code
From: Ayyappan Veeraiyan <[email protected]>
After testing we confirmed that the irq_sem can safely be removed from ixgbe.
Add strict state checking code to various ethtool parts to properly protect against races between various driver reset paths.
---
drivers/net/ixgbe/ixgbe.h | 2 + drivers/net/ixgbe/ixgbe_ethtool.c | 29 ++++++++---------- drivers/net/ixgbe/ixgbe_main.c | 60 ++++++++++++++++++++++--------------- 3 files changed, 49 insertions(+), 42 deletions(-)
drivers/net/ixgbe/ixgbe.h +1 -1
@@ -174,7 +174,6 @@ struct ixgbe_adapter {struct vlan_group *vlgrp;u16 bd_number;u16 rx_buf_len; -atomic_t irq_sem;struct work_struct reset_task;/* TX */
@@ -244,6 +243,7 @@ extern const char ixgbe_driver_version[];extern int ixgbe_up (struct ixgbe_adapter *adapter);extern void ixgbe_down (struct ixgbe_adapter *adapter); +extern void ixgbe_reinit_locked (struct ixgbe_adapter *adapter);extern void ixgbe_reset (struct ixgbe_adapter *adapter);extern void ixgbe_update_stats (struct ixgbe_adapter *adapter);extern void ixgbe_set_ethtool_ops (struct net_device *netdev);
drivers/net/ixgbe/ixgbe_ethtool.c +13 -16
@@ -179,12 +179,10 @@ static int ixgbe_set_pauseparam(struct net_device *netdev, hw->fc.original_type = hw->fc.type; -if (netif_running (adapter->netdev)) { -ixgbe_down (adapter); -ixgbe_up (adapter); - }else { +if (netif_running (netdev)) +ixgbe_reinit_locked (adapter); +else ixgbe_reset (adapter); - }return 0 ; }
@@ -203,12 +201,10 @@ static int ixgbe_set_rx_csum(struct net_device *netdev, u32 data)else adapter->flags &= ~IXGBE_FLAG_RX_CSUM_ENABLED ; -if (netif_running (netdev)) { -ixgbe_down (adapter); -ixgbe_up (adapter); - }else { +if (netif_running (netdev)) +ixgbe_reinit_locked (adapter); +else ixgbe_reset (adapter); - }return 0 ; }
@@ -662,7 +658,10 @@ static int ixgbe_set_ringparam(struct net_device *netdev,return 0 ; } -if (netif_running (adapter->netdev)) +while (test_and_set_bit (__IXGBE_RESETTING, &adapter->state)) +msleep (1 ); + +if (netif_running (netdev))ixgbe_down (adapter);/*
@@ -733,6 +732,7 @@ err_setup:if (netif_running (adapter->netdev))ixgbe_up (adapter); +clear_bit (__IXGBE_RESETTING, &adapter->state);return err; }
@@ -820,11 +820,8 @@ static int ixgbe_nway_reset(struct net_device *netdev) {struct ixgbe_adapter *adapter =netdev_priv (netdev); -if (netif_running (netdev)) { -ixgbe_down (adapter); -ixgbe_reset (adapter); -ixgbe_up (adapter); - } +if (netif_running (netdev)) +ixgbe_reinit_locked (adapter);return 0 ; }
drivers/net/ixgbe/ixgbe_main.c +35 -25
139 lines not on this page · raw message
PATCH 2/8 ixbge: remove TX lock and redo TX accounting.
From: Ayyappan Veeraiyan <[email protected]>
This ports Herbert Xu's "maybe_stop_tx" code and removes the tx_lock which is not needed.
---
drivers/net/ixgbe/ixgbe.h | 2 - drivers/net/ixgbe/ixgbe_main.c | 110 ++++++++++++++++++++++++++++------------ 2 files changed, 76 insertions(+), 36 deletions(-)
drivers/net/ixgbe/ixgbe.h +0 -2
@@ -136,8 +136,6 @@ struct ixgbe_ring {u16 head;u16 tail; -/* To protect race between sender and clean_tx_irq */ -spinlock_t tx_lock;struct ixgbe_queue_stats stats;
drivers/net/ixgbe/ixgbe_main.c +76 -34
189 lines not on this page · raw message
PATCH 3/8 ixbge: Make ethtool code account for media types
In reply to Auke KokFrom: Ayyappan Veeraiyan <[email protected]>
The i82598 can support various media types but this ethtool code only was coded for fiber just yet.
---
drivers/net/ixgbe/ixgbe_ethtool.c | 52 ++++++++++++++++++++++++++----------- 1 files changed, 36 insertions(+), 16 deletions(-)
drivers/net/ixgbe/ixgbe_ethtool.c +36 -16
@@ -103,21 +103,41 @@ static int ixgbe_get_settings(struct net_device *netdev, struct ethtool_cmd *ecmd) {struct ixgbe_adapter *adapter =netdev_priv (netdev); +struct ixgbe_hw *hw = &adapter->hw; +u32 link_speed =0 ; +bool link_up; - ecmd->supported = (SUPPORTED_10000baseT_Full |SUPPORTED_FIBRE ); - ecmd->advertising = (ADVERTISED_10000baseT_Full |ADVERTISED_FIBRE ); - ecmd->port =PORT_FIBRE ; + ecmd->supported = SUPPORTED_10000baseT_Full; + ecmd->autoneg =AUTONEG_ENABLE ; ecmd->transceiver =XCVR_EXTERNAL ; +if (hw->phy.media_type == ixgbe_media_type_copper) { + ecmd->supported |= (SUPPORTED_1000baseT_Full | +SUPPORTED_TP | SUPPORTED_Autoneg); + + ecmd->advertising = (ADVERTISED_TP | ADVERTISED_Autoneg); +if (hw->phy.autoneg_advertised &IXGBE_LINK_SPEED_10GB_FULL ) + ecmd->advertising |= ADVERTISED_10000baseT_Full; +if (hw->phy.autoneg_advertised &IXGBE_LINK_SPEED_1GB_FULL ) + ecmd->advertising |= ADVERTISED_1000baseT_Full; + + ecmd->port =PORT_TP ; + }else { + ecmd->supported |=SUPPORTED_FIBRE ; + ecmd->advertising = (ADVERTISED_10000baseT_Full | +ADVERTISED_FIBRE ); + ecmd->port =PORT_FIBRE ; + } -if (netif_carrier_ok (adapter->netdev)) { - ecmd->speed =SPEED_10000 ; + adapter->hw.mac.ops.check_link (hw, &(link_speed), &link_up); +if (link_up) { + ecmd->speed = (link_speed ==IXGBE_LINK_SPEED_10GB_FULL ) ? +SPEED_10000 :SPEED_1000 ; ecmd->duplex =DUPLEX_FULL ; }else { ecmd->speed =-1 ; ecmd->duplex =-1 ; } - ecmd->autoneg =AUTONEG_DISABLE ;return 0 ; }
@@ -125,17 +145,17 @@ static int ixgbe_set_settings(struct net_device *netdev, struct ethtool_cmd *ecmd) {struct ixgbe_adapter *adapter =netdev_priv (netdev); +struct ixgbe_hw *hw = &adapter->hw; -if (ecmd->autoneg ==AUTONEG_ENABLE || - ecmd->speed + ecmd->duplex !=SPEED_10000 +DUPLEX_FULL ) -return -EINVAL ; - -if (netif_running (adapter->netdev)) { -ixgbe_down (adapter); -ixgbe_reset (adapter); -ixgbe_up (adapter); - }else { -ixgbe_reset (adapter); +switch (hw->phy.media_type) { +case ixgbe_media_type_fiber: +if ((ecmd->autoneg ==AUTONEG_ENABLE ) || + (ecmd->speed + ecmd->duplex !=SPEED_10000 +DUPLEX_FULL )) +return -EINVAL ; +/* in this case we currently only support 10Gb/FULL */ +break ; +default : +break ; }return 0 ;
PATCH 4/8 ixgbe: Fix pause code for ethtool
In reply to Auke KokFrom: Ayyappan Veeraiyan <[email protected]>
---
drivers/net/ixgbe/ixgbe_ethtool.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-)
drivers/net/ixgbe/ixgbe_ethtool.c +5 -5
@@ -167,7 +167,7 @@ static void ixgbe_get_pauseparam(struct net_device *netdev,struct ixgbe_adapter *adapter =netdev_priv (netdev);struct ixgbe_hw *hw = &adapter->hw; - pause->autoneg =AUTONEG_DISABLE ; + pause->autoneg = (hw->fc.type == ixgbe_fc_full ?1 :0 );if (hw->fc.type == ixgbe_fc_rx_pause) { pause->rx_pause =1 ;
@@ -185,10 +185,8 @@ static int ixgbe_set_pauseparam(struct net_device *netdev,struct ixgbe_adapter *adapter =netdev_priv (netdev);struct ixgbe_hw *hw = &adapter->hw; -if (pause->autoneg ==AUTONEG_ENABLE ) -return -EINVAL ; - -if (pause->rx_pause && pause->tx_pause) +if ((pause->autoneg ==AUTONEG_ENABLE ) || + (pause->rx_pause && pause->tx_pause)) hw->fc.type = ixgbe_fc_full;else if (pause->rx_pause && !pause->tx_pause) hw->fc.type = ixgbe_fc_rx_pause;
@@ -196,6 +194,8 @@ static int ixgbe_set_pauseparam(struct net_device *netdev, hw->fc.type = ixgbe_fc_tx_pause; else if (!pause->rx_pause && !pause->tx_pause) hw->fc.type = ixgbe_fc_none; + else + return -EINVAL; hw->fc.original_type = hw->fc.type;
PATCH 5/8 ixgbe: Fix FW init/release, make this code a function
In reply to Auke KokFrom: Ayyappan Veeraiyan <[email protected]>
A gap was left in the FW release/grab code in up/down path. Fix it by making the release/grab code a function and calling it in appropriate locations.
---
drivers/net/ixgbe/ixgbe_main.c | 38 ++++++++++++++++++++++++++++---------- 1 files changed, 28 insertions(+), 10 deletions(-)
drivers/net/ixgbe/ixgbe_main.c +28 -10
@@ -87,6 +87,25 @@ MODULE_VERSION(DRV_VERSION);#define DEFAULT_DEBUG_LEVEL_SHIFT 3 +static void ixgbe_release_hw_control (struct ixgbe_adapter *adapter) +{ +u32 ctrl_ext; + +/* Let firmware take over control of h/w */ + ctrl_ext =IXGBE_READ_REG (&adapter->hw,IXGBE_CTRL_EXT ); +IXGBE_WRITE_REG (&adapter->hw,IXGBE_CTRL_EXT , + ctrl_ext & ~IXGBE_CTRL_EXT_DRV_LOAD ); +} + +static void ixgbe_get_hw_control (struct ixgbe_adapter *adapter) +{ +u32 ctrl_ext; + +/* Let firmware know the driver has taken over */ + ctrl_ext =IXGBE_READ_REG (&adapter->hw,IXGBE_CTRL_EXT ); +IXGBE_WRITE_REG (&adapter->hw,IXGBE_CTRL_EXT , + ctrl_ext |IXGBE_CTRL_EXT_DRV_LOAD ); +}#ifdef DEBUG /**
@@ -1204,6 +1223,8 @@ static int ixgbe_up_complete(struct ixgbe_adapter *adapter)u32 txdctl, rxdctl, mhadd;int max_frame = netdev->mtu +ETH_HLEN +ETH_FCS_LEN ; +ixgbe_get_hw_control (adapter); +if (adapter->flags & (IXGBE_FLAG_MSIX_ENABLED |IXGBE_FLAG_MSI_ENABLED )) {if (adapter->flags &IXGBE_FLAG_MSIX_ENABLED ) {
@@ -1490,6 +1511,8 @@ static int ixgbe_suspend(struct pci_dev *pdev, pm_message_t state)pci_enable_wake (pdev, PCI_D3hot,0 );pci_enable_wake (pdev, PCI_D3cold,0 ); +ixgbe_release_hw_control (adapter); +pci_disable_device (pdev);pci_set_power_state (pdev,pci_choose_state (pdev, state));
@@ -1891,14 +1914,8 @@ static int ixgbe_open(struct net_device *netdev) {struct ixgbe_adapter *adapter =netdev_priv (netdev);int err; -u32 ctrl_ext;u32 num_rx_queues = adapter->num_rx_queues; -/* Let firmware know the driver has taken over */ - ctrl_ext =IXGBE_READ_REG (&adapter->hw,IXGBE_CTRL_EXT ); -IXGBE_WRITE_REG (&adapter->hw,IXGBE_CTRL_EXT , - ctrl_ext |IXGBE_CTRL_EXT_DRV_LOAD ); - try_intr_reinit:/* allocate transmit descriptors */ err =ixgbe_setup_all_tx_resources (adapter);
@@ -1949,6 +1966,7 @@ try_intr_reinit:return 0 ; err_up: +ixgbe_release_hw_control (adapter);ixgbe_free_irq (adapter); err_req_irq:ixgbe_free_all_rx_resources (adapter);
@@ -1974,7 +1992,6 @@ err_setup_tx:static int ixgbe_close (struct net_device *netdev) {struct ixgbe_adapter *adapter =netdev_priv (netdev); -u32 ctrl_ext;ixgbe_down (adapter);ixgbe_free_irq (adapter);
@@ -1982,9 +1999,7 @@ static int ixgbe_close(struct net_device *netdev)ixgbe_free_all_tx_resources (adapter);ixgbe_free_all_rx_resources (adapter); - ctrl_ext =IXGBE_READ_REG (&adapter->hw,IXGBE_CTRL_EXT ); -IXGBE_WRITE_REG (&adapter->hw,IXGBE_CTRL_EXT , - ctrl_ext & ~IXGBE_CTRL_EXT_DRV_LOAD ); +ixgbe_release_hw_control (adapter);return 0 ; }
@@ -2749,6 +2764,7 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev,return 0 ; err_register: +ixgbe_release_hw_control (adapter); err_hw_init: err_sw_init: err_eeprom:
@@ -2784,6 +2800,8 @@ static void __devexit ixgbe_remove(struct pci_dev *pdev)unregister_netdev (netdev); +ixgbe_release_hw_control (adapter); +kfree (adapter->tx_ring);kfree (adapter->rx_ring);
PATCH 6/8 ixgbe: properly return CHECKSUM_NONE, cleanup csum code
In reply to Auke KokFrom: Ayyappan Veeraiyan <[email protected]>
We were not returning CHECKSUM_NONE in a lot of cases which is wrong. Move common exit points in this function and error code up before the actual work in this function.
---
drivers/net/ixgbe/ixgbe_main.c | 29 ++++++++++++++++++++++------- 1 files changed, 22 insertions(+), 7 deletions(-)
drivers/net/ixgbe/ixgbe_main.c +22 -7
@@ -304,25 +304,40 @@ static void ixgbe_receive_skb(struct ixgbe_adapter *adapter, } } +/** +* ixgbe_rx_checksum - indicate in skb if hw indicated a good cksum +* @adapter: address of board private structure +* @status_err: hardware indication of status of receive +* @skb: skb currently being received and modified +**/ static inline void ixgbe_rx_checksum (struct ixgbe_adapter *adapter,u32 status_err,struct sk_buff *skb) { skb->ip_summed =CHECKSUM_NONE ; -/* Ignore Checksum bit is set */ +/* Ignore Checksum bit is set, or rx csum disabled */ if ((status_err &IXGBE_RXD_STAT_IXSM ) || - !(adapter->flags &IXGBE_FLAG_RX_CSUM_ENABLED )) + !(adapter->flags &IXGBE_FLAG_RX_CSUM_ENABLED ))return ; -/* TCP/UDP checksum error bit is set */ -if (status_err & (IXGBE_RXDADV_ERR_TCPE |IXGBE_RXDADV_ERR_IPE )) { -/* let the stack verify checksum errors */ + +/* if IP and error */ +if ((status_err &IXGBE_RXD_STAT_IPCS ) && + (status_err &IXGBE_RXDADV_ERR_IPE )) { adapter->hw_csum_rx_error++;return ; } + +if (!(status_err &IXGBE_RXD_STAT_L4CS )) +return ; + +if (status_err &IXGBE_RXDADV_ERR_TCPE ) { + adapter->hw_csum_rx_error++; +return ; + } +/* It must be a TCP or UDP packet with a valid checksum */ -if (status_err & (IXGBE_RXD_STAT_L4CS |IXGBE_RXD_STAT_UDPCS )) - skb->ip_summed =CHECKSUM_UNNECESSARY ; + skb->ip_summed =CHECKSUM_UNNECESSARY ; adapter->hw_csum_rx_good++; }
PATCH 7/8 ixgbe: fix several counter register errata
In reply to Auke KokFrom: Ayyappan Veeraiyan <[email protected]>
Several counters behave differently on 82598 causing them to display incorrect values. Adjust the accounting so the reported numbers make sense and do not double count or represent the wrong item.
---
drivers/net/ixgbe/ixgbe_main.c | 53 +++++++++++++++++++++++----------------- 1 files changed, 31 insertions(+), 22 deletions(-)
drivers/net/ixgbe/ixgbe_main.c +31 -22
@@ -2026,22 +2026,26 @@ static int ixgbe_close(struct net_device *netdev)void ixgbe_update_stats (struct ixgbe_adapter *adapter) {struct ixgbe_hw *hw = &adapter->hw; -u64 good_rx, missed_rx, bprc; +u64 total_mpc =0 ; +u32 i, missed_rx =0 , mpc, bprc, lxon, lxoff, xon_off_tot; adapter->stats.crcerrs +=IXGBE_READ_REG (hw,IXGBE_CRCERRS ); - good_rx =IXGBE_READ_REG (hw,IXGBE_GPRC ); - missed_rx =IXGBE_READ_REG (hw,IXGBE_MPC (0 )); - missed_rx +=IXGBE_READ_REG (hw,IXGBE_MPC (1 )); - missed_rx +=IXGBE_READ_REG (hw,IXGBE_MPC (2 )); - missed_rx +=IXGBE_READ_REG (hw,IXGBE_MPC (3 )); - missed_rx +=IXGBE_READ_REG (hw,IXGBE_MPC (4 )); - missed_rx +=IXGBE_READ_REG (hw,IXGBE_MPC (5 )); - missed_rx +=IXGBE_READ_REG (hw,IXGBE_MPC (6 )); - missed_rx +=IXGBE_READ_REG (hw,IXGBE_MPC (7 )); - adapter->stats.gprc += (good_rx - missed_rx); - - adapter->stats.mpc[0 ] += missed_rx; +for (i =0 ; i <8 ; i++) { +/* for packet buffers not used, the register should read 0 */ + mpc =IXGBE_READ_REG (hw,IXGBE_MPC (i)); + missed_rx += mpc; + adapter->stats.mpc[i] += mpc; + total_mpc += adapter->stats.mpc[i]; + adapter->stats.rnbc[i] +=IXGBE_READ_REG (hw,IXGBE_RNBC (i)); + } + adapter->stats.gprc +=IXGBE_READ_REG (hw,IXGBE_GPRC ); +/* work around hardware counting issue */ + adapter->stats.gprc -= missed_rx; + +/* 82598 hardware only has a 32 bit counter in the high register */ adapter->stats.gorc +=IXGBE_READ_REG (hw,IXGBE_GORCH ); + adapter->stats.gotc +=IXGBE_READ_REG (hw,IXGBE_GOTCH ); + adapter->stats.tor +=IXGBE_READ_REG (hw,IXGBE_TORH ); bprc =IXGBE_READ_REG (hw,IXGBE_BPRC ); adapter->stats.bprc += bprc; adapter->stats.mprc +=IXGBE_READ_REG (hw,IXGBE_MPRC );
@@ -2053,28 +2057,34 @@ void ixgbe_update_stats(struct ixgbe_adapter *adapter) adapter->stats.prc511 +=IXGBE_READ_REG (hw,IXGBE_PRC511 ); adapter->stats.prc1023 +=IXGBE_READ_REG (hw,IXGBE_PRC1023 ); adapter->stats.prc1522 +=IXGBE_READ_REG (hw,IXGBE_PRC1522 ); - adapter->stats.rlec +=IXGBE_READ_REG (hw,IXGBE_RLEC ); adapter->stats.lxonrxc +=IXGBE_READ_REG (hw,IXGBE_LXONRXC ); - adapter->stats.lxontxc +=IXGBE_READ_REG (hw,IXGBE_LXONTXC ); adapter->stats.lxoffrxc +=IXGBE_READ_REG (hw,IXGBE_LXOFFRXC ); - adapter->stats.lxofftxc +=IXGBE_READ_REG (hw,IXGBE_LXOFFTXC ); + lxon =IXGBE_READ_REG (hw,IXGBE_LXONTXC ); + adapter->stats.lxontxc += lxon; + lxoff =IXGBE_READ_REG (hw,IXGBE_LXOFFTXC ); + adapter->stats.lxofftxc += lxoff; adapter->stats.ruc +=IXGBE_READ_REG (hw,IXGBE_RUC ); adapter->stats.gptc +=IXGBE_READ_REG (hw,IXGBE_GPTC ); - adapter->stats.gotc +=IXGBE_READ_REG (hw,IXGBE_GOTCH ); - adapter->stats.rnbc[0 ] +=IXGBE_READ_REG (hw,IXGBE_RNBC (0 )); + adapter->stats.mptc +=IXGBE_READ_REG (hw,IXGBE_MPTC ); +/* +* 82598 errata - tx of flow control packets is included in tx counters +*/ + xon_off_tot = lxon + lxoff; + adapter->stats.gptc -= xon_off_tot; + adapter->stats.mptc -= xon_off_tot; + adapter->stats.gotc -= (xon_off_tot * (ETH_ZLEN +ETH_FCS_LEN )); adapter->stats.ruc +=IXGBE_READ_REG (hw,IXGBE_RUC ); adapter->stats.rfc +=IXGBE_READ_REG (hw,IXGBE_RFC ); adapter->stats.rjc +=IXGBE_READ_REG (hw,IXGBE_RJC ); - adapter->stats.tor +=IXGBE_READ_REG (hw,IXGBE_TORH ); adapter->stats.tpr +=IXGBE_READ_REG (hw,IXGBE_TPR ); adapter->stats.ptc64 +=IXGBE_READ_REG (hw,IXGBE_PTC64 ); + adapter->stats.ptc64 -= xon_off_tot; adapter->stats.ptc127 +=IXGBE_READ_REG (hw,IXGBE_PTC127 ); adapter->stats.ptc255 +=IXGBE_READ_REG (hw,IXGBE_PTC255 ); adapter->stats.ptc511 +=IXGBE_READ_REG (hw,IXGBE_PTC511 ); adapter->stats.ptc1023 +=IXGBE_READ_REG (hw,IXGBE_PTC1023 ); adapter->stats.ptc1522 +=IXGBE_READ_REG (hw,IXGBE_PTC1522 ); - adapter->stats.mptc +=IXGBE_READ_REG (hw,IXGBE_MPTC ); adapter->stats.bptc +=IXGBE_READ_REG (hw,IXGBE_BPTC );/* Fill out the OS statistics structure */
@@ -2090,8 +2100,7 @@ void ixgbe_update_stats(struct ixgbe_adapter *adapter) adapter->net_stats.rx_dropped =0 ; adapter->net_stats.rx_length_errors = adapter->stats.rlec; adapter->net_stats.rx_crc_errors = adapter->stats.crcerrs; - adapter->net_stats.rx_missed_errors = adapter->stats.mpc[0 ]; - + adapter->net_stats.rx_missed_errors = total_mpc; }/**
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
PATCH 8/8 ixgbe: add real-time traffic counters
In reply to Auke KokFrom: Ayyappan Veeraiyan <[email protected]>
Just like our other drivers before we can switch ixgbe to provide real-time packet/byte counters to the stack easily.
---
drivers/net/ixgbe/ixgbe_main.c | 15 +++++++++++---- 1 files changed, 11 insertions(+), 4 deletions(-)
drivers/net/ixgbe/ixgbe_main.c +11 -4
@@ -275,6 +275,8 @@ static bool ixgbe_clean_tx_irq(struct ixgbe_adapter *adapter,if (total_tx_packets >= tx_ring->work_limit)IXGBE_WRITE_REG (&adapter->hw,IXGBE_EICS , tx_ring->eims_value); + adapter->net_stats.tx_bytes += total_tx_bytes; + adapter->net_stats.tx_packets += total_tx_packets; cleaned = total_tx_packets ? true : false;return cleaned; }
@@ -443,6 +445,7 @@ static bool ixgbe_clean_rx_irq(struct ixgbe_adapter *adapter,u16 hdr_info, vlan_tag;bool is_vlan, cleaned = false;int cleaned_count =0 ; +unsigned int total_rx_bytes =0 , total_rx_packets =0 ; i = rx_ring->next_to_clean; upper_len =0 ;
@@ -522,6 +525,11 @@ static bool ixgbe_clean_rx_irq(struct ixgbe_adapter *adapter, }ixgbe_rx_checksum (adapter, staterr, skb); + +/* probably a little skewed due to removing CRC */ + total_rx_bytes += skb->len; + total_rx_packets++; + skb->protocol =eth_type_trans (skb, netdev);ixgbe_receive_skb (adapter, skb, is_vlan, vlan_tag); netdev->last_rx = jiffies;
@@ -550,6 +558,9 @@ next_desc:if (cleaned_count)ixgbe_alloc_rx_buffers (adapter, rx_ring, cleaned_count); + adapter->net_stats.rx_bytes += total_rx_bytes; + adapter->net_stats.rx_packets += total_rx_packets; +return cleaned; }
@@ -2088,10 +2099,6 @@ void ixgbe_update_stats(struct ixgbe_adapter *adapter) adapter->stats.bptc +=IXGBE_READ_REG (hw,IXGBE_BPTC );/* Fill out the OS statistics structure */ - adapter->net_stats.rx_packets = adapter->stats.gprc; - adapter->net_stats.tx_packets = adapter->stats.gptc; - adapter->net_stats.rx_bytes = adapter->stats.gorc; - adapter->net_stats.tx_bytes = adapter->stats.gotc; adapter->net_stats.multicast = adapter->stats.mprc;/* Rx Errors */
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
Re: [PATCH 8/8] ixgbe: add real-time traffic counters
Quoted 11 lines · Auke Kok
From: Ayyappan Veeraiyan <[email protected]>
Just like our other drivers before we can switch ixgbe to provide real-time packet/byte counters to the stack easily.
Signed-off-by Ayyappan Veeraiyan <[email protected]>Signed-off-by Auke Kok <[email protected]>---
drivers/net/ixgbe/ixgbe_main.c | 15 +++++++++++---- 1 files changed, 11 insertions(+), 4 deletions(-)
applied 1-8
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/