Commit 179542a9 authored by Jason Xing's avatar Jason Xing Committed by Jakub Kicinski
Browse files

net: thunder: make tx software timestamp independent 



skb_tx_timestamp() is used for tx software timestamp enabled by
SOF_TIMESTAMPING_TX_SOFTWARE while SKBTX_HW_TSTAMP is used for
SOF_TIMESTAMPING_TX_HARDWARE. As it clearly shows they are different
timestamps in two dimensions, it's not appropriate to group these two
together in the if-statement.

This patch completes three things:
1. make the software one standalone. Users are able to set both
timestamps together with SOF_TIMESTAMPING_OPT_TX_SWHW flag.
2. make the software one generated after the hardware timestamp logic to
avoid generating sw and hw timestamps at one time without
SOF_TIMESTAMPING_OPT_TX_SWHW being set.
3. move the software timestamp call as close to the door bell.

Signed-off-by: default avatarJason Xing <kernelxing@tencent.com>
Reviewed-by: default avatarWillem de Bruijn <willemb@google.com>
Link: https://patch.msgid.link/20250508034433.14408-1-kerneljasonxing@gmail.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent a9ce2ce1

drivers/net/ethernet/cavium/thunder/nicvf_queues.c

+4 −4
Original line number Diff line number Diff line
@@ -1389,11 +1389,9 @@ nicvf_sq_add_hdr_subdesc(struct nicvf *nic, struct snd_queue *sq, int qentry, 
		this_cpu_inc(nic->pnicvf->drv_stats->tx_tso);

	}



	/* Check if timestamp is requested */

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

		skb_tx_timestamp(skb);

	/* Check if hw timestamp is requested */

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

		return;

	}



	/* Tx timestamping not supported along with TSO, so ignore request */

	if (skb_shinfo(skb)->gso_size)
@@ -1472,6 +1470,8 @@ static inline void nicvf_sq_doorbell(struct nicvf *nic, struct sk_buff *skb, 


	netdev_tx_sent_queue(txq, skb->len);



	skb_tx_timestamp(skb);



	/* make sure all memory stores are done before ringing doorbell */

	smp_wmb();