diff options
| author | Lendacky, Thomas <Thomas.Lendacky@amd.com> | 2015-10-26 23:13:54 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-10-28 03:49:22 +0100 |
| commit | 20986ed826cbb36bb8f2d77f872e3c52d8d30647 (patch) | |
| tree | b901d1387064b7a4710227081ee23083a421d6e1 /drivers/net/ethernet/amd/xgbe/xgbe-drv.c | |
| parent | RDS-TCP: Recover correctly from pskb_pull()/pksb_trim() failure in rds_tcp_da... (diff) | |
| download | linux-20986ed826cbb36bb8f2d77f872e3c52d8d30647.tar.xz linux-20986ed826cbb36bb8f2d77f872e3c52d8d30647.zip | |
amd-xgbe: Fix race between access of desc and desc index
During Tx cleanup it's still possible for the descriptor data to be
read ahead of the descriptor index. A memory barrier is required between
the read of the descriptor index and the start of the Tx cleanup loop.
This allows a change to a lighter-weight barrier in the Tx transmit
routine just before updating the current descriptor index.
Since the memory barrier does result in extra overhead on arm64, keep
the previous change to not chase the current descriptor value. This
prevents the execution of the barrier for each loop performed.
Suggested-by: Alexander Duyck <alexander.duyck@gmail.com>
Signed-off-by: Tom Lendacky <thomas.lendacky@amd.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
| -rw-r--r-- | drivers/net/ethernet/amd/xgbe/xgbe-drv.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-drv.c b/drivers/net/ethernet/amd/xgbe/xgbe-drv.c index d2b77d985441..dde0486667e0 100644 --- a/drivers/net/ethernet/amd/xgbe/xgbe-drv.c +++ b/drivers/net/ethernet/amd/xgbe/xgbe-drv.c @@ -1816,6 +1816,10 @@ static int xgbe_tx_poll(struct xgbe_channel *channel) return 0; cur = ring->cur; + + /* Be sure we get ring->cur before accessing descriptor data */ + smp_rmb(); + txq = netdev_get_tx_queue(netdev, channel->queue_index); while ((processed < XGBE_TX_DESC_MAX_PROC) && |