]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
i40e: free the skb after clearing the bitlock
authorJacob Keller <jacob.e.keller@intel.com>
Thu, 10 May 2018 12:59:48 +0000 (05:59 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 3 Aug 2018 05:47:52 +0000 (07:47 +0200)
commit69596fc961e0fc66342fe7c663f98b5bc40f926c
treefd1873aca173c3898d3792cbd2e82a2239f18319
parentfbaa721c180c09dc23408eb76e31720e7d4559f8
i40e: free the skb after clearing the bitlock

[ Upstream commit c79756cb5f084736b138da9319a02f7c72644548 ]

In commit bbc4e7d273b5 ("i40e: fix race condition with PTP_TX_IN_PROGRESS
bits") we modified the code which handles Tx timestamps so that we would
clear the progress bit as soon as possible.

A later commit 0bc0706b46cd ("i40e: check for Tx timestamp timeouts during
watchdog") introduced similar code for detecting and handling cleanup of
a blocked Tx timestamp. This code did not use the same pattern for cleaning
up the skb.

Update this code to wait to free the skb until after the bit lock is
free, by first setting the ptp_tx_skb to NULL and clearing the lock.

Signed-off-by: Jacob Keller <jacob.e.keller@intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/net/ethernet/intel/i40e/i40e_ptp.c