Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 151b260c authored by Jakub Kicinski's avatar Jakub Kicinski Committed by Jeff Kirsher
Browse files

ixgbe: fix race conditions on queuing skb for HW time stamp 



ixgbe has a single set of TX time stamping resources per NIC.
Use a simple bit lock to avoid race conditions and leaking skbs
when multiple TX rings try to claim time stamping.

Signed-off-by: default avatarJakub Kicinski <kubakici@wp.pl>
Tested-by: default avatarPhil Schmitt <phillip.j.schmitt@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent ff29a86e

drivers/net/ethernet/intel/ixgbe/ixgbe.h

+1 −0
Original line number Diff line number Diff line
@@ -812,6 +812,7 @@ enum ixgbe_state_t { 
	__IXGBE_SERVICE_SCHED,

	__IXGBE_IN_SFP_INIT,

	__IXGBE_PTP_RUNNING,

	__IXGBE_PTP_TX_IN_PROGRESS,

};



struct ixgbe_cb {

drivers/net/ethernet/intel/ixgbe/ixgbe_main.c

+3 −1
Original line number Diff line number Diff line
@@ -7042,7 +7042,9 @@ netdev_tx_t ixgbe_xmit_frame_ring(struct sk_buff *skb, 
		tx_flags |= IXGBE_TX_FLAGS_SW_VLAN;

	}



	if (unlikely(skb_shinfo(skb)->tx_flags & SKBTX_HW_TSTAMP)) {

	if (unlikely(skb_shinfo(skb)->tx_flags & SKBTX_HW_TSTAMP &&

		     !test_and_set_bit_lock(__IXGBE_PTP_TX_IN_PROGRESS,

					    &adapter->state))) {

		skb_shinfo(skb)->tx_flags |= SKBTX_IN_PROGRESS;

		tx_flags |= IXGBE_TX_FLAGS_TSTAMP;

drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c

+3 −0
Original line number Diff line number Diff line
@@ -493,6 +493,7 @@ static void ixgbe_ptp_tx_hwtstamp(struct ixgbe_adapter *adapter) 


	dev_kfree_skb_any(adapter->ptp_tx_skb);

	adapter->ptp_tx_skb = NULL;

	clear_bit_unlock(__IXGBE_PTP_TX_IN_PROGRESS, &adapter->state);

}



/**
@@ -515,6 +516,7 @@ static void ixgbe_ptp_tx_hwtstamp_work(struct work_struct *work) 
	if (timeout) {

		dev_kfree_skb_any(adapter->ptp_tx_skb);

		adapter->ptp_tx_skb = NULL;

		clear_bit_unlock(__IXGBE_PTP_TX_IN_PROGRESS, &adapter->state);

		e_warn(drv, "clearing Tx Timestamp hang");

		return;

	}
@@ -925,6 +927,7 @@ void ixgbe_ptp_stop(struct ixgbe_adapter *adapter) 
	if (adapter->ptp_tx_skb) {

		dev_kfree_skb_any(adapter->ptp_tx_skb);

		adapter->ptp_tx_skb = NULL;

		clear_bit_unlock(__IXGBE_PTP_TX_IN_PROGRESS, &adapter->state);

	}



	if (adapter->ptp_clock) {