sfc: Split MAC stats DMA initiation and completion
Subsystems (2)
PATCH 11/16 sfc: Split MAC stats DMA initiation and completion
From: Steve Hodgson <[email protected]>
Currently we initiate MAC stats DMA and busy-wait for completion when stats are requested. We can improve on this with a periodic timer to initiate and poll for stats, and opportunistically poll when stats are requested.
Since efx_nic::stats_disable_count and efx_stats_{disable,enable}() are Falcon-specific, rename them and move them accordingly.
Signed-off-by Ben Hutchings <[email protected]>
--- drivers/net/sfc/efx.c | 48 ++++---------- drivers/net/sfc/efx.h | 2 - drivers/net/sfc/falcon.c | 131 ++++++++++++++++++++++++++++++--------- drivers/net/sfc/falcon.h | 12 +++- drivers/net/sfc/falcon_boards.c | 10 ++-- drivers/net/sfc/falcon_gmac.c | 5 -- drivers/net/sfc/falcon_xmac.c | 13 +++-- drivers/net/sfc/net_driver.h | 2 - drivers/net/sfc/tenxpress.c | 4 +- 9 files changed, 139 insertions(+), 88 deletions(-)
drivers/net/sfc/efx.c +13 -35
@@ -637,6 +637,7 @@ void __efx_reconfigure_port(struct efx_nic *efx)netif_addr_unlock_bh (efx->net_dev); } +falcon_stop_nic_stats (efx);falcon_deconfigure_mac_wrapper (efx);/* Reconfigure the PHY, disabling transmit in mac level loopback. */
@@ -651,6 +652,8 @@ void __efx_reconfigure_port(struct efx_nic *efx) efx->mac_op->reconfigure (efx); +falcon_start_nic_stats (efx); +/* Inform kernel of loss/gain of carrier */ efx_link_status_changed (efx);return ;
@@ -749,7 +752,6 @@ static int efx_init_port(struct efx_nic *efx) efx->mac_op->reconfigure (efx); efx->port_initialized = true; -efx_stats_enable (efx);mutex_unlock (&efx->mac_lock);return 0 ;
@@ -802,7 +804,6 @@ static void efx_fini_port(struct efx_nic *efx)if (!efx->port_initialized)return ; -efx_stats_disable (efx); efx->phy_op->fini (efx); efx->port_initialized = false;
@@ -1158,6 +1159,8 @@ static void efx_start_all(struct efx_nic *efx)if (efx->state ==STATE_RUNNING )queue_delayed_work (efx->workqueue, &efx->monitor_work, efx_monitor_interval); + +falcon_start_nic_stats (efx); }/* Flush all delayed work. Should only be called when no more delayed work
@@ -1195,6 +1198,8 @@ static void efx_stop_all(struct efx_nic *efx)if (!efx->port_enabled)return ; +falcon_stop_nic_stats (efx); +/* Disable interrupts and wait for ISR to complete */ falcon_disable_interrupts (efx);if (efx->legacy_irq)
@@ -1438,20 +1443,6 @@ static int efx_net_stop(struct net_device *net_dev)return 0 ; } -void efx_stats_disable (struct efx_nic *efx) -{ -spin_lock (&efx->stats_lock); - ++efx->stats_disable_count; -spin_unlock (&efx->stats_lock); -} - -void efx_stats_enable (struct efx_nic *efx) -{ -spin_lock (&efx->stats_lock); - --efx->stats_disable_count; -spin_unlock (&efx->stats_lock); -} -/* Context: process, dev_base_lock or RTNL held, non-blocking. */ static struct net_device_stats *efx_net_stats (struct net_device *net_dev) {
@@ -1459,17 +1450,9 @@ static struct net_device_stats *efx_net_stats(struct net_device *net_dev)struct efx_mac_stats *mac_stats = &efx->mac_stats;struct net_device_stats *stats = &net_dev->stats; -/* Update stats if possible, but do not wait if another thread -* is updating them or if MAC stats fetches are temporarily -* disabled; slightly stale stats are acceptable. -*/ -if (!spin_trylock (&efx->stats_lock)) -return stats; -if (!efx->stats_disable_count) { - efx->mac_op->update_stats (efx); -falcon_update_nic_stats (efx); - } -spin_unlock (&efx->stats_lock); +spin_lock_bh (&efx->stats_lock); +falcon_update_nic_stats (efx); +spin_unlock_bh (&efx->stats_lock); stats->rx_packets = mac_stats->rx_packets; stats->tx_packets = mac_stats->tx_packets;
@@ -1726,7 +1709,6 @@ void efx_reset_down(struct efx_nic *efx, enum reset_type method, {EFX_ASSERT_RESET_SERIALISED (efx); -efx_stats_disable (efx);efx_stop_all (efx);mutex_lock (&efx->mac_lock);mutex_lock (&efx->spi_lock);
@@ -1776,10 +1758,8 @@ int efx_reset_up(struct efx_nic *efx, enum reset_type method,mutex_unlock (&efx->spi_lock);mutex_unlock (&efx->mac_lock); -if (ok) { +if (ok)efx_start_all (efx); -efx_stats_enable (efx); - }return rc; }
@@ -1977,7 +1957,6 @@ static int efx_init_struct(struct efx_nic *efx, struct efx_nic_type *type, efx->rx_checksum_enabled = true;spin_lock_init (&efx->netif_stop_lock);spin_lock_init (&efx->stats_lock); - efx->stats_disable_count =1 ;mutex_init (&efx->mac_lock); efx->mac_op = &efx_dummy_mac_operations; efx->phy_op = &efx_dummy_phy_operations;
@@ -2219,9 +2198,8 @@ static int __devinit efx_pci_probe(struct pci_dev *pci_dev, goto fail4; } -/* Switch to the running state before we expose the device to -* the OS. This is to ensure that the initial gathering of -* MAC stats succeeds. */ +/* Switch to the running state before we expose the device to the OS, +* so that dev_open()|efx_start_all() will actually start the device */ efx->state =STATE_RUNNING ; rc =efx_register_netdev (efx);
drivers/net/sfc/efx.h +0 -2
@@ -60,8 +60,6 @@ extern void efx_process_channel_now(struct efx_channel *channel);#define EFX_EVQ_MASK (EFX_EVQ_SIZE - 1)/* Ports */ -extern void efx_stats_disable (struct efx_nic *efx); -extern void efx_stats_enable (struct efx_nic *efx);extern void efx_reconfigure_port (struct efx_nic *efx);extern void __efx_reconfigure_port (struct efx_nic *efx);
drivers/net/sfc/falcon.c +101 -30
211 lines not on this page · raw message
drivers/net/sfc/falcon.h +10 -2
@@ -75,10 +75,18 @@ struct falcon_board {* struct falcon_nic_data - Falcon NIC state * @pci_dev2: Secondary function of Falcon A * @board: Board state and functions +* @stats_disable_count: Nest count for disabling statistics fetches +* @stats_pending: Is there a pending DMA of MAC statistics. +* @stats_timer: A timer for regularly fetching MAC statistics. +* @stats_dma_done: Pointer to the flag which indicates DMA completion. */ struct falcon_nic_data {struct pci_dev *pci_dev2;struct falcon_board board; +unsigned int stats_disable_count; +bool stats_pending; +struct timer_list stats_timer; +u32 *stats_dma_done; };static inline struct falcon_board *falcon_board (struct efx_nic *efx)
@@ -128,8 +136,6 @@ extern void falcon_remove_port(struct efx_nic *efx);/* MAC/PHY */ extern int falcon_switch_mac (struct efx_nic *efx);extern bool falcon_xaui_link_ok (struct efx_nic *efx); -extern int falcon_dma_stats (struct efx_nic *efx, -unsigned int done_offset);extern void falcon_drain_tx_fifo (struct efx_nic *efx);extern void falcon_deconfigure_mac_wrapper (struct efx_nic *efx);extern void falcon_reconfigure_mac_wrapper (struct efx_nic *efx);
@@ -154,6 +160,8 @@ extern int falcon_flush_queues(struct efx_nic *efx);extern int falcon_reset_hw (struct efx_nic *efx,enum reset_type method);extern void falcon_remove_nic (struct efx_nic *efx);extern void falcon_update_nic_stats (struct efx_nic *efx); +extern void falcon_start_nic_stats (struct efx_nic *efx); +extern void falcon_stop_nic_stats (struct efx_nic *efx);extern void falcon_set_multicast_hash (struct efx_nic *efx);extern int falcon_reset_xaui (struct efx_nic *efx);
drivers/net/sfc/falcon_boards.c +5 -5
@@ -347,14 +347,14 @@ static ssize_t set_phy_flash_cfg(struct device *dev,* MAC stats accordingly. */ efx->phy_mode = new_mode;if (new_mode &PHY_MODE_SPECIAL ) -efx_stats_disable (efx); +falcon_stop_nic_stats (efx);if (falcon_board (efx)->type->id ==FALCON_BOARD_SFE4001 ) err =sfe4001_poweron (efx);else err =sfn4111t_reset (efx);efx_reconfigure_port (efx);if (!(new_mode &PHY_MODE_SPECIAL )) -efx_stats_enable (efx); +falcon_start_nic_stats (efx); }rtnl_unlock ();
@@ -441,7 +441,7 @@ static int sfe4001_init(struct efx_nic *efx)if (efx->phy_mode &PHY_MODE_SPECIAL ) {/* PHY won't generate a 156.25 MHz clock and MAC stats fetch * will fail. */ -efx_stats_disable (efx); +falcon_stop_nic_stats (efx); } rc =sfe4001_poweron (efx);if (rc)
@@ -504,7 +504,7 @@ static void sfn4111t_init_phy(struct efx_nic *efx)return ; efx->phy_mode =PHY_MODE_SPECIAL ; -efx_stats_disable (efx); +falcon_stop_nic_stats (efx); }sfn4111t_reset (efx);
@@ -531,7 +531,7 @@ static int sfn4111t_init(struct efx_nic *efx)if (efx->phy_mode &PHY_MODE_SPECIAL )/* PHY may not generate a 156.25 MHz clock and MAC * stats fetch will fail. */ -efx_stats_disable (efx); +falcon_stop_nic_stats (efx);return 0 ;
drivers/net/sfc/falcon_gmac.c +0 -5
@@ -130,11 +130,6 @@ static void falcon_update_stats_gmac(struct efx_nic *efx)struct efx_mac_stats *mac_stats = &efx->mac_stats;unsigned long old_rx_pause, old_tx_pause;unsigned long new_rx_pause, new_tx_pause; -int rc; - - rc =falcon_dma_stats (efx, GDmaDone_offset); -if (rc) -return ;/* Pause frames are erroneously counted as errors (SFC bug 3269) */ old_rx_pause = mac_stats->rx_pause;
drivers/net/sfc/falcon_xmac.c +8 -5
@@ -60,9 +60,13 @@ static void falcon_setup_xaui(struct efx_nic *efx)int falcon_reset_xaui (struct efx_nic *efx) { +struct falcon_nic_data *nic_data = efx->nic_data;efx_oword_t reg;int count; +/* Don't fetch MAC statistics over an XMAC reset */ +WARN_ON (nic_data->stats_disable_count ==0 ); +/* Start reset sequence */ EFX_POPULATE_OWORD_1 (reg,FRF_AB_XX_RST_XX_EN ,1 );efx_writeo (efx, ®,FR_AB_XX_PWR_RST );
@@ -250,6 +254,8 @@ static void falcon_check_xaui_link_up(struct efx_nic *efx, int tries)/* XAUI link is expected to be down */ return ; +falcon_stop_nic_stats (efx); +while (!efx->mac_up && tries) {EFX_LOG (efx,"bashing xaui\n" );falcon_reset_xaui (efx);
@@ -258,6 +264,8 @@ static void falcon_check_xaui_link_up(struct efx_nic *efx, int tries) efx->mac_up =falcon_xaui_link_ok (efx); --tries; } + +falcon_start_nic_stats (efx); }static void falcon_reconfigure_xmac (struct efx_nic *efx)
@@ -276,11 +284,6 @@ static void falcon_reconfigure_xmac(struct efx_nic *efx)static void falcon_update_stats_xmac (struct efx_nic *efx) {struct efx_mac_stats *mac_stats = &efx->mac_stats; -int rc; - - rc =falcon_dma_stats (efx, XgDmaDone_offset); -if (rc) -return ;/* Update MAC stats from DMAed values */ FALCON_STAT (efx, XgRxOctets, rx_bytes);
drivers/net/sfc/net_driver.h +0 -2
@@ -717,7 +717,6 @@ union efx_multicast_hash {* &struct net_device_stats. * @stats_buffer: DMA buffer for statistics * @stats_lock: Statistics update lock. Serialises statistics fetches -* @stats_disable_count: Nest count for disabling statistics fetches * @mac_op: MAC interface * @mac_address: Permanent MAC address * @phy_type: PHY type
@@ -799,7 +798,6 @@ struct efx_nic {struct efx_mac_stats mac_stats;struct efx_buffer stats_buffer;spinlock_t stats_lock; -unsigned int stats_disable_count;struct efx_mac_operations *mac_op;unsigned char mac_address[ETH_ALEN ];
drivers/net/sfc/tenxpress.c +2 -2
@@ -374,7 +374,7 @@ static int tenxpress_special_reset(struct efx_nic *efx)/* The XGMAC clock is driven from the SFC7101/SFT9001 312MHz clock, so * a special software reset can glitch the XGMAC sufficiently for stats * requests to fail. */ -efx_stats_disable (efx); +falcon_stop_nic_stats (efx);/* Initiate reset */ reg =efx_mdio_read (efx,MDIO_MMD_PMAPMD ,PMA_PMD_XCONTROL_REG );
@@ -396,7 +396,7 @@ static int tenxpress_special_reset(struct efx_nic *efx)/* Wait for the XGXS state machine to churn */ mdelay (10 ); out: -efx_stats_enable (efx); +falcon_start_nic_stats (efx);return rc; }
Signature · 3 lines
Ben Hutchings, Senior Software Engineer, Solarflare Communications Not speaking for my employer; that's the marketing department's job. They asked us to note that Solarflare product names are trademarked.