ixgbe: Fix TX stats accounting
Subsystems (2)
PATCH 1/2 ixgbe: Fix TX stats accounting
From: Eric Dumazet <[email protected]>
Here is an updated version, because ixgbe_get_ethtool_stats() needs to call dev_get_stats() or "ethtool -S" wont give correct tx_bytes/tx_packets values.
Several cpus can update netdev->stats.tx_bytes & netdev->stats.tx_packets in parallel. In this case, TX stats are under estimated and false sharing takes place.
After a pktgen session sending exactly 200000000 packets :
# ifconfig fiber0 | grep TX
TX packets:198501982 errors:0 dropped:0 overruns:0 carrier:0Multi queue devices should instead use txq->tx_bytes & txq->tx_packets in their xmit() method (appropriate txq lock already held by caller, no cache line miss), or use appropriate locking.
After patch, same pktgen session gives :
# ifconfig fiber0 | grep TX
TX packets:200000000 errors:0 dropped:0 overruns:0 carrier:0---
drivers/net/ixgbe/ixgbe_ethtool.c | 1 + drivers/net/ixgbe/ixgbe_main.c | 20 ++++---------------- 2 files changed, 5 insertions(+), 16 deletions(-)
drivers/net/ixgbe/ixgbe_ethtool.c +1 -0
@@ -990,6 +990,7 @@ static void ixgbe_get_ethtool_stats(struct net_device *netdev,char *p =NULL ;ixgbe_update_stats (adapter); +dev_get_stats (netdev);for (i =0 ; i <IXGBE_GLOBAL_STATS_LEN ; i++) {switch (ixgbe_gstrings_stats[i].type) {case NETDEV_STATS :
drivers/net/ixgbe/ixgbe_main.c +4 -16
@@ -435,8 +435,6 @@ static bool ixgbe_clean_tx_irq(struct ixgbe_q_vector *q_vector, tx_ring->total_packets += total_packets; tx_ring->stats.packets += total_packets; tx_ring->stats.bytes += total_bytes; - netdev->stats.tx_bytes += total_bytes; - netdev->stats.tx_packets += total_packets;return (count < tx_ring->work_limit); }
@@ -5327,6 +5325,7 @@ static netdev_tx_t ixgbe_xmit_frame(struct sk_buff *skb, {struct ixgbe_adapter *adapter =netdev_priv (netdev);struct ixgbe_ring *tx_ring; +struct netdev_queue *txq;unsigned int first;unsigned int tx_flags =0 ;u8 hdr_len =0 ;
@@ -5424,6 +5423,9 @@ static netdev_tx_t ixgbe_xmit_frame(struct sk_buff *skb, tx_ring->atr_count =0 ; } } + txq =netdev_get_tx_queue (netdev, tx_ring->queue_index); + txq->tx_bytes += skb->len; + txq->tx_packets++;ixgbe_tx_queue (adapter, tx_ring, tx_flags, count, skb->len, hdr_len);ixgbe_maybe_stop_tx (netdev, tx_ring,DESC_NEEDED );
@@ -5438,19 +5440,6 @@ static netdev_tx_t ixgbe_xmit_frame(struct sk_buff *skb, }/** -* ixgbe_get_stats - Get System Network Statistics -* @netdev: network interface device structure -* -* Returns the address of the device statistics structure. -* The statistics are actually updated from the timer callback. -**/ -static struct net_device_stats *ixgbe_get_stats (struct net_device *netdev) -{ -/* only return the current stats */ -return &netdev->stats; -} - -/** * ixgbe_set_mac - Change the Ethernet Address of the NIC * @netdev: network interface device structure * @p: pointer to an address structure
@@ -5580,7 +5569,6 @@ static const struct net_device_ops ixgbe_netdev_ops = { .ndo_stop = ixgbe_close, .ndo_start_xmit = ixgbe_xmit_frame, .ndo_select_queue = ixgbe_select_queue, - .ndo_get_stats = ixgbe_get_stats, .ndo_set_rx_mode = ixgbe_set_rx_mode, .ndo_set_multicast_list = ixgbe_set_rx_mode, .ndo_validate_addr = eth_validate_addr,
PATCH 2/2 ixgbe: add support for 82599 KR device 0x1517
From: Don Skidmore <[email protected]>
---
drivers/net/ixgbe/ixgbe_82599.c | 1 + drivers/net/ixgbe/ixgbe_main.c | 2 ++ drivers/net/ixgbe/ixgbe_type.h | 1 + 3 files changed, 4 insertions(+), 0 deletions(-)
drivers/net/ixgbe/ixgbe_82599.c +1 -0
@@ -342,6 +342,7 @@ static enum ixgbe_media_type ixgbe_get_media_type_82599(struct ixgbe_hw *hw)case IXGBE_DEV_ID_82599_KX4 :case IXGBE_DEV_ID_82599_KX4_MEZZ :case IXGBE_DEV_ID_82599_COMBO_BACKPLANE : +case IXGBE_DEV_ID_82599_KR :case IXGBE_DEV_ID_82599_XAUI_LOM :/* Default device ID is mezzanine card KX/KX4 */ media_type = ixgbe_media_type_backplane;
drivers/net/ixgbe/ixgbe_main.c +2 -0
@@ -96,6 +96,8 @@ static struct pci_device_id ixgbe_pci_tbl[] = { board_82599 }, {PCI_VDEVICE (INTEL ,IXGBE_DEV_ID_82599_XAUI_LOM ), board_82599 }, + {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82599_KR), + board_82599 }, {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82599_SFP), board_82599 }, {PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82599_SFP_EM),
drivers/net/ixgbe/ixgbe_type.h +1 -0
@@ -50,6 +50,7 @@#define IXGBE_DEV_ID_82598EB_XF_LR 0x10F4#define IXGBE_DEV_ID_82599_KX4 0x10F7#define IXGBE_DEV_ID_82599_KX4_MEZZ 0x1514 +#define IXGBE_DEV_ID_82599_KR 0x1517#define IXGBE_DEV_ID_82599_CX4 0x10F9#define IXGBE_DEV_ID_82599_SFP 0x10FB#define IXGBE_DEV_ID_82599_SFP_EM 0x1507
Re: [PATCH 2/2] ixgbe: add support for 82599 KR device 0x1517
From: Jeff Kirsher <[email protected]>
Date: Tue, 08 Dec 2009 09:22:23 -0800
Quoted 5 lines
From: Don Skidmore <[email protected]>
Signed-off-by Don Skidmore <[email protected]>Signed-off-by Jeff Kirsher <[email protected]>
Applied.
From: Jeff Kirsher <[email protected]>
Date: Tue, 08 Dec 2009 09:22:03 -0800
Quoted 19 lines
From: Eric Dumazet <[email protected]>
Here is an updated version, because
ixgbe_get_ethtool_stats()needs to calldev_get_stats()or "ethtool -S" wont give correct tx_bytes/tx_packets values.Several cpus can update
netdev->stats.tx_bytes&netdev->stats.tx_packetsin parallel. In this case, TX stats are under estimated and false sharing takes place.After a pktgen session sending exactly 200000000 packets :
# ifconfig fiber0 | grep TX TX packets:198501982 errors:0 dropped:0 overruns:0 carrier:0Multi queue devices should instead use
txq->tx_bytes&txq->tx_packetsin theirxmit()method (appropriate txq lock already held by caller, no cache line miss), or use appropriate locking.
Quoted 7 lines
After patch, same pktgen session gives :
# ifconfig fiber0 | grep TX TX packets:200000000 errors:0 dropped:0 overruns:0 carrier:0Signed-off-by Eric Dumazet <[email protected]>Signed-off-by Jeff Kirsher <[email protected]>
Applied.