ixgbe: update copyright info
Subsystems (2)
PATCH 1/3 ixgbe: update copyright info
From: Emil Tantilov <[email protected]>
Update copyright notice
---
drivers/net/ixgbe/ixgbe_mbx.c | 2 +- drivers/net/ixgbe/ixgbe_mbx.h | 2 +- drivers/net/ixgbe/ixgbe_sriov.c | 2 +- drivers/net/ixgbe/ixgbe_sriov.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-)
drivers/net/ixgbe/ixgbe_mbx.c +1 -1
@@ -1,7 +1,7 @@/******************************************************************************* Intel 10 Gigabit PCI Express Linux driver -Copyright(c) 1999 - 2009 Intel Corporation. +Copyright(c) 1999 - 2010 Intel Corporation. This program is free software; you can redistribute it and/or modify it under the terms and conditions of the GNU General Public License,
drivers/net/ixgbe/ixgbe_mbx.h +1 -1
@@ -1,7 +1,7 @@/******************************************************************************* Intel 10 Gigabit PCI Express Linux driver -Copyright(c) 1999 - 2009 Intel Corporation. +Copyright(c) 1999 - 2010 Intel Corporation. This program is free software; you can redistribute it and/or modify it under the terms and conditions of the GNU General Public License,
drivers/net/ixgbe/ixgbe_sriov.c +1 -1
@@ -1,7 +1,7 @@/******************************************************************************* Intel 10 Gigabit PCI Express Linux driver -Copyright(c) 1999 - 2009 Intel Corporation. +Copyright(c) 1999 - 2010 Intel Corporation. This program is free software; you can redistribute it and/or modify it under the terms and conditions of the GNU General Public License,
drivers/net/ixgbe/ixgbe_sriov.h +1 -1
@@ -1,7 +1,7 @@/******************************************************************************* Intel 10 Gigabit PCI Express Linux driver -Copyright(c) 1999 - 2009 Intel Corporation. +Copyright(c) 1999 - 2010 Intel Corporation. This program is free software; you can redistribute it and/or modify it under the terms and conditions of the GNU General Public License,
PATCH 2/3 ixgbe: fix stats handling
From: Eric Dumazet <[email protected]>
Current ixgbe stats have following problems :
- Not 64 bit safe (on 32bit arches)
- Not safe in ixgbe_clean_rx_irq() :
All cpus dirty a common location (netdev->stats.rx_bytes &netdev->stats.rx_packets) without proper synchronization.
This slow down a bit multiqueue operations, and possibly miss some
updates.
Fixes :
Implement ndo_get_stats64() method to provide accurate 64bit rx|tx bytes/packets counters, using 64bit safe infrastructure.
ixgbe_get_ethtool_stats() also use this infrastructure to provide 64bit safe counters.
---
drivers/net/ixgbe/ixgbe.h | 3 ++- drivers/net/ixgbe/ixgbe_ethtool.c | 29 ++++++++++++++++----------- drivers/net/ixgbe/ixgbe_main.c | 40 ++++++++++++++++++++++++++++++++++--- 3 files changed, 56 insertions(+), 16 deletions(-)
drivers/net/ixgbe/ixgbe.h +2 -1
@@ -180,8 +180,9 @@ struct ixgbe_ring {*/ struct ixgbe_queue_stats stats; -unsigned long reinit_state; +struct u64_stats_sync syncp;int numa_node; +unsigned long reinit_state;u64 rsc_count;/* stat for coalesced packets */ u64 rsc_flush;/* stats for flushed packets */ u32 restart_queue;/* track tx queue restarts */
drivers/net/ixgbe/ixgbe_ethtool.c +17 -12
@@ -999,12 +999,11 @@ static void ixgbe_get_ethtool_stats(struct net_device *netdev, struct ethtool_stats *stats, u64 *data) { struct ixgbe_adapter *adapter = netdev_priv(netdev); -u64 *queue_stat; -int stat_count =sizeof (struct ixgbe_queue_stats ) /sizeof (u64);struct rtnl_link_stats64 temp;const struct rtnl_link_stats64 *net_stats; -int j, k; -int i; +unsigned int start; +struct ixgbe_ring *ring; +int i, j;char *p =NULL ;ixgbe_update_stats (adapter);
@@ -1025,16 +1024,22 @@ static void ixgbe_get_ethtool_stats(struct net_device *netdev, sizeof(u64)) ? *(u64 *)p : *(u32 *)p; }for (j =0 ; j < adapter->num_tx_queues; j++) { - queue_stat = (u64 *)&adapter->tx_ring[j]->stats; -for (k =0 ; k < stat_count; k++) - data[i + k] = queue_stat[k]; - i += k; + ring = adapter->tx_ring[j]; +do { + start =u64_stats_fetch_begin_bh (&ring->syncp); + data[i] = ring->stats.packets; + data[i+1 ] = ring->stats.bytes; + }while (u64_stats_fetch_retry_bh (&ring->syncp, start)); + i +=2 ; }for (j =0 ; j < adapter->num_rx_queues; j++) { - queue_stat = (u64 *)&adapter->rx_ring[j]->stats; -for (k =0 ; k < stat_count; k++) - data[i + k] = queue_stat[k]; - i += k; + ring = adapter->rx_ring[j]; +do { + start =u64_stats_fetch_begin_bh (&ring->syncp); + data[i] = ring->stats.packets; + data[i+1 ] = ring->stats.bytes; + }while (u64_stats_fetch_retry_bh (&ring->syncp, start)); + i +=2 ; }if (adapter->flags &IXGBE_FLAG_DCB_ENABLED ) {for (j =0 ; j <MAX_TX_PACKET_BUFFERS ; j++) {
drivers/net/ixgbe/ixgbe_main.c +37 -3
@@ -824,8 +824,10 @@ static bool ixgbe_clean_tx_irq(struct ixgbe_q_vector *q_vector, tx_ring->total_bytes += total_bytes; tx_ring->total_packets += total_packets; +u64_stats_update_begin (&tx_ring->syncp); tx_ring->stats.packets += total_packets; tx_ring->stats.bytes += total_bytes; +u64_stats_update_end (&tx_ring->syncp);return count < tx_ring->work_limit; }
@@ -1172,7 +1174,6 @@ static bool ixgbe_clean_rx_irq(struct ixgbe_q_vector *q_vector, int *work_done, int work_to_do) {struct ixgbe_adapter *adapter = q_vector->adapter; -struct net_device *netdev = adapter->netdev;struct pci_dev *pdev = adapter->pdev;union ixgbe_adv_rx_desc *rx_desc, *next_rxd;struct ixgbe_rx_buffer *rx_buffer_info, *next_buffer;
@@ -1298,8 +1299,10 @@ static bool ixgbe_clean_rx_irq(struct ixgbe_q_vector *q_vector, rx_ring->rsc_count++; rx_ring->rsc_flush++; } +u64_stats_update_begin (&rx_ring->syncp); rx_ring->stats.packets++; rx_ring->stats.bytes += skb->len; +u64_stats_update_end (&rx_ring->syncp); }else {if (rx_ring->flags &IXGBE_RING_RX_PS_ENABLED ) { rx_buffer_info->skb = next_buffer->skb;
@@ -1375,8 +1378,6 @@ next_desc: rx_ring->total_packets += total_rx_packets; rx_ring->total_bytes += total_rx_bytes; - netdev->stats.rx_bytes += total_rx_bytes; - netdev->stats.rx_packets += total_rx_packets;return cleaned; }
@@ -6558,6 +6559,38 @@ static void ixgbe_netpoll(struct net_device *netdev) }#endif +static struct rtnl_link_stats64 *ixgbe_get_stats64 (struct net_device *netdev, +struct rtnl_link_stats64 *stats) +{ +struct ixgbe_adapter *adapter =netdev_priv (netdev); +int i; + +/* accurate rx/tx bytes/packets stats */ +dev_txq_stats_fold (netdev, stats); +for (i =0 ; i < adapter->num_rx_queues; i++) { +struct ixgbe_ring *ring = adapter->rx_ring[i]; +u64 bytes, packets; +unsigned int start; + +do { + start =u64_stats_fetch_begin_bh (&ring->syncp); + packets = ring->stats.packets; + bytes = ring->stats.bytes; + }while (u64_stats_fetch_retry_bh (&ring->syncp, start)); + stats->rx_packets += packets; + stats->rx_bytes += bytes; + } + +/* following stats updated by ixgbe_watchdog_task() */ + stats->multicast = netdev->stats.multicast; + stats->rx_errors = netdev->stats.rx_errors; + stats->rx_length_errors = netdev->stats.rx_length_errors; + stats->rx_crc_errors = netdev->stats.rx_crc_errors; + stats->rx_missed_errors = netdev->stats.rx_missed_errors; +return stats; +} + +static const struct net_device_ops ixgbe_netdev_ops = { .ndo_open = ixgbe_open, .ndo_stop = ixgbe_close,
@@ -6577,6 +6610,7 @@ static const struct net_device_ops ixgbe_netdev_ops = { .ndo_set_vf_vlan = ixgbe_ndo_set_vf_vlan, .ndo_set_vf_tx_rate = ixgbe_ndo_set_vf_bw, .ndo_get_vf_config = ixgbe_ndo_get_vf_config, + .ndo_get_stats64 = ixgbe_get_stats64,#ifdef CONFIG_NET_POLL_CONTROLLER .ndo_poll_controller = ixgbe_netpoll,#endif
Re: [net-next-2.6 PATCH 2/3] ixgbe: fix stats handling
From: Jeff Kirsher <[email protected]>
Date: Thu, 21 Oct 2010 02:00:04 -0700
Quoted 17 lines
From: Eric Dumazet <[email protected]>
Current ixgbe stats have following problems :
- Not 64 bit safe (on 32bit arches)
- Not safe in
ixgbe_clean_rx_irq():
All cpus dirty a common location (netdev->stats.rx_bytes&netdev->stats.rx_packets) without proper synchronization.
This slow down a bit multiqueue operations, and possibly miss some
updates.Fixes :
Implement
ndo_get_stats64()method to provide accurate 64bit rx|tx bytes/packets counters, using 64bit safe infrastructure.
Quoted 7 lines
ixgbe_get_ethtool_stats()also use this infrastructure to provide 64bit safe counters.Signed-off-by Eric Dumazet <[email protected]>Acked-by Don Skidmore <[email protected]>Tested-by Stephen Ko <[email protected]>Signed-off-by Jeff Kirsher <[email protected]>
Applied.
PATCH 3/3 ixgbe: add a refcnt when turning on/off FCoE offload capability
In reply to Jeff KirsherFrom: Yi Zou <[email protected]>
The FCoE offload is enabled/disabled per adapter, but upper FCoE protocol stack could have multiple FCoE instances created on the same physical network interface, e.g., FCoE on multiple VLAN interfaces on the same physical network interface. In this case we want to turn on FCoE offload at the first request from ndo_fcoe_enable() but only turn off FCoE offload at the very last call to ndo_fcoe_disable(). This is fixed by adding a refcnt in the per adapter FCoE structure and tear down FCoE offload when refcnt decrements to zero.
---
drivers/net/ixgbe/ixgbe_fcoe.c | 6 ++++++ drivers/net/ixgbe/ixgbe_fcoe.h | 1 + 2 files changed, 7 insertions(+), 0 deletions(-)
drivers/net/ixgbe/ixgbe_fcoe.c +6 -0
@@ -604,11 +604,13 @@ int ixgbe_fcoe_enable(struct net_device *netdev) {int rc = -EINVAL ;struct ixgbe_adapter *adapter =netdev_priv (netdev); +struct ixgbe_fcoe *fcoe = &adapter->fcoe;if (!(adapter->flags &IXGBE_FLAG_FCOE_CAPABLE )) goto out_enable; +atomic_inc (&fcoe->refcnt);if (adapter->flags &IXGBE_FLAG_FCOE_ENABLED ) goto out_enable;
@@ -648,6 +650,7 @@ int ixgbe_fcoe_disable(struct net_device *netdev) {int rc = -EINVAL ;struct ixgbe_adapter *adapter =netdev_priv (netdev); +struct ixgbe_fcoe *fcoe = &adapter->fcoe;if (!(adapter->flags &IXGBE_FLAG_FCOE_CAPABLE )) goto out_disable;
@@ -655,6 +658,9 @@ int ixgbe_fcoe_disable(struct net_device *netdev)if (!(adapter->flags &IXGBE_FLAG_FCOE_ENABLED )) goto out_disable; +if (!atomic_dec_and_test (&fcoe->refcnt)) + goto out_disable; +e_info (drv,"Disabling FCoE offload features.\n" ); netdev->features &= ~NETIF_F_FCOE_CRC ; netdev->features &= ~NETIF_F_FSO ;
drivers/net/ixgbe/ixgbe_fcoe.h +1 -0
@@ -66,6 +66,7 @@ struct ixgbe_fcoe {u8 tc;u8 up;#endif +atomic_t refcnt;spinlock_t lock;struct pci_pool *pool;struct ixgbe_fcoe_ddp ddp[IXGBE_FCOE_DDP_MAX ];
Re: [net-next-2.6 PATCH 3/3] ixgbe: add a refcnt when turning on/off FCoE offload capability
From: Jeff Kirsher <[email protected]>
Date: Thu, 21 Oct 2010 02:00:30 -0700
Quoted 10 lines
From: Yi Zou <[email protected]>
The FCoE offload is enabled/disabled per adapter, but upper FCoE protocol stack could have multiple FCoE instances created on the same physical network interface, e.g., FCoE on multiple VLAN interfaces on the same physical network interface. In this case we want to turn on FCoE offload at the first request from
ndo_fcoe_enable()but only turn off FCoE offload at the very last call tondo_fcoe_disable(). This is fixed by adding a refcnt in the per adapter FCoE structure and tear down FCoE offload when refcnt decrements to zero.
Quoted 3 lines
Signed-off-by Yi Zou <[email protected]>Tested-by Ross Brattain <[email protected]>Signed-off-by Jeff Kirsher <[email protected]>
Applied.
From: Jeff Kirsher <[email protected]>
Date: Thu, 21 Oct 2010 01:59:40 -0700
Quoted 6 lines
From: Emil Tantilov <[email protected]>
Update copyright notice
Signed-off-by Emil Tantilov <[email protected]>Signed-off-by Jeff Kirsher <[email protected]>
Applied.