Skip to contentSkip to conversation

net: fec: implement TSO descriptor cleanup

PATCH Superseded Dheeraj Reddy Jonnalagadda 2 participants 2 messages Jan 18, 2025 – Jan 20, 2025

Subsystems (4)

v2 of 4 Superseded Latest is v4 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 net: fec: implement TSO descriptor cleanup

Implement cleanup of descriptors in the TSO error path of fec_enet_txq_submit_tso(). The cleanup

- Unmaps DMA buffers for data descriptors skipping TSO header
- Clears all buffer descriptors
- Handles extended descriptors by clearing cbd_esc when enabled

---
Changelog:

v2
- Add DMA unmapping for data descriptors
- Handle extended descriptor (bufdesc_ex) cleanup
- Move variable declarations to function scope

 drivers/net/ethernet/freescale/fec_main.c | 29 ++++++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)
drivers/net/ethernet/freescale/fec_main.c +28 -1
index 68725506a095..acd381710f87 100644
@@ -840,6 +840,8 @@ static int fec_enet_txq_submit_tso(struct fec_enet_priv_tx_q *txq,
 	struct fec_enet_private *fep = netdev_priv(ndev);
 	int hdr_len, total_len, data_left;
 	struct bufdesc *bdp = txq->bd.cur;
+	struct bufdesc *tmp_bdp;
+	struct bufdesc_ex *ebdp;
 	struct tso_t tso;
 	unsigned int index = 0;
 	int ret;
@@ -913,7 +915,32 @@ static int fec_enet_txq_submit_tso(struct fec_enet_priv_tx_q *txq,
 	return 0;
 
 err_release:
-	/* TODO: Release all used data descriptors for TSO */
+	/* Release all used data descriptors for TSO */
+	tmp_bdp = txq->bd.cur;
+
+	while (tmp_bdp != bdp) {
+		/* Unmap data buffers */
+		if (tmp_bdp->cbd_bufaddr && tmp_bdp != txq->bd.cur)
+			dma_unmap_single(&fep->pdev->dev,
+					 tmp_bdp->cbd_bufaddr,
+					 tmp_bdp->cbd_datlen,
+					 DMA_TO_DEVICE);
+
+		/* Clear standard buffer descriptor fields */
+		tmp_bdp->cbd_sc = 0;
+		tmp_bdp->cbd_datlen = 0;
+		tmp_bdp->cbd_bufaddr = 0;
+
+		/* Handle extended descriptor if enabled */
+		if (fep->bufdesc_ex) {
+			ebdp = (struct bufdesc_ex *)tmp_bdp;
+			ebdp->cbd_esc = 0;
+		}
+
+		tmp_bdp = fec_enet_get_nextdesc(tmp_bdp, &txq->bd);
+	}
+
+	dev_kfree_skb_any(skb);
 	return ret;
 }
 
Signature · 1 line
2.34.1
maintainer
#1 lore raw
Quoted 36 lines

Implement cleanup of descriptors in the TSO error path of fec_enet_txq_submit_tso(). The cleanup

- Unmaps DMA buffers for data descriptors skipping TSO header
- Clears all buffer descriptors
- Handles extended descriptors by clearing cbd_esc when enabled

---
Changelog:

v2
- Add DMA unmapping for data descriptors
- Handle extended descriptor (bufdesc_ex) cleanup
- Move variable declarations to function scope

 drivers/net/ethernet/freescale/fec_main.c | 29 ++++++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)
drivers/net/ethernet/freescale/fec_main.c +2 -0
index 68725506a095..acd381710f87 100644
@@ -840,6 +840,8 @@ static int fec_enet_txq_submit_tso(struct
 fec_enet_priv_tx_q *txq,
 	struct fec_enet_private *fep = netdev_priv(ndev);
 	int hdr_len, total_len, data_left;
 	struct bufdesc *bdp = txq->bd.cur;
+	struct bufdesc *tmp_bdp;
+	struct bufdesc_ex *ebdp;
 	struct tso_t tso;
 	unsigned int index = 0;
drivers/net/ethernet/freescale/fec_main.c +0 -0
 	int ret;
@@ -913,7 +915,32 @@ static int fec_enet_txq_submit_tso(struct
 fec_enet_priv_tx_q *txq,

drivers/net/ethernet/freescale/fec_main.c static int fec_enet_txq_submit_tso(struct · line 924

Quoted 10 lines
drivers/net/ethernet/freescale/fec_main.c +6 -1
 	return 0;
 
 err_release:
-	/* TODO: Release all used data descriptors for TSO */
+	/* Release all used data descriptors for TSO */
+	tmp_bdp = txq->bd.cur;
+
+	while (tmp_bdp != bdp) {
+		/* Unmap data buffers */
+		if (tmp_bdp->cbd_bufaddr && tmp_bdp != txq->bd.cur)

All the TSO headers will be unmapped except the first one. So please use the following check condition.

if (!IS_TSO_HEADER(txq, fec32_to_cpu(tmp_bdp->cbd_bufaddr)))

BTW, the net-next is closed until Feb 3rd. And I think this is a bug fix not a new feature, so you can change the target to net tree and a Fixes tag, thanks.

Quoted 25 lines
drivers/net/ethernet/freescale/fec_main.c +20 -1
+			dma_unmap_single(&fep->pdev->dev,
+					 tmp_bdp->cbd_bufaddr,
+					 tmp_bdp->cbd_datlen,
+					 DMA_TO_DEVICE);
+
+		/* Clear standard buffer descriptor fields */
+		tmp_bdp->cbd_sc = 0;
+		tmp_bdp->cbd_datlen = 0;
+		tmp_bdp->cbd_bufaddr = 0;
+
+		/* Handle extended descriptor if enabled */
+		if (fep->bufdesc_ex) {
+			ebdp = (struct bufdesc_ex *)tmp_bdp;
+			ebdp->cbd_esc = 0;
+		}
+
+		tmp_bdp = fec_enet_get_nextdesc(tmp_bdp, &txq->bd);
+	}
+
+	dev_kfree_skb_any(skb);
 	return ret;
 }
 
--

2.34.1