net: fec: fix improper use of NETDEV_TX_BUSY

Zhang Changzhong · davem330 · commit 06a4df5863f7 · 2022-10-31T09:22:32.000Z
The ndo_start_xmit() method must not free skb when returning NETDEV_TX_BUSY, since caller is going to requeue freed skb. Fix it by returning NETDEV_TX_OK in case of dma_map_single() fails. Fixes: 79f3391 ("net: fec: Add software TSO support") Signed-off-by: Zhang Changzhong <zhangchangzhong@huawei.com> Signed-off-by: David S. Miller <davem@davemloft.net>
diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c
@@ -713,7 +713,7 @@ fec_enet_txq_put_data_tso(struct fec_enet_priv_tx_q *txq, struct sk_buff *skb,
 		dev_kfree_skb_any(skb);
 		if (net_ratelimit())
 			netdev_err(ndev, "Tx DMA memory map failed\n");
-		return NETDEV_TX_BUSY;
+		return NETDEV_TX_OK;
 	}
 
 	bdp->cbd_datlen = cpu_to_fec16(size);
@@ -775,7 +775,7 @@ fec_enet_txq_put_hdr_tso(struct fec_enet_priv_tx_q *txq,
 			dev_kfree_skb_any(skb);
 			if (net_ratelimit())
 				netdev_err(ndev, "Tx DMA memory map failed\n");
-			return NETDEV_TX_BUSY;
+			return NETDEV_TX_OK;
 		}
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -713,7 +713,7 @@ fec_enet_txq_put_data_tso(struct fec_enet_priv_tx_q txq, struct sk_buff skb,`
`713`	`713`	`dev_kfree_skb_any(skb);`
`714`	`714`	`if (net_ratelimit())`
`715`	`715`	`netdev_err(ndev, "Tx DMA memory map failed\n");`
`716`		`- return NETDEV_TX_BUSY;`
	`716`	`+ return NETDEV_TX_OK;`
`717`	`717`	`}`
`718`	`718`
`719`	`719`	`bdp->cbd_datlen = cpu_to_fec16(size);`
`@@ -775,7 +775,7 @@ fec_enet_txq_put_hdr_tso(struct fec_enet_priv_tx_q *txq,`
`775`	`775`	`dev_kfree_skb_any(skb);`
`776`	`776`	`if (net_ratelimit())`
`777`	`777`	`netdev_err(ndev, "Tx DMA memory map failed\n");`
`778`		`- return NETDEV_TX_BUSY;`
	`778`	`+ return NETDEV_TX_OK;`
`779`	`779`	`}`
`780`	`780`	`}`
`781`	`781`