From: Jacob Keller <jacob.e.keller@intel.com>
To: intel-wired-lan@osuosl.org
Subject: [Intel-wired-lan] [net-next 03/13] ice: add lock around Tx timestamp tracker flush
Date: Wed, 30 Jun 2021 17:27:03 -0700 [thread overview]
Message-ID: <20210701002713.3486336-4-jacob.e.keller@intel.com> (raw)
In-Reply-To: <20210701002713.3486336-1-jacob.e.keller@intel.com>
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>
---
drivers/net/ethernet/intel/ice/ice_ptp.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/drivers/net/ethernet/intel/ice/ice_ptp.c b/drivers/net/ethernet/intel/ice/ice_ptp.c
index 6c611e8a5b41..83ba0bf2817a 100644
--- a/drivers/net/ethernet/intel/ice/ice_ptp.c
+++ b/drivers/net/ethernet/intel/ice/ice_ptp.c
@@ -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);
}
/**
--
2.31.1.331.gb0c09ab8796f
next prev parent reply other threads:[~2021-07-01 0:27 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-01 0:27 [Intel-wired-lan] [net-next 00/13] ice: implement support for PTP on E822 hardware Jacob Keller
2021-07-01 0:27 ` [Intel-wired-lan] [net-next 01/13] ice: fix Tx queue iteration for Tx timestamp enablement Jacob Keller
2021-07-01 0:27 ` [Intel-wired-lan] [net-next 02/13] ice: remove dead code for allocating pin_config Jacob Keller
2021-07-01 0:27 ` Jacob Keller [this message]
2021-07-01 0:27 ` [Intel-wired-lan] [net-next 04/13] ice: restart periodic outputs around time changes Jacob Keller
2021-07-05 7:52 ` Paul Menzel
2021-07-06 19:54 ` Keller, Jacob E
2021-07-01 0:27 ` [Intel-wired-lan] [net-next 05/13] ice: introduce ice_base_incval function Jacob Keller
2021-07-01 0:27 ` [Intel-wired-lan] [net-next 06/13] ice: PTP: move setting of tstamp_config Jacob Keller
2021-07-01 0:27 ` [Intel-wired-lan] [net-next 07/13] ice: use 'int err' instead of 'int status' Jacob Keller
2021-07-01 0:27 ` [Intel-wired-lan] [net-next 08/13] ice: introduce ice_ptp_init_phc function Jacob Keller
2021-07-01 0:27 ` [Intel-wired-lan] [net-next 09/13] ice: convert clk_freq capability into time_ref Jacob Keller
2021-07-01 0:27 ` [Intel-wired-lan] [net-next 10/13] ice: implement basic E822 PTP support Jacob Keller
2021-07-01 0:27 ` [Intel-wired-lan] [net-next 11/13] ice: ensure the hardware Clock Generation Unit is configured Jacob Keller
2021-07-01 0:27 ` [Intel-wired-lan] [net-next 12/13] ice: exit bypass mode once hardware finishes timestamp calibration Jacob Keller
2021-07-01 0:27 ` [Intel-wired-lan] [net-next 13/13] ice: support crosstimestamping on E822 devices if supported Jacob Keller
2021-07-01 18:32 ` kernel test robot
2021-07-05 7:47 ` [Intel-wired-lan] [net-next 00/13] ice: implement support for PTP on E822 hardware Paul Menzel
2021-07-06 19:53 ` Keller, Jacob E
2021-07-07 7:52 ` Paul Menzel
2021-07-07 23:10 ` Keller, Jacob E
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210701002713.3486336-4-jacob.e.keller@intel.com \
--to=jacob.e.keller@intel.com \
--cc=intel-wired-lan@osuosl.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox