* [PATCH net 1/4] igc: Fix race condition in PTP tx code
2023-05-30 17:49 [PATCH net 0/4][pull request] igc: TX timestamping fixes Tony Nguyen
@ 2023-05-30 17:49 ` Tony Nguyen
2023-06-19 7:27 ` naamax.meir
2023-05-30 17:49 ` [PATCH net 2/4] igc: Check if hardware TX timestamping is enabled earlier Tony Nguyen
` (2 subsequent siblings)
3 siblings, 1 reply; 12+ messages in thread
From: Tony Nguyen @ 2023-05-30 17:49 UTC (permalink / raw)
To: davem, kuba, pabeni, edumazet, netdev
Cc: Vinicius Costa Gomes, anthony.l.nguyen, sasha.neftin,
richardcochran, Andre Guedes, Kurt Kanzenbach, Naama Meir
From: Vinicius Costa Gomes <vinicius.gomes@intel.com>
Currently, the igc driver supports timestamping only one tx packet at a
time. During the transmission flow, the skb that requires hardware
timestamping is saved in adapter->ptp_tx_skb. Once hardware has the
timestamp, an interrupt is delivered, and adapter->ptp_tx_work is
scheduled. In igc_ptp_tx_work(), we read the timestamp register, update
adapter->ptp_tx_skb, and notify the network stack.
While the thread executing the transmission flow (the user process
running in kernel mode) and the thread executing ptp_tx_work don't
access adapter->ptp_tx_skb concurrently, there are two other places
where adapter->ptp_tx_skb is accessed: igc_ptp_tx_hang() and
igc_ptp_suspend().
igc_ptp_tx_hang() is executed by the adapter->watchdog_task worker
thread which runs periodically so it is possible we have two threads
accessing ptp_tx_skb at the same time. Consider the following scenario:
right after __IGC_PTP_TX_IN_PROGRESS is set in igc_xmit_frame_ring(),
igc_ptp_tx_hang() is executed. Since adapter->ptp_tx_start hasn't been
written yet, this is considered a timeout and adapter->ptp_tx_skb is
cleaned up.
This patch fixes the issue described above by adding the ptp_tx_lock to
protect access to ptp_tx_skb and ptp_tx_start fields from igc_adapter.
Since igc_xmit_frame_ring() called in atomic context by the networking
stack, ptp_tx_lock is defined as a spinlock, and the irq safe variants
of lock/unlock are used.
With the introduction of the ptp_tx_lock, the __IGC_PTP_TX_IN_PROGRESS
flag doesn't provide much of a use anymore so this patch gets rid of it.
Fixes: 2c344ae24501 ("igc: Add support for TX timestamping")
Signed-off-by: Andre Guedes <andre.guedes@intel.com>
Signed-off-by: Vinicius Costa Gomes <vinicius.gomes@intel.com>
Reviewed-by: Kurt Kanzenbach <kurt@linutronix.de>
Tested-by: Naama Meir <naamax.meir@linux.intel.com>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
---
drivers/net/ethernet/intel/igc/igc.h | 5 +-
drivers/net/ethernet/intel/igc/igc_main.c | 9 ++--
drivers/net/ethernet/intel/igc/igc_ptp.c | 57 ++++++++++++-----------
3 files changed, 41 insertions(+), 30 deletions(-)
diff --git a/drivers/net/ethernet/intel/igc/igc.h b/drivers/net/ethernet/intel/igc/igc.h
index 34aebf00a512..7da0657ea48f 100644
--- a/drivers/net/ethernet/intel/igc/igc.h
+++ b/drivers/net/ethernet/intel/igc/igc.h
@@ -229,6 +229,10 @@ struct igc_adapter {
struct ptp_clock *ptp_clock;
struct ptp_clock_info ptp_caps;
struct work_struct ptp_tx_work;
+ /* Access to ptp_tx_skb and ptp_tx_start are protected by the
+ * ptp_tx_lock.
+ */
+ spinlock_t ptp_tx_lock;
struct sk_buff *ptp_tx_skb;
struct hwtstamp_config tstamp_config;
unsigned long ptp_tx_start;
@@ -401,7 +405,6 @@ enum igc_state_t {
__IGC_TESTING,
__IGC_RESETTING,
__IGC_DOWN,
- __IGC_PTP_TX_IN_PROGRESS,
};
enum igc_tx_flags {
diff --git a/drivers/net/ethernet/intel/igc/igc_main.c b/drivers/net/ethernet/intel/igc/igc_main.c
index 1c4676882082..a61afa69975e 100644
--- a/drivers/net/ethernet/intel/igc/igc_main.c
+++ b/drivers/net/ethernet/intel/igc/igc_main.c
@@ -1583,9 +1583,10 @@ static netdev_tx_t igc_xmit_frame_ring(struct sk_buff *skb,
* the other timer registers before skipping the
* timestamping request.
*/
- if (adapter->tstamp_config.tx_type == HWTSTAMP_TX_ON &&
- !test_and_set_bit_lock(__IGC_PTP_TX_IN_PROGRESS,
- &adapter->state)) {
+ unsigned long flags;
+
+ spin_lock_irqsave(&adapter->ptp_tx_lock, flags);
+ if (adapter->tstamp_config.tx_type == HWTSTAMP_TX_ON && !adapter->ptp_tx_skb) {
skb_shinfo(skb)->tx_flags |= SKBTX_IN_PROGRESS;
tx_flags |= IGC_TX_FLAGS_TSTAMP;
@@ -1594,6 +1595,8 @@ static netdev_tx_t igc_xmit_frame_ring(struct sk_buff *skb,
} else {
adapter->tx_hwtstamp_skipped++;
}
+
+ spin_unlock_irqrestore(&adapter->ptp_tx_lock, flags);
}
if (skb_vlan_tag_present(skb)) {
diff --git a/drivers/net/ethernet/intel/igc/igc_ptp.c b/drivers/net/ethernet/intel/igc/igc_ptp.c
index 4e10ced736db..56128e55f5c0 100644
--- a/drivers/net/ethernet/intel/igc/igc_ptp.c
+++ b/drivers/net/ethernet/intel/igc/igc_ptp.c
@@ -603,6 +603,7 @@ static int igc_ptp_set_timestamp_mode(struct igc_adapter *adapter,
return 0;
}
+/* Requires adapter->ptp_tx_lock held by caller. */
static void igc_ptp_tx_timeout(struct igc_adapter *adapter)
{
struct igc_hw *hw = &adapter->hw;
@@ -610,7 +611,6 @@ static void igc_ptp_tx_timeout(struct igc_adapter *adapter)
dev_kfree_skb_any(adapter->ptp_tx_skb);
adapter->ptp_tx_skb = NULL;
adapter->tx_hwtstamp_timeouts++;
- clear_bit_unlock(__IGC_PTP_TX_IN_PROGRESS, &adapter->state);
/* Clear the tx valid bit in TSYNCTXCTL register to enable interrupt. */
rd32(IGC_TXSTMPH);
netdev_warn(adapter->netdev, "Tx timestamp timeout\n");
@@ -618,20 +618,20 @@ static void igc_ptp_tx_timeout(struct igc_adapter *adapter)
void igc_ptp_tx_hang(struct igc_adapter *adapter)
{
- bool timeout = time_is_before_jiffies(adapter->ptp_tx_start +
- IGC_PTP_TX_TIMEOUT);
+ unsigned long flags;
- if (!test_bit(__IGC_PTP_TX_IN_PROGRESS, &adapter->state))
- return;
+ spin_lock_irqsave(&adapter->ptp_tx_lock, flags);
- /* If we haven't received a timestamp within the timeout, it is
- * reasonable to assume that it will never occur, so we can unlock the
- * timestamp bit when this occurs.
- */
- if (timeout) {
- cancel_work_sync(&adapter->ptp_tx_work);
- igc_ptp_tx_timeout(adapter);
- }
+ if (!adapter->ptp_tx_skb)
+ goto unlock;
+
+ if (time_is_after_jiffies(adapter->ptp_tx_start + IGC_PTP_TX_TIMEOUT))
+ goto unlock;
+
+ igc_ptp_tx_timeout(adapter);
+
+unlock:
+ spin_unlock_irqrestore(&adapter->ptp_tx_lock, flags);
}
/**
@@ -641,6 +641,8 @@ void igc_ptp_tx_hang(struct igc_adapter *adapter)
* If we were asked to do hardware stamping and such a time stamp is
* available, then it must have been for this skb here because we only
* allow only one such packet into the queue.
+ *
+ * Context: Expects adapter->ptp_tx_lock to be held by caller.
*/
static void igc_ptp_tx_hwtstamp(struct igc_adapter *adapter)
{
@@ -676,13 +678,7 @@ static void igc_ptp_tx_hwtstamp(struct igc_adapter *adapter)
shhwtstamps.hwtstamp =
ktime_add_ns(shhwtstamps.hwtstamp, adjust);
- /* Clear the lock early before calling skb_tstamp_tx so that
- * applications are not woken up before the lock bit is clear. We use
- * a copy of the skb pointer to ensure other threads can't change it
- * while we're notifying the stack.
- */
adapter->ptp_tx_skb = NULL;
- clear_bit_unlock(__IGC_PTP_TX_IN_PROGRESS, &adapter->state);
/* Notify the stack and free the skb after we've unlocked */
skb_tstamp_tx(skb, &shhwtstamps);
@@ -693,24 +689,33 @@ static void igc_ptp_tx_hwtstamp(struct igc_adapter *adapter)
* igc_ptp_tx_work
* @work: pointer to work struct
*
- * This work function polls the TSYNCTXCTL valid bit to determine when a
- * timestamp has been taken for the current stored skb.
+ * This work function checks the TSYNCTXCTL valid bit to determine when
+ * a timestamp has been taken for the current stored skb.
*/
static void igc_ptp_tx_work(struct work_struct *work)
{
struct igc_adapter *adapter = container_of(work, struct igc_adapter,
ptp_tx_work);
struct igc_hw *hw = &adapter->hw;
+ unsigned long flags;
u32 tsynctxctl;
- if (!test_bit(__IGC_PTP_TX_IN_PROGRESS, &adapter->state))
- return;
+ spin_lock_irqsave(&adapter->ptp_tx_lock, flags);
+
+ if (!adapter->ptp_tx_skb)
+ goto unlock;
tsynctxctl = rd32(IGC_TSYNCTXCTL);
- if (WARN_ON_ONCE(!(tsynctxctl & IGC_TSYNCTXCTL_TXTT_0)))
- return;
+ tsynctxctl &= IGC_TSYNCTXCTL_TXTT_0;
+ if (!tsynctxctl) {
+ WARN_ONCE(1, "Received a TSTAMP interrupt but no TSTAMP is ready.\n");
+ goto unlock;
+ }
igc_ptp_tx_hwtstamp(adapter);
+
+unlock:
+ spin_unlock_irqrestore(&adapter->ptp_tx_lock, flags);
}
/**
@@ -959,6 +964,7 @@ void igc_ptp_init(struct igc_adapter *adapter)
return;
}
+ spin_lock_init(&adapter->ptp_tx_lock);
spin_lock_init(&adapter->tmreg_lock);
INIT_WORK(&adapter->ptp_tx_work, igc_ptp_tx_work);
@@ -1023,7 +1029,6 @@ void igc_ptp_suspend(struct igc_adapter *adapter)
cancel_work_sync(&adapter->ptp_tx_work);
dev_kfree_skb_any(adapter->ptp_tx_skb);
adapter->ptp_tx_skb = NULL;
- clear_bit_unlock(__IGC_PTP_TX_IN_PROGRESS, &adapter->state);
if (pci_device_is_present(adapter->pdev)) {
igc_ptp_time_save(adapter);
--
2.38.1
^ permalink raw reply related [flat|nested] 12+ messages in thread* Re: [PATCH net 1/4] igc: Fix race condition in PTP tx code
2023-05-30 17:49 ` [PATCH net 1/4] igc: Fix race condition in PTP tx code Tony Nguyen
@ 2023-06-19 7:27 ` naamax.meir
0 siblings, 0 replies; 12+ messages in thread
From: naamax.meir @ 2023-06-19 7:27 UTC (permalink / raw)
To: Tony Nguyen, davem, kuba, pabeni, edumazet, netdev
Cc: Vinicius Costa Gomes, sasha.neftin, richardcochran, Andre Guedes,
Kurt Kanzenbach
On 5/30/2023 20:49, Tony Nguyen wrote:
> From: Vinicius Costa Gomes <vinicius.gomes@intel.com>
>
> Currently, the igc driver supports timestamping only one tx packet at a
> time. During the transmission flow, the skb that requires hardware
> timestamping is saved in adapter->ptp_tx_skb. Once hardware has the
> timestamp, an interrupt is delivered, and adapter->ptp_tx_work is
> scheduled. In igc_ptp_tx_work(), we read the timestamp register, update
> adapter->ptp_tx_skb, and notify the network stack.
>
> While the thread executing the transmission flow (the user process
> running in kernel mode) and the thread executing ptp_tx_work don't
> access adapter->ptp_tx_skb concurrently, there are two other places
> where adapter->ptp_tx_skb is accessed: igc_ptp_tx_hang() and
> igc_ptp_suspend().
>
> igc_ptp_tx_hang() is executed by the adapter->watchdog_task worker
> thread which runs periodically so it is possible we have two threads
> accessing ptp_tx_skb at the same time. Consider the following scenario:
> right after __IGC_PTP_TX_IN_PROGRESS is set in igc_xmit_frame_ring(),
> igc_ptp_tx_hang() is executed. Since adapter->ptp_tx_start hasn't been
> written yet, this is considered a timeout and adapter->ptp_tx_skb is
> cleaned up.
>
> This patch fixes the issue described above by adding the ptp_tx_lock to
> protect access to ptp_tx_skb and ptp_tx_start fields from igc_adapter.
> Since igc_xmit_frame_ring() called in atomic context by the networking
> stack, ptp_tx_lock is defined as a spinlock, and the irq safe variants
> of lock/unlock are used.
>
> With the introduction of the ptp_tx_lock, the __IGC_PTP_TX_IN_PROGRESS
> flag doesn't provide much of a use anymore so this patch gets rid of it.
>
> Fixes: 2c344ae24501 ("igc: Add support for TX timestamping")
> Signed-off-by: Andre Guedes <andre.guedes@intel.com>
> Signed-off-by: Vinicius Costa Gomes <vinicius.gomes@intel.com>
> Reviewed-by: Kurt Kanzenbach <kurt@linutronix.de>
> Tested-by: Naama Meir <naamax.meir@linux.intel.com>
> Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
> ---
> drivers/net/ethernet/intel/igc/igc.h | 5 +-
> drivers/net/ethernet/intel/igc/igc_main.c | 9 ++--
> drivers/net/ethernet/intel/igc/igc_ptp.c | 57 ++++++++++++-----------
> 3 files changed, 41 insertions(+), 30 deletions(-)
Tested-by: Naama Meir <naamax.meir@linux.intel.com>
^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH net 2/4] igc: Check if hardware TX timestamping is enabled earlier
2023-05-30 17:49 [PATCH net 0/4][pull request] igc: TX timestamping fixes Tony Nguyen
2023-05-30 17:49 ` [PATCH net 1/4] igc: Fix race condition in PTP tx code Tony Nguyen
@ 2023-05-30 17:49 ` Tony Nguyen
2023-06-01 6:10 ` Jakub Kicinski
2023-05-30 17:49 ` [PATCH net 3/4] igc: Retrieve TX timestamp during interrupt handling Tony Nguyen
2023-05-30 17:49 ` [PATCH net 4/4] igc: Add workaround for missing timestamps Tony Nguyen
3 siblings, 1 reply; 12+ messages in thread
From: Tony Nguyen @ 2023-05-30 17:49 UTC (permalink / raw)
To: davem, kuba, pabeni, edumazet, netdev
Cc: Vinicius Costa Gomes, anthony.l.nguyen, sasha.neftin,
richardcochran, Vladimir Oltean, Naama Meir
From: Vinicius Costa Gomes <vinicius.gomes@intel.com>
Before requesting a packet transmission to be hardware timestamped,
check if the user has TX timestamping enabled. Fixes an issue that if
a packet was internally forwarded to the NIC, and it had the
SKBTX_HW_TSTAMP flag set, the driver would mark that timestamp as
skipped.
In reality, that timestamp was "not for us", as TX timestamp could
never be enabled in the NIC.
Checking if the TX timestamping is enabled earlier has a secondary
effect that when TX timestamping is disabled, there's no need to check
for timestamp timeouts.
We should only take care to free any pending timestamp when TX
timestamping is disabled, as that skb would never be released
otherwise.
Fixes: 2c344ae24501 ("igc: Add support for TX timestamping")
Suggested-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Signed-off-by: Vinicius Costa Gomes <vinicius.gomes@intel.com>
Tested-by: Naama Meir <naamax.meir@linux.intel.com>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
---
drivers/net/ethernet/intel/igc/igc_main.c | 5 +++--
drivers/net/ethernet/intel/igc/igc_ptp.c | 23 ++++++++++++++++++++---
2 files changed, 23 insertions(+), 5 deletions(-)
diff --git a/drivers/net/ethernet/intel/igc/igc_main.c b/drivers/net/ethernet/intel/igc/igc_main.c
index a61afa69975e..b383352651a5 100644
--- a/drivers/net/ethernet/intel/igc/igc_main.c
+++ b/drivers/net/ethernet/intel/igc/igc_main.c
@@ -1578,7 +1578,8 @@ static netdev_tx_t igc_xmit_frame_ring(struct sk_buff *skb,
}
}
- if (unlikely(skb_shinfo(skb)->tx_flags & SKBTX_HW_TSTAMP)) {
+ if (unlikely(adapter->tstamp_config.tx_type == HWTSTAMP_TX_ON &&
+ skb_shinfo(skb)->tx_flags & SKBTX_HW_TSTAMP)) {
/* FIXME: add support for retrieving timestamps from
* the other timer registers before skipping the
* timestamping request.
@@ -1586,7 +1587,7 @@ static netdev_tx_t igc_xmit_frame_ring(struct sk_buff *skb,
unsigned long flags;
spin_lock_irqsave(&adapter->ptp_tx_lock, flags);
- if (adapter->tstamp_config.tx_type == HWTSTAMP_TX_ON && !adapter->ptp_tx_skb) {
+ if (!adapter->ptp_tx_skb) {
skb_shinfo(skb)->tx_flags |= SKBTX_IN_PROGRESS;
tx_flags |= IGC_TX_FLAGS_TSTAMP;
diff --git a/drivers/net/ethernet/intel/igc/igc_ptp.c b/drivers/net/ethernet/intel/igc/igc_ptp.c
index 56128e55f5c0..4dd0eec5a246 100644
--- a/drivers/net/ethernet/intel/igc/igc_ptp.c
+++ b/drivers/net/ethernet/intel/igc/igc_ptp.c
@@ -536,11 +536,27 @@ static void igc_ptp_enable_rx_timestamp(struct igc_adapter *adapter)
wr32(IGC_TSYNCRXCTL, val);
}
+static void igc_ptp_clear_tx_tstamp(struct igc_adapter *adapter)
+{
+ unsigned long flags;
+
+ cancel_work_sync(&adapter->ptp_tx_work);
+
+ spin_lock_irqsave(&adapter->ptp_tx_lock, flags);
+
+ dev_kfree_skb_any(adapter->ptp_tx_skb);
+ adapter->ptp_tx_skb = NULL;
+
+ spin_unlock_irqrestore(&adapter->ptp_tx_lock, flags);
+}
+
static void igc_ptp_disable_tx_timestamp(struct igc_adapter *adapter)
{
struct igc_hw *hw = &adapter->hw;
wr32(IGC_TSYNCTXCTL, 0);
+
+ igc_ptp_clear_tx_tstamp(adapter);
}
static void igc_ptp_enable_tx_timestamp(struct igc_adapter *adapter)
@@ -620,6 +636,9 @@ void igc_ptp_tx_hang(struct igc_adapter *adapter)
{
unsigned long flags;
+ if (adapter->tstamp_config.tx_type != HWTSTAMP_TX_ON)
+ return;
+
spin_lock_irqsave(&adapter->ptp_tx_lock, flags);
if (!adapter->ptp_tx_skb)
@@ -1026,9 +1045,7 @@ void igc_ptp_suspend(struct igc_adapter *adapter)
if (!(adapter->ptp_flags & IGC_PTP_ENABLED))
return;
- cancel_work_sync(&adapter->ptp_tx_work);
- dev_kfree_skb_any(adapter->ptp_tx_skb);
- adapter->ptp_tx_skb = NULL;
+ igc_ptp_clear_tx_tstamp(adapter);
if (pci_device_is_present(adapter->pdev)) {
igc_ptp_time_save(adapter);
--
2.38.1
^ permalink raw reply related [flat|nested] 12+ messages in thread* Re: [PATCH net 2/4] igc: Check if hardware TX timestamping is enabled earlier
2023-05-30 17:49 ` [PATCH net 2/4] igc: Check if hardware TX timestamping is enabled earlier Tony Nguyen
@ 2023-06-01 6:10 ` Jakub Kicinski
2023-06-01 21:21 ` Vinicius Costa Gomes
0 siblings, 1 reply; 12+ messages in thread
From: Jakub Kicinski @ 2023-06-01 6:10 UTC (permalink / raw)
To: Tony Nguyen
Cc: davem, pabeni, edumazet, netdev, Vinicius Costa Gomes,
sasha.neftin, richardcochran, Vladimir Oltean, Naama Meir
On Tue, 30 May 2023 10:49:26 -0700 Tony Nguyen wrote:
> - if (unlikely(skb_shinfo(skb)->tx_flags & SKBTX_HW_TSTAMP)) {
> + if (unlikely(adapter->tstamp_config.tx_type == HWTSTAMP_TX_ON &&
> + skb_shinfo(skb)->tx_flags & SKBTX_HW_TSTAMP)) {
> /* FIXME: add support for retrieving timestamps from
> * the other timer registers before skipping the
> * timestamping request.
> @@ -1586,7 +1587,7 @@ static netdev_tx_t igc_xmit_frame_ring(struct sk_buff *skb,
> unsigned long flags;
>
> spin_lock_irqsave(&adapter->ptp_tx_lock, flags);
> - if (adapter->tstamp_config.tx_type == HWTSTAMP_TX_ON && !adapter->ptp_tx_skb) {
> + if (!adapter->ptp_tx_skb) {
AFAICT the cancel / cleanup path is not synchronized (I mean for
accesses to adapter->tstamp_config) so this looks racy to me :(
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: [PATCH net 2/4] igc: Check if hardware TX timestamping is enabled earlier
2023-06-01 6:10 ` Jakub Kicinski
@ 2023-06-01 21:21 ` Vinicius Costa Gomes
2023-06-02 3:55 ` Jakub Kicinski
0 siblings, 1 reply; 12+ messages in thread
From: Vinicius Costa Gomes @ 2023-06-01 21:21 UTC (permalink / raw)
To: Jakub Kicinski, Tony Nguyen
Cc: davem, pabeni, edumazet, netdev, sasha.neftin, richardcochran,
Vladimir Oltean, Naama Meir
Hi,
Jakub Kicinski <kuba@kernel.org> writes:
> On Tue, 30 May 2023 10:49:26 -0700 Tony Nguyen wrote:
>> - if (unlikely(skb_shinfo(skb)->tx_flags & SKBTX_HW_TSTAMP)) {
>> + if (unlikely(adapter->tstamp_config.tx_type == HWTSTAMP_TX_ON &&
>> + skb_shinfo(skb)->tx_flags & SKBTX_HW_TSTAMP)) {
>> /* FIXME: add support for retrieving timestamps from
>> * the other timer registers before skipping the
>> * timestamping request.
>> @@ -1586,7 +1587,7 @@ static netdev_tx_t igc_xmit_frame_ring(struct sk_buff *skb,
>> unsigned long flags;
>>
>> spin_lock_irqsave(&adapter->ptp_tx_lock, flags);
>> - if (adapter->tstamp_config.tx_type == HWTSTAMP_TX_ON && !adapter->ptp_tx_skb) {
>> + if (!adapter->ptp_tx_skb) {
>
> AFAICT the cancel / cleanup path is not synchronized (I mean for
> accesses to adapter->tstamp_config) so this looks racy to me :(
>
As far as I can see, the racy behavior wasn't introduced here, can I
propose the fix as a follow up patch? Or do you prefer that I re-spin
this series?
Cheers,
--
Vinicius
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: [PATCH net 2/4] igc: Check if hardware TX timestamping is enabled earlier
2023-06-01 21:21 ` Vinicius Costa Gomes
@ 2023-06-02 3:55 ` Jakub Kicinski
2023-06-02 17:56 ` Vinicius Costa Gomes
0 siblings, 1 reply; 12+ messages in thread
From: Jakub Kicinski @ 2023-06-02 3:55 UTC (permalink / raw)
To: Vinicius Costa Gomes
Cc: Tony Nguyen, davem, pabeni, edumazet, netdev, sasha.neftin,
richardcochran, Vladimir Oltean, Naama Meir
On Thu, 01 Jun 2023 14:21:35 -0700 Vinicius Costa Gomes wrote:
> > AFAICT the cancel / cleanup path is not synchronized (I mean for
> > accesses to adapter->tstamp_config) so this looks racy to me :(
>
> As far as I can see, the racy behavior wasn't introduced here, can I
> propose the fix as a follow up patch? Or do you prefer that I re-spin
> this series?
I think respin would be better, you're rejigging the synchronization
here, who knows if you won't have to rejig differently to cover this
case.
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH net 2/4] igc: Check if hardware TX timestamping is enabled earlier
2023-06-02 3:55 ` Jakub Kicinski
@ 2023-06-02 17:56 ` Vinicius Costa Gomes
0 siblings, 0 replies; 12+ messages in thread
From: Vinicius Costa Gomes @ 2023-06-02 17:56 UTC (permalink / raw)
To: Jakub Kicinski
Cc: Tony Nguyen, davem, pabeni, edumazet, netdev, sasha.neftin,
richardcochran, Vladimir Oltean, Naama Meir
Jakub Kicinski <kuba@kernel.org> writes:
> On Thu, 01 Jun 2023 14:21:35 -0700 Vinicius Costa Gomes wrote:
>> > AFAICT the cancel / cleanup path is not synchronized (I mean for
>> > accesses to adapter->tstamp_config) so this looks racy to me :(
>>
>> As far as I can see, the racy behavior wasn't introduced here, can I
>> propose the fix as a follow up patch? Or do you prefer that I re-spin
>> this series?
>
> I think respin would be better, you're rejigging the synchronization
> here, who knows if you won't have to rejig differently to cover this
> case.
Makes sense. Will do that.
Cheers,
--
Vinicius
^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH net 3/4] igc: Retrieve TX timestamp during interrupt handling
2023-05-30 17:49 [PATCH net 0/4][pull request] igc: TX timestamping fixes Tony Nguyen
2023-05-30 17:49 ` [PATCH net 1/4] igc: Fix race condition in PTP tx code Tony Nguyen
2023-05-30 17:49 ` [PATCH net 2/4] igc: Check if hardware TX timestamping is enabled earlier Tony Nguyen
@ 2023-05-30 17:49 ` Tony Nguyen
2023-06-05 11:16 ` Marc Kleine-Budde
2023-05-30 17:49 ` [PATCH net 4/4] igc: Add workaround for missing timestamps Tony Nguyen
3 siblings, 1 reply; 12+ messages in thread
From: Tony Nguyen @ 2023-05-30 17:49 UTC (permalink / raw)
To: davem, kuba, pabeni, edumazet, netdev
Cc: Vinicius Costa Gomes, anthony.l.nguyen, sasha.neftin,
richardcochran, Kurt Kanzenbach, Naama Meir
From: Vinicius Costa Gomes <vinicius.gomes@intel.com>
When the interrupt is handled, the TXTT_0 bit in the TSYNCTXCTL
register should already be set and the timestamp value already loaded
in the appropriate register.
This simplifies the handling, and reduces the latency for retrieving
the TX timestamp, which increase the amount of TX timestamps that can
be handled in a given time period.
Signed-off-by: Vinicius Costa Gomes <vinicius.gomes@intel.com>
Reviewed-by: Kurt Kanzenbach <kurt@linutronix.de>
Tested-by: Naama Meir <naamax.meir@linux.intel.com>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
---
drivers/net/ethernet/intel/igc/igc.h | 2 +-
drivers/net/ethernet/intel/igc/igc_main.c | 2 +-
drivers/net/ethernet/intel/igc/igc_ptp.c | 9 ++-------
3 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/drivers/net/ethernet/intel/igc/igc.h b/drivers/net/ethernet/intel/igc/igc.h
index 7da0657ea48f..be1a1e67c39b 100644
--- a/drivers/net/ethernet/intel/igc/igc.h
+++ b/drivers/net/ethernet/intel/igc/igc.h
@@ -228,7 +228,6 @@ struct igc_adapter {
struct ptp_clock *ptp_clock;
struct ptp_clock_info ptp_caps;
- struct work_struct ptp_tx_work;
/* Access to ptp_tx_skb and ptp_tx_start are protected by the
* ptp_tx_lock.
*/
@@ -637,6 +636,7 @@ int igc_ptp_set_ts_config(struct net_device *netdev, struct ifreq *ifr);
int igc_ptp_get_ts_config(struct net_device *netdev, struct ifreq *ifr);
void igc_ptp_tx_hang(struct igc_adapter *adapter);
void igc_ptp_read(struct igc_adapter *adapter, struct timespec64 *ts);
+void igc_ptp_tx_work(struct igc_adapter *adapter);
#define igc_rx_pg_size(_ring) (PAGE_SIZE << igc_rx_pg_order(_ring))
diff --git a/drivers/net/ethernet/intel/igc/igc_main.c b/drivers/net/ethernet/intel/igc/igc_main.c
index b383352651a5..e6880b6ea187 100644
--- a/drivers/net/ethernet/intel/igc/igc_main.c
+++ b/drivers/net/ethernet/intel/igc/igc_main.c
@@ -5216,7 +5216,7 @@ static void igc_tsync_interrupt(struct igc_adapter *adapter)
if (tsicr & IGC_TSICR_TXTS) {
/* retrieve hardware timestamp */
- schedule_work(&adapter->ptp_tx_work);
+ igc_ptp_tx_work(adapter);
ack |= IGC_TSICR_TXTS;
}
diff --git a/drivers/net/ethernet/intel/igc/igc_ptp.c b/drivers/net/ethernet/intel/igc/igc_ptp.c
index 4dd0eec5a246..17e8970bd761 100644
--- a/drivers/net/ethernet/intel/igc/igc_ptp.c
+++ b/drivers/net/ethernet/intel/igc/igc_ptp.c
@@ -540,8 +540,6 @@ static void igc_ptp_clear_tx_tstamp(struct igc_adapter *adapter)
{
unsigned long flags;
- cancel_work_sync(&adapter->ptp_tx_work);
-
spin_lock_irqsave(&adapter->ptp_tx_lock, flags);
dev_kfree_skb_any(adapter->ptp_tx_skb);
@@ -706,15 +704,13 @@ static void igc_ptp_tx_hwtstamp(struct igc_adapter *adapter)
/**
* igc_ptp_tx_work
- * @work: pointer to work struct
+ * @adapter: board private structure
*
* This work function checks the TSYNCTXCTL valid bit to determine when
* a timestamp has been taken for the current stored skb.
*/
-static void igc_ptp_tx_work(struct work_struct *work)
+void igc_ptp_tx_work(struct igc_adapter *adapter)
{
- struct igc_adapter *adapter = container_of(work, struct igc_adapter,
- ptp_tx_work);
struct igc_hw *hw = &adapter->hw;
unsigned long flags;
u32 tsynctxctl;
@@ -985,7 +981,6 @@ void igc_ptp_init(struct igc_adapter *adapter)
spin_lock_init(&adapter->ptp_tx_lock);
spin_lock_init(&adapter->tmreg_lock);
- INIT_WORK(&adapter->ptp_tx_work, igc_ptp_tx_work);
adapter->tstamp_config.rx_filter = HWTSTAMP_FILTER_NONE;
adapter->tstamp_config.tx_type = HWTSTAMP_TX_OFF;
--
2.38.1
^ permalink raw reply related [flat|nested] 12+ messages in thread* Re: [PATCH net 3/4] igc: Retrieve TX timestamp during interrupt handling
2023-05-30 17:49 ` [PATCH net 3/4] igc: Retrieve TX timestamp during interrupt handling Tony Nguyen
@ 2023-06-05 11:16 ` Marc Kleine-Budde
2023-06-05 18:11 ` Vinicius Costa Gomes
0 siblings, 1 reply; 12+ messages in thread
From: Marc Kleine-Budde @ 2023-06-05 11:16 UTC (permalink / raw)
To: Tony Nguyen
Cc: davem, kuba, pabeni, edumazet, netdev, Vinicius Costa Gomes,
sasha.neftin, richardcochran, Kurt Kanzenbach, Naama Meir
[-- Attachment #1: Type: text/plain, Size: 885 bytes --]
On 30.05.2023 10:49:27, Tony Nguyen wrote:
> From: Vinicius Costa Gomes <vinicius.gomes@intel.com>
>
> When the interrupt is handled, the TXTT_0 bit in the TSYNCTXCTL
> register should already be set and the timestamp value already loaded
> in the appropriate register.
>
> This simplifies the handling, and reduces the latency for retrieving
> the TX timestamp, which increase the amount of TX timestamps that can
> be handled in a given time period.
What about renaming the igc_ptp_tx_work() function, as it's not
scheduled work anymore, also IMHO you should update the function's
comment.
Marc
--
Pengutronix e.K. | Marc Kleine-Budde |
Embedded Linux | https://www.pengutronix.de |
Vertretung Nürnberg | Phone: +49-5121-206917-129 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-9 |
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH net 3/4] igc: Retrieve TX timestamp during interrupt handling
2023-06-05 11:16 ` Marc Kleine-Budde
@ 2023-06-05 18:11 ` Vinicius Costa Gomes
0 siblings, 0 replies; 12+ messages in thread
From: Vinicius Costa Gomes @ 2023-06-05 18:11 UTC (permalink / raw)
To: Marc Kleine-Budde, Tony Nguyen
Cc: davem, kuba, pabeni, edumazet, netdev, sasha.neftin,
richardcochran, Kurt Kanzenbach, Naama Meir
Marc Kleine-Budde <mkl@pengutronix.de> writes:
> On 30.05.2023 10:49:27, Tony Nguyen wrote:
>> From: Vinicius Costa Gomes <vinicius.gomes@intel.com>
>>
>> When the interrupt is handled, the TXTT_0 bit in the TSYNCTXCTL
>> register should already be set and the timestamp value already loaded
>> in the appropriate register.
>>
>> This simplifies the handling, and reduces the latency for retrieving
>> the TX timestamp, which increase the amount of TX timestamps that can
>> be handled in a given time period.
>
> What about renaming the igc_ptp_tx_work() function, as it's not
> scheduled work anymore, also IMHO you should update the function's
> comment.
Will rename the function and fix the comment for v2. Thanks.
>
> Marc
>
> --
> Pengutronix e.K. | Marc Kleine-Budde |
> Embedded Linux | https://www.pengutronix.de |
> Vertretung Nürnberg | Phone: +49-5121-206917-129 |
> Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-9 |
Cheers,
--
Vinicius
^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH net 4/4] igc: Add workaround for missing timestamps
2023-05-30 17:49 [PATCH net 0/4][pull request] igc: TX timestamping fixes Tony Nguyen
` (2 preceding siblings ...)
2023-05-30 17:49 ` [PATCH net 3/4] igc: Retrieve TX timestamp during interrupt handling Tony Nguyen
@ 2023-05-30 17:49 ` Tony Nguyen
3 siblings, 0 replies; 12+ messages in thread
From: Tony Nguyen @ 2023-05-30 17:49 UTC (permalink / raw)
To: davem, kuba, pabeni, edumazet, netdev
Cc: Vinicius Costa Gomes, anthony.l.nguyen, sasha.neftin,
richardcochran, Naama Meir
From: Vinicius Costa Gomes <vinicius.gomes@intel.com>
There's an hardware issue that can cause missing timestamps. The bug
is that the interrupt is only cleared if the IGC_TXSTMPH_0 register is
read.
The bug can cause a race condition if a timestamp is captured at the
wrong time, and we will miss that timestamp. To reduce the time window
that the problem is able to happen, in case no timestamp was ready, we
read the "previous" value of the timestamp registers, and we compare
with the "current" one, if it didn't change we can reasonably sure
that no timestamp was captured. If they are different, we use the new
value as the captured timestamp.
This workaround has more impact when multiple timestamp registers are
used, and the IGC_TXSTMPH_0 register always need to be read, so the
interrupt is cleared.
Fixes: 2c344ae24501 ("igc: Add support for TX timestamping")
Signed-off-by: Vinicius Costa Gomes <vinicius.gomes@intel.com>
Tested-by: Naama Meir <naamax.meir@linux.intel.com>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
---
drivers/net/ethernet/intel/igc/igc_ptp.c | 48 ++++++++++++++++++------
1 file changed, 37 insertions(+), 11 deletions(-)
diff --git a/drivers/net/ethernet/intel/igc/igc_ptp.c b/drivers/net/ethernet/intel/igc/igc_ptp.c
index 17e8970bd761..47a2140f9144 100644
--- a/drivers/net/ethernet/intel/igc/igc_ptp.c
+++ b/drivers/net/ethernet/intel/igc/igc_ptp.c
@@ -666,14 +666,49 @@ static void igc_ptp_tx_hwtstamp(struct igc_adapter *adapter)
struct sk_buff *skb = adapter->ptp_tx_skb;
struct skb_shared_hwtstamps shhwtstamps;
struct igc_hw *hw = &adapter->hw;
+ u32 tsynctxctl;
int adjust = 0;
u64 regval;
if (WARN_ON_ONCE(!skb))
return;
- regval = rd32(IGC_TXSTMPL);
- regval |= (u64)rd32(IGC_TXSTMPH) << 32;
+ tsynctxctl = rd32(IGC_TSYNCTXCTL);
+ tsynctxctl &= IGC_TSYNCTXCTL_TXTT_0;
+ if (tsynctxctl) {
+ regval = rd32(IGC_TXSTMPL);
+ regval |= (u64)rd32(IGC_TXSTMPH) << 32;
+ } else {
+ /* There's a bug in the hardware that could cause
+ * missing interrupts for TX timestamping. The issue
+ * is that for new interrupts to be triggered, the
+ * IGC_TXSTMPH_0 register must be read.
+ *
+ * To avoid discarding a valid timestamp that just
+ * happened at the "wrong" time, we need to confirm
+ * that there was no timestamp captured, we do that by
+ * assuming that no two timestamps in sequence have
+ * the same nanosecond value.
+ *
+ * So, we read the "low" register, read the "high"
+ * register (to latch a new timestamp) and read the
+ * "low" register again, if "old" and "new" versions
+ * of the "low" register are different, a valid
+ * timestamp was captured, we can read the "high"
+ * register again.
+ */
+ u32 txstmpl_old, txstmpl_new;
+
+ txstmpl_old = rd32(IGC_TXSTMPL);
+ rd32(IGC_TXSTMPH);
+ txstmpl_new = rd32(IGC_TXSTMPL);
+
+ if (txstmpl_old == txstmpl_new)
+ return;
+
+ regval = txstmpl_new;
+ regval |= (u64)rd32(IGC_TXSTMPH) << 32;
+ }
if (igc_ptp_systim_to_hwtstamp(adapter, &shhwtstamps, regval))
return;
@@ -711,22 +746,13 @@ static void igc_ptp_tx_hwtstamp(struct igc_adapter *adapter)
*/
void igc_ptp_tx_work(struct igc_adapter *adapter)
{
- struct igc_hw *hw = &adapter->hw;
unsigned long flags;
- u32 tsynctxctl;
spin_lock_irqsave(&adapter->ptp_tx_lock, flags);
if (!adapter->ptp_tx_skb)
goto unlock;
- tsynctxctl = rd32(IGC_TSYNCTXCTL);
- tsynctxctl &= IGC_TSYNCTXCTL_TXTT_0;
- if (!tsynctxctl) {
- WARN_ONCE(1, "Received a TSTAMP interrupt but no TSTAMP is ready.\n");
- goto unlock;
- }
-
igc_ptp_tx_hwtstamp(adapter);
unlock:
--
2.38.1
^ permalink raw reply related [flat|nested] 12+ messages in thread