Skip to content

Commit 4c69c77

Browse files
jahay1anguy11
authored andcommitted
idpf: set completion tag for "empty" bufs associated with a packet
Commit d9028db ("idpf: convert to libeth Tx buffer completion") inadvertently removed code that was necessary for the tx buffer cleaning routine to iterate over all buffers associated with a packet. When a frag is too large for a single data descriptor, it will be split across multiple data descriptors. This means the frag will span multiple buffers in the buffer ring in order to keep the descriptor and buffer ring indexes aligned. The buffer entries in the ring are technically empty and no cleaning actions need to be performed. These empty buffers can precede other frags associated with the same packet. I.e. a single packet on the buffer ring can look like: buf[0]=skb0.frag0 buf[1]=skb0.frag1 buf[2]=empty buf[3]=skb0.frag2 The cleaning routine iterates through these buffers based on a matching completion tag. If the completion tag is not set for buf2, the loop will end prematurely. Frag2 will be left uncleaned and next_to_clean will be left pointing to the end of packet, which will break the cleaning logic for subsequent cleans. This consequently leads to tx timeouts. Assign the empty bufs the same completion tag for the packet to ensure the cleaning routine iterates over all of the buffers associated with the packet. Fixes: d9028db ("idpf: convert to libeth Tx buffer completion") Signed-off-by: Joshua Hay <[email protected]> Acked-by: Alexander Lobakin <[email protected]> Reviewed-by: Madhu chittim <[email protected]> Reviewed-by: Simon Horman <[email protected]> Tested-by: Krishneil Singh <[email protected]> Signed-off-by: Tony Nguyen <[email protected]>
1 parent 761e0be commit 4c69c77

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

drivers/net/ethernet/intel/idpf/idpf_txrx.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2448,6 +2448,7 @@ static void idpf_tx_splitq_map(struct idpf_tx_queue *tx_q,
24482448
* rest of the packet.
24492449
*/
24502450
tx_buf->type = LIBETH_SQE_EMPTY;
2451+
idpf_tx_buf_compl_tag(tx_buf) = params->compl_tag;
24512452

24522453
/* Adjust the DMA offset and the remaining size of the
24532454
* fragment. On the first iteration of this loop,

0 commit comments

Comments
 (0)