This is a note to let you know that I've just added the patch titled dpaa_eth: copy timestamp fields to new skb in A-050385 workaround to the 5.9-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: dpaa_eth-copy-timestamp-fields-to-new-skb-in-a-050385-workaround.patch and it can be found in the queue-5.9 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable@xxxxxxxxxxxxxxx> know about it. >From foo@baz Sun Dec 6 10:19:03 AM CET 2020 From: Yangbo Lu <yangbo.lu@xxxxxxx> Date: Tue, 1 Dec 2020 15:52:58 +0800 Subject: dpaa_eth: copy timestamp fields to new skb in A-050385 workaround From: Yangbo Lu <yangbo.lu@xxxxxxx> [ Upstream commit 07500a6085806d97039ebcba8d9b8b29129f0106 ] The timestamp fields should be copied to new skb too in A-050385 workaround for later TX timestamping handling. Fixes: 3c68b8fffb48 ("dpaa_eth: FMan erratum A050385 workaround") Signed-off-by: Yangbo Lu <yangbo.lu@xxxxxxx> Acked-by: Camelia Groza <camelia.groza@xxxxxxx> Link: https://lore.kernel.org/r/20201201075258.1875-1-yangbo.lu@xxxxxxx Signed-off-by: Jakub Kicinski <kuba@xxxxxxxxxx> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- drivers/net/ethernet/freescale/dpaa/dpaa_eth.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) --- a/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c +++ b/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c @@ -2120,6 +2120,15 @@ workaround: skb_copy_header(new_skb, skb); new_skb->dev = skb->dev; + /* Copy relevant timestamp info from the old skb to the new */ + if (priv->tx_tstamp) { + skb_shinfo(new_skb)->tx_flags = skb_shinfo(skb)->tx_flags; + skb_shinfo(new_skb)->hwtstamps = skb_shinfo(skb)->hwtstamps; + skb_shinfo(new_skb)->tskey = skb_shinfo(skb)->tskey; + if (skb->sk) + skb_set_owner_w(new_skb, skb->sk); + } + /* We move the headroom when we align it so we have to reset the * network and transport header offsets relative to the new data * pointer. The checksum offload relies on these offsets. @@ -2127,7 +2136,6 @@ workaround: skb_set_network_header(new_skb, skb_network_offset(skb)); skb_set_transport_header(new_skb, skb_transport_offset(skb)); - /* TODO: does timestamping need the result in the old skb? */ dev_kfree_skb(skb); *s = new_skb; Patches currently in stable-queue which might be from yangbo.lu@xxxxxxx are queue-5.9/dpaa_eth-copy-timestamp-fields-to-new-skb-in-a-050385-workaround.patch