Commit 17a12eaa authored by Ilias Apalodimas's avatar Ilias Apalodimas Committed by David S. Miller

net: socionext: correctly recover txq after being full

Running pktgen with packets sizes > 512b ends up in the interface Txq
getting stuck.
"netsec 522d0000.ethernet eth0: netsec_netdev_start_xmit: TxQFull!"
appears on dmesg but the interface never recovers. It requires an
ifconfig down/up to make the interface usable again.

The reason that triggers this, is a race condition between
.ndo_start_xmit and the napi completion. The available budget is
calculated first and indicates the queue is full. Due to a costly
netif_err() the queue is not stopped in time while the napi completion
runs, clears the irq and frees up descriptors, thus the queue never wakes
up again.

Fix this by moving the print after stopping the queue, make the print
ratelimited, add barriers and check for cleaned descriptors..
Signed-off-by: default avatarIlias Apalodimas <ilias.apalodimas@linaro.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1811caa0
...@@ -656,8 +656,13 @@ static int netsec_process_tx(struct netsec_priv *priv, int budget) ...@@ -656,8 +656,13 @@ static int netsec_process_tx(struct netsec_priv *priv, int budget)
budget -= new; budget -= new;
} while (new); } while (new);
if (done && netif_queue_stopped(ndev)) if (done && netif_queue_stopped(ndev)) {
/* Make sure we update the value, anyone stopping the queue
* after this will read the proper consumer idx
*/
smp_wmb();
netif_wake_queue(ndev); netif_wake_queue(ndev);
}
return done; return done;
} }
...@@ -877,6 +882,41 @@ static void netsec_set_tx_de(struct netsec_priv *priv, ...@@ -877,6 +882,41 @@ static void netsec_set_tx_de(struct netsec_priv *priv,
dring->head = (dring->head + 1) % DESC_NUM; dring->head = (dring->head + 1) % DESC_NUM;
} }
static int netsec_desc_used(struct netsec_desc_ring *dring)
{
int used;
if (dring->head >= dring->tail)
used = dring->head - dring->tail;
else
used = dring->head + DESC_NUM - dring->tail;
return used;
}
static int netsec_check_stop_tx(struct netsec_priv *priv, int used)
{
struct netsec_desc_ring *dring = &priv->desc_ring[NETSEC_RING_TX];
/* keep tail from touching the queue */
if (DESC_NUM - used < 2) {
netif_stop_queue(priv->ndev);
/* Make sure we read the updated value in case
* descriptors got freed
*/
smp_rmb();
used = netsec_desc_used(dring);
if (DESC_NUM - used < 2)
return NETDEV_TX_BUSY;
netif_wake_queue(priv->ndev);
}
return 0;
}
static netdev_tx_t netsec_netdev_start_xmit(struct sk_buff *skb, static netdev_tx_t netsec_netdev_start_xmit(struct sk_buff *skb,
struct net_device *ndev) struct net_device *ndev)
{ {
...@@ -887,16 +927,10 @@ static netdev_tx_t netsec_netdev_start_xmit(struct sk_buff *skb, ...@@ -887,16 +927,10 @@ static netdev_tx_t netsec_netdev_start_xmit(struct sk_buff *skb,
u16 tso_seg_len = 0; u16 tso_seg_len = 0;
int filled; int filled;
/* differentiate between full/emtpy ring */ filled = netsec_desc_used(dring);
if (dring->head >= dring->tail) if (netsec_check_stop_tx(priv, filled)) {
filled = dring->head - dring->tail; net_warn_ratelimited("%s %s Tx queue full\n",
else dev_name(priv->dev), ndev->name);
filled = dring->head + DESC_NUM - dring->tail;
if (DESC_NUM - filled < 2) { /* if less than 2 available */
netif_err(priv, drv, priv->ndev, "%s: TxQFull!\n", __func__);
netif_stop_queue(priv->ndev);
dma_wmb();
return NETDEV_TX_BUSY; return NETDEV_TX_BUSY;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment