Re: Re: [PATCH, RFC] skge: Fix race in tx path
From: Bart Van Assche <bvanassche@acm.org>
Date: 2012-02-27 19:19:04
Subsystem:
marvell gigabit ethernet drivers (skge/sky2), networking drivers, the rest · Maintainers:
Andrew Lunn, "David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Linus Torvalds
With this change it seems possible for skge_tx_done to unmap a buffer before it is sent when the requests for skge_xmit_frame are close enough.
Thanks for the feedback. Does the patch below look better ? --- drivers/net/ethernet/marvell/skge.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/net/ethernet/marvell/skge.c b/drivers/net/ethernet/marvell/skge.c
index 33947ac..55723b5 100644
--- a/drivers/net/ethernet/marvell/skge.c
+++ b/drivers/net/ethernet/marvell/skge.c@@ -2800,15 +2800,15 @@ static netdev_tx_t skge_xmit_frame(struct sk_buff *skb, netdev_sent_queue(dev, skb->len); + skge->tx_ring.to_use = e->next; + smp_wmb(); + skge_write8(hw, Q_ADDR(txqaddr[skge->port], Q_CSR), CSR_START); netif_printk(skge, tx_queued, KERN_DEBUG, skge->netdev, "tx queued, slot %td, len %d\n", e - skge->tx_ring.start, skb->len); - skge->tx_ring.to_use = e->next; - smp_wmb(); - if (skge_avail(&skge->tx_ring) <= TX_LOW_WATER) { netdev_dbg(dev, "transmit queue full\n"); netif_stop_queue(dev);
--
1.7.3.4