Merge branch 'octeontx2-fix-bitmap-leaks-in-pf-and-vf'

kuba-moo · kuba-moo · commit daa26ea63c6f · 2025-09-30T17:27:44.000-07:00
Bo Sun says: ==================== octeontx2: fix bitmap leaks in PF and VF Two small patches that free the AF_XDP bitmap in the PF and VF remove paths. Both carry the same Fixes tag and should go to stable. ==================== Link: https://patch.msgid.link/20250930061236.31359-1-bo@mboxify.com Signed-off-by: Jakub Kicinski <kuba@kernel.org>
diff --git a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_pf.c b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_pf.c
@@ -3542,6 +3542,7 @@ static void otx2_remove(struct pci_dev *pdev)
 	otx2_disable_mbox_intr(pf);
 	otx2_pfaf_mbox_destroy(pf);
 	pci_free_irq_vectors(pf->pdev);
+	bitmap_free(pf->af_xdp_zc_qidx);
 	pci_set_drvdata(pdev, NULL);
 	free_netdev(netdev);
 }
diff --git a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_vf.c b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_vf.c
@@ -854,6 +854,7 @@ static void otx2vf_remove(struct pci_dev *pdev)
 		qmem_free(vf->dev, vf->dync_lmt);
 	otx2vf_vfaf_mbox_destroy(vf);
 	pci_free_irq_vectors(vf->pdev);
+	bitmap_free(vf->af_xdp_zc_qidx);
 	pci_set_drvdata(pdev, NULL);
 	free_netdev(netdev);
 }

Original file line number	Diff line number	Diff line change
`@@ -3542,6 +3542,7 @@ static void otx2_remove(struct pci_dev *pdev)`
`3542`	`3542`	`otx2_disable_mbox_intr(pf);`
`3543`	`3543`	`otx2_pfaf_mbox_destroy(pf);`
`3544`	`3544`	`pci_free_irq_vectors(pf->pdev);`
	`3545`	`+ bitmap_free(pf->af_xdp_zc_qidx);`
`3545`	`3546`	`pci_set_drvdata(pdev, NULL);`
`3546`	`3547`	`free_netdev(netdev);`
`3547`	`3548`	`}`
Original file line number	Diff line number	Diff line change
`@@ -854,6 +854,7 @@ static void otx2vf_remove(struct pci_dev *pdev)`
`854`	`854`	`qmem_free(vf->dev, vf->dync_lmt);`
`855`	`855`	`otx2vf_vfaf_mbox_destroy(vf);`
`856`	`856`	`pci_free_irq_vectors(vf->pdev);`
	`857`	`+ bitmap_free(vf->af_xdp_zc_qidx);`
`857`	`858`	`pci_set_drvdata(pdev, NULL);`
`858`	`859`	`free_netdev(netdev);`
`859`	`860`	`}`