summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian King2017-11-17 18:05:47 +0100
committerJeff Kirsher2017-11-22 08:47:24 +0100
commitc4cb99185b4cc96c0a1c70104dc21ae14d7e7f28 (patch)
treebb1a8ee20453e511a0ea262d153a978cd2e5bb5a
parentigbvf: Use smp_rmb rather than read_barrier_depends (diff)
downloadkernel-qcow2-linux-c4cb99185b4cc96c0a1c70104dc21ae14d7e7f28.tar.gz
kernel-qcow2-linux-c4cb99185b4cc96c0a1c70104dc21ae14d7e7f28.tar.xz
kernel-qcow2-linux-c4cb99185b4cc96c0a1c70104dc21ae14d7e7f28.zip
igb: Use smp_rmb rather than read_barrier_depends
The original issue being fixed in this patch was seen with the ixgbe driver, but the same issue exists with igb 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. Cc: stable <stable@vger.kernel.org> 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>
-rw-r--r--drivers/net/ethernet/intel/igb/igb_main.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c
index e94d3c256667..c208753ff5b7 100644
--- a/drivers/net/ethernet/intel/igb/igb_main.c
+++ b/drivers/net/ethernet/intel/igb/igb_main.c
@@ -7317,7 +7317,7 @@ static bool igb_clean_tx_irq(struct igb_q_vector *q_vector, int napi_budget)
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)))