Commit 95b68148 authored by Kurt Kanzenbach's avatar Kurt Kanzenbach Committed by Tony Nguyen
Browse files

igc: Avoid transmit queue timeout for XDP 



High XDP load triggers the netdev watchdog:

|NETDEV WATCHDOG: enp3s0 (igc): transmit queue 2 timed out

The reason is the Tx queue transmission start (txq->trans_start) is not updated
in XDP code path. Therefore, add it for all XDP transmission functions.

Signed-off-by: default avatarKurt Kanzenbach <kurt@linutronix.de>
Tested-by: default avatarNaama Meir <naamax.meir@linux.intel.com>
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
parent 02f8fc1a

drivers/net/ethernet/intel/igc/igc_main.c

+8 −0
Original line number Diff line number Diff line
@@ -2411,6 +2411,8 @@ static int igc_xdp_xmit_back(struct igc_adapter *adapter, struct xdp_buff *xdp) 
	nq = txring_txq(ring);



	__netif_tx_lock(nq, cpu);

	/* Avoid transmit queue timeout since we share it with the slow path */

	txq_trans_cond_update(nq);

	res = igc_xdp_init_tx_descriptor(ring, xdpf);

	__netif_tx_unlock(nq);

	return res;
@@ -2829,6 +2831,9 @@ static void igc_xdp_xmit_zc(struct igc_ring *ring) 


	__netif_tx_lock(nq, cpu);



	/* Avoid transmit queue timeout since we share it with the slow path */

	txq_trans_cond_update(nq);



	budget = igc_desc_unused(ring);



	while (xsk_tx_peek_desc(pool, &xdp_desc) && budget--) {
@@ -6354,6 +6359,9 @@ static int igc_xdp_xmit(struct net_device *dev, int num_frames, 


	__netif_tx_lock(nq, cpu);



	/* Avoid transmit queue timeout since we share it with the slow path */

	txq_trans_cond_update(nq);



	drops = 0;

	for (i = 0; i < num_frames; i++) {

		int err;