ice: add lock around Tx timestamp tracker flush
authorJacob Keller <jacob.e.keller@intel.com>
Tue, 24 Aug 2021 00:01:48 +0000 (17:01 -0700)
committerTony Nguyen <anthony.l.nguyen@intel.com>
Fri, 27 Aug 2021 16:14:49 +0000 (09:14 -0700)
The driver didn't take the lock while flushing the Tx tracker, which
could cause a race where one thread is trying to read timestamps out
while another thread is trying to read the tracker to check the
timestamps.

Avoid this by ensuring that flushing is locked against read accesses.

Fixes: ea9b847cda64 ("ice: enable transmit timestamps for E810 devices")
Signed-off-by: Jacob Keller <jacob.e.keller@intel.com>
Tested-by: Gurucharan G <gurucharanx.g@intel.com>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
drivers/net/ethernet/intel/ice/ice_ptp.c

index 09d74e94feae6cdbd6acd5a5dce2d7e7834069e4..ae0980f14c807378b4b51b9732982f36533aa47f 100644 (file)
@@ -1267,6 +1267,8 @@ ice_ptp_flush_tx_tracker(struct ice_pf *pf, struct ice_ptp_tx *tx)
 {
        u8 idx;
 
+       spin_lock(&tx->lock);
+
        for (idx = 0; idx < tx->len; idx++) {
                u8 phy_idx = idx + tx->quad_offset;
 
@@ -1279,6 +1281,8 @@ ice_ptp_flush_tx_tracker(struct ice_pf *pf, struct ice_ptp_tx *tx)
                        tx->tstamps[idx].skb = NULL;
                }
        }
+
+       spin_unlock(&tx->lock);
 }
 
 /**