diff options
| author | Brian King <brking@linux.vnet.ibm.com> | 2017-11-17 11:05:46 -0600 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-11-30 08:35:52 +0000 |
| commit | 4fc9c3c798478cc3e741e583d2936a705f2ee9e4 (patch) | |
| tree | acddca608dcf2ee52df1bfdc9938faf57316bef7 | |
| parent | 5f068a6634761bf1d732a1173305faf92fecbe1f (diff) | |
| download | linux-stable-4fc9c3c798478cc3e741e583d2936a705f2ee9e4.tar.gz linux-stable-4fc9c3c798478cc3e741e583d2936a705f2ee9e4.tar.bz2 linux-stable-4fc9c3c798478cc3e741e583d2936a705f2ee9e4.zip | |
igbvf: Use smp_rmb rather than read_barrier_depends
commit 1e1f9ca546556e508d021545861f6b5fc75a95fe upstream.
The original issue being fixed in this patch was seen with the ixgbe
driver, but the same issue exists with igbvf as well, as the code is
very similar. read_barrier_depends is not sufficient to ensure
loads following it are not speculatively loaded out of order
by the CPU, which can result in stale data being loaded, causing
potential system crashes.
Signed-off-by: Brian King <brking@linux.vnet.ibm.com>
Acked-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/net/ethernet/intel/igbvf/netdev.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/intel/igbvf/netdev.c b/drivers/net/ethernet/intel/igbvf/netdev.c index 63c807c9b21c..7cf3fbb8bc35 100644 --- a/drivers/net/ethernet/intel/igbvf/netdev.c +++ b/drivers/net/ethernet/intel/igbvf/netdev.c @@ -808,7 +808,7 @@ static bool igbvf_clean_tx_irq(struct igbvf_ring *tx_ring) break; /* prevent any other reads prior to eop_desc */ - read_barrier_depends(); + smp_rmb(); /* if DD is not set pending work has not been completed */ if (!(eop_desc->wb.status & cpu_to_le32(E1000_TXD_STAT_DD))) |