summaryrefslogtreecommitdiff
path: root/drivers/net
diff options
context:
space:
mode:
authorBrett Creeley <brett.creeley@amd.com>2024-02-29 11:39:29 -0800
committerDavid S. Miller <davem@davemloft.net>2024-03-04 09:38:13 +0000
commit138506ab249b7ac7856cb7a5a536a4b61a7a4ae1 (patch)
tree70a3b2563bb7d40ea4f643550c7cdee0d3cb0ffb /drivers/net
parentbc581273fead93ccc918b8c9a5b8a9f60b1ee836 (diff)
ionic: Check stop no restart
If there is a lot of transmit traffic the driver can get into a situation that the device is starved due to the doorbell never being rung. This can happen if xmit_more is set constantly and __netdev_tx_sent_queue() keeps returning false. Fix this by checking if the queue needs to be stopped right before calling __netdev_tx_sent_queue(). Use MAX_SKB_FRAGS + 1 as the stop condition because that's the maximum number of frags supported for non-TSO transmit. Signed-off-by: Brett Creeley <brett.creeley@amd.com> Signed-off-by: Shannon Nelson <shannon.nelson@amd.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/ethernet/pensando/ionic/ionic_txrx.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/net/ethernet/pensando/ionic/ionic_txrx.c b/drivers/net/ethernet/pensando/ionic/ionic_txrx.c
index 1397a0dcf794..d9e23fc78e6b 100644
--- a/drivers/net/ethernet/pensando/ionic/ionic_txrx.c
+++ b/drivers/net/ethernet/pensando/ionic/ionic_txrx.c
@@ -1665,9 +1665,14 @@ static int ionic_tx(struct ionic_queue *q, struct sk_buff *skb)
stats->pkts++;
stats->bytes += skb->len;
- if (!ionic_txq_hwstamp_enabled(q))
- ring_dbell = __netdev_tx_sent_queue(q_to_ndq(q), skb->len,
+ if (!ionic_txq_hwstamp_enabled(q)) {
+ struct netdev_queue *ndq = q_to_ndq(q);
+
+ if (unlikely(!ionic_q_has_space(q, MAX_SKB_FRAGS + 1)))
+ netif_tx_stop_queue(ndq);
+ ring_dbell = __netdev_tx_sent_queue(ndq, skb->len,
netdev_xmit_more());
+ }
ionic_txq_post(q, ring_dbell, ionic_tx_clean, skb);
return 0;