pull request: sfc-next-2.6 2010-12-21
Subsystems (2)
The following changes since commit cf78f8ee3de7d8d5b47d371c95716d0e4facf1c4:
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/bwh/sfc-next-2.6 (2010-12-10 10:20:43 -0800)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/bwh/sfc-next-2.6.git for-davem
Some overdue cleanup of the TX path.
Ben.
Ben Hutchings (2):
sfc: Remove unused field and comment on a previously removed field
sfc: Remove ancient support for nesting of TX stop
drivers/net/sfc/efx.c | 24 +++++---- drivers/net/sfc/efx.h | 2 - drivers/net/sfc/net_driver.h | 13 +---- drivers/net/sfc/tx.c | 111 +++++++---------------------------------- 4 files changed, 35 insertions(+), 115 deletions(-)
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.
PATCH 1/2 sfc: Remove unused field and comment on a previously removed field
--- drivers/net/sfc/net_driver.h | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-)
drivers/net/sfc/net_driver.h +0 -2
@@ -179,7 +179,6 @@ struct efx_tx_queue {struct efx_nic *efx____cacheline_aligned_in_smp ;unsigned queue;struct efx_channel *channel; -struct efx_nic *nic;struct efx_tx_buffer *buffer;struct efx_special_buffer txd;unsigned int ptr_mask;
@@ -321,7 +320,6 @@ enum efx_rx_alloc_method {* @irq_moderation: IRQ moderation value (in hardware ticks) * @napi_dev: Net device used with NAPI * @napi_str: NAPI control structure -* @reset_work: Scheduled reset work thread * @work_pending: Is work pending via NAPI? * @eventq: Event queue buffer * @eventq_mask: Event queue pointer mask
Signature · 8 lines
1.7.3.2 -- 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.
PATCH 2/2 sfc: Remove ancient support for nesting of TX stop
In reply to Ben HutchingsLong before this driver went into mainline, it had support for multiple TX queues per port, with lockless TX enabled. Since Linux did not know anything of this, filling up any hardware TX queue would stop the core TX queue and multiple hardware TX queues could fill up before the scheduler reacted. Thus it was necessary to keep a count of how many TX queues were stopped and to wake the core TX queue only when all had free space again.
The driver also previously (ab)used the per-hardware-queue stopped flag as a counter to deal with various things that can inhibit TX, but it no longer does that.
Remove the per-channel tx_stop_count, tx_stop_lock and per-hardware-queue stopped count and just use the networking core queue state directly.
--- drivers/net/sfc/efx.c | 24 +++++---- drivers/net/sfc/efx.h | 2 - drivers/net/sfc/net_driver.h | 11 +--- drivers/net/sfc/tx.c | 111 +++++++---------------------------------- 4 files changed, 35 insertions(+), 113 deletions(-)
drivers/net/sfc/efx.c +14 -10
@@ -461,9 +461,6 @@ efx_alloc_channel(struct efx_nic *efx, int i, struct efx_channel *old_channel) } } -spin_lock_init (&channel->tx_stop_lock); -atomic_set (&channel->tx_stop_count,1 ); - rx_queue = &channel->rx_queue; rx_queue->efx = efx; setup_timer(&rx_queue->slow_fill, efx_rx_slow_fill,
@@ -1406,11 +1403,11 @@ static void efx_start_all(struct efx_nic *efx)* restart the transmit interface early so the watchdog timer stops */ efx_start_port (efx); -efx_for_each_channel (channel, efx) { -if (efx_dev_registered (efx)) -efx_wake_queue (channel); +if (efx_dev_registered (efx)) +netif_tx_wake_all_queues (efx->net_dev); + +efx_for_each_channel (channel, efx)efx_start_channel (channel); - }if (efx->legacy_irq) efx->legacy_irq_enabled = true;
@@ -1498,9 +1495,7 @@ static void efx_stop_all(struct efx_nic *efx)/* Stop the kernel transmit interface late, so the watchdog * timer isn't ticking over the flush */ if (efx_dev_registered (efx)) { -struct efx_channel *channel; -efx_for_each_channel (channel, efx) -efx_stop_queue (channel); +netif_tx_stop_all_queues (efx->net_dev);netif_tx_lock_bh (efx->net_dev);netif_tx_unlock_bh (efx->net_dev); }
@@ -1896,6 +1891,7 @@ static DEVICE_ATTR(phy_type, 0644, show_phy_type, NULL);static int efx_register_netdev (struct efx_nic *efx) {struct net_device *net_dev = efx->net_dev; +struct efx_channel *channel;int rc; net_dev->watchdog_timeo =5 *HZ ;
@@ -1918,6 +1914,14 @@ static int efx_register_netdev(struct efx_nic *efx)if (rc) goto fail_locked; +efx_for_each_channel (channel, efx) { +struct efx_tx_queue *tx_queue; +efx_for_each_channel_tx_queue (tx_queue, channel) { + tx_queue->core_txq =netdev_get_tx_queue ( + efx->net_dev, tx_queue->queue /EFX_TXQ_TYPES ); + } + } +/* Always start with carrier off; PHY events will detect the link */ netif_carrier_off (efx->net_dev);
drivers/net/sfc/efx.h +0 -2
@@ -36,8 +36,6 @@ efx_hard_start_xmit(struct sk_buff *skb, struct net_device *net_dev);extern netdev_tx_t efx_enqueue_skb (struct efx_tx_queue *tx_queue,struct sk_buff *skb);extern void efx_xmit_done (struct efx_tx_queue *tx_queue,unsigned int index); -extern void efx_stop_queue (struct efx_channel *channel); -extern void efx_wake_queue (struct efx_channel *channel);/* RX */ extern int efx_probe_rx_queue (struct efx_rx_queue *rx_queue);
drivers/net/sfc/net_driver.h +2 -9
@@ -136,6 +136,7 @@ struct efx_tx_buffer {* @efx: The associated Efx NIC * @queue: DMA queue number * @channel: The associated channel +* @core_txq: The networking core TX queue structure * @buffer: The software buffer ring * @txd: The hardware descriptor ring * @ptr_mask: The size of the ring minus 1.
@@ -148,8 +149,6 @@ struct efx_tx_buffer {* variable indicates that the queue is empty. This is to * avoid cache-line ping-pong between the xmit path and the * completion path. -* @stopped: Stopped count. -* Set if this TX queue is currently stopping its port. * @insert_count: Current insert pointer * This is the number of buffers that have been added to the * software ring.
@@ -179,6 +178,7 @@ struct efx_tx_queue {struct efx_nic *efx____cacheline_aligned_in_smp ;unsigned queue;struct efx_channel *channel; +struct netdev_queue *core_txq;struct efx_tx_buffer *buffer;struct efx_special_buffer txd;unsigned int ptr_mask;
@@ -187,7 +187,6 @@ struct efx_tx_queue {/* Members used mainly on the completion path */ unsigned int read_count____cacheline_aligned_in_smp ;unsigned int old_write_count; -int stopped;/* Members used only on the xmit path */ unsigned int insert_count____cacheline_aligned_in_smp ;
@@ -340,8 +339,6 @@ enum efx_rx_alloc_method {* @n_rx_overlength: Count of RX_OVERLENGTH errors * @n_skbuff_leaks: Count of skbuffs leaked due to RX overrun * @rx_queue: RX queue for this channel -* @tx_stop_count: Core TX queue stop count -* @tx_stop_lock: Core TX queue stop lock * @tx_queue: TX queues for this channel */ struct efx_channel {
@@ -380,10 +377,6 @@ struct efx_channel {bool rx_pkt_csummed;struct efx_rx_queue rx_queue; - -atomic_t tx_stop_count; -spinlock_t tx_stop_lock; -struct efx_tx_queue tx_queue[2 ]; };
drivers/net/sfc/tx.c +19 -92
190 lines not on this page · raw message
Signature · 7 lines
1.7.3.2 -- 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.
David Miller
maintainerFrom: Ben Hutchings <[email protected]>
Date: Tue, 21 Dec 2010 14:46:57 +0000
Quoted 9 lines
The following changes since commit
cf78f8ee3de7d8d5b47d371c95716d0e4facf1c4:Merge branch 'for-davem' of
git://git.kernel.org/pub/scm/linux/kernel/git/bwh/sfc-next-2.6(2010-12-10 10:20:43 -0800)are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/bwh/sfc-next-2.6.gitfor-davemSome overdue cleanup of the TX path.
Pulled, thanks a lot Ben.