diff options
| author | Brian King <brking@linux.vnet.ibm.com> | 2019-07-15 16:41:50 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-07-28 08:27:11 +0200 |
| commit | 53ed9ae1c452589b8ff70a6f4f72c6258cbd9911 (patch) | |
| tree | 030a6b3257f913b2ebd3179087338cb4639f41ef /drivers | |
| parent | 577669778464e991c12291f5833bd627d2102bcb (diff) | |
| download | linux-stable-53ed9ae1c452589b8ff70a6f4f72c6258cbd9911.tar.gz linux-stable-53ed9ae1c452589b8ff70a6f4f72c6258cbd9911.tar.bz2 linux-stable-53ed9ae1c452589b8ff70a6f4f72c6258cbd9911.zip | |
bnx2x: Prevent load reordering in tx completion processing
[ Upstream commit ea811b795df24644a8eb760b493c43fba4450677 ]
This patch fixes an issue seen on Power systems with bnx2x which results
in the skb is NULL WARN_ON in bnx2x_free_tx_pkt firing due to the skb
pointer getting loaded in bnx2x_free_tx_pkt prior to the hw_cons
load in bnx2x_tx_int. Adding a read memory barrier resolves the issue.
Signed-off-by: Brian King <brking@linux.vnet.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c index c12c1bab0fe4..bf39fc83d577 100644 --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c @@ -285,6 +285,9 @@ int bnx2x_tx_int(struct bnx2x *bp, struct bnx2x_fp_txdata *txdata) hw_cons = le16_to_cpu(*txdata->tx_cons_sb); sw_cons = txdata->tx_pkt_cons; + /* Ensure subsequent loads occur after hw_cons */ + smp_rmb(); + while (sw_cons != hw_cons) { u16 pkt_cons; |