net: fec: fix improper use of NETDEV_TX_BUSY

Zhang Changzhong · gregkh · commit fe8362c84a7e · 2022-11-10T17:46:51.000+01:00
[ Upstream commit 06a4df5 ] 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> Signed-off-by: Sasha Levin <sashal@kernel.org>
diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c
@@ -623,7 +623,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);
@@ -685,7 +685,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
`@@ -623,7 +623,7 @@ fec_enet_txq_put_data_tso(struct fec_enet_priv_tx_q txq, struct sk_buff skb,`
`623`	`623`	`dev_kfree_skb_any(skb);`
`624`	`624`	`if (net_ratelimit())`
`625`	`625`	`netdev_err(ndev, "Tx DMA memory map failed\n");`
`626`		`- return NETDEV_TX_BUSY;`
	`626`	`+ return NETDEV_TX_OK;`
`627`	`627`	`}`
`628`	`628`
`629`	`629`	`bdp->cbd_datlen = cpu_to_fec16(size);`
`@@ -685,7 +685,7 @@ fec_enet_txq_put_hdr_tso(struct fec_enet_priv_tx_q *txq,`
`685`	`685`	`dev_kfree_skb_any(skb);`
`686`	`686`	`if (net_ratelimit())`
`687`	`687`	`netdev_err(ndev, "Tx DMA memory map failed\n");`
`688`		`- return NETDEV_TX_BUSY;`
	`688`	`+ return NETDEV_TX_OK;`
`689`	`689`	`}`
`690`	`690`	`}`
`691`	`691`