RDMA/hns: Fix missing xa_destroy()

Junxian Huang · rleon · commit eda0a2fdbc24 · 2025-03-12T14:35:50.000-04:00
Add xa_destroy() for xarray in driver. Fixes: 5c1f167 ("RDMA/hns: Init SRQ table for hip08") Fixes: 27e19f4 ("RDMA/hns: Convert cq_table to XArray") Fixes: 736b5a7 ("RDMA/hns: Convert qp_table_tree to XArray") Signed-off-by: Junxian Huang <huangjunxian6@hisilicon.com> Link: https://patch.msgid.link/20250311084857.3803665-7-huangjunxian6@hisilicon.com Signed-off-by: Leon Romanovsky <leon@kernel.org>
diff --git a/drivers/infiniband/hw/hns/hns_roce_alloc.c b/drivers/infiniband/hw/hns/hns_roce_alloc.c
@@ -175,8 +175,10 @@ void hns_roce_cleanup_bitmap(struct hns_roce_dev *hr_dev)
 	if (hr_dev->caps.flags & HNS_ROCE_CAP_FLAG_XRC)
 		ida_destroy(&hr_dev->xrcd_ida.ida);
 
-	if (hr_dev->caps.flags & HNS_ROCE_CAP_FLAG_SRQ)
+	if (hr_dev->caps.flags & HNS_ROCE_CAP_FLAG_SRQ) {
 		ida_destroy(&hr_dev->srq_table.srq_ida.ida);
+		xa_destroy(&hr_dev->srq_table.xa);
+	}
 	hns_roce_cleanup_qp_table(hr_dev);
 	hns_roce_cleanup_cq_table(hr_dev);
 	ida_destroy(&hr_dev->mr_table.mtpt_ida.ida);
diff --git a/drivers/infiniband/hw/hns/hns_roce_cq.c b/drivers/infiniband/hw/hns/hns_roce_cq.c
@@ -537,5 +537,6 @@ void hns_roce_cleanup_cq_table(struct hns_roce_dev *hr_dev)
 
 	for (i = 0; i < HNS_ROCE_CQ_BANK_NUM; i++)
 		ida_destroy(&hr_dev->cq_table.bank[i].ida);
+	xa_destroy(&hr_dev->cq_table.array);
 	mutex_destroy(&hr_dev->cq_table.bank_mutex);
 }
diff --git a/drivers/infiniband/hw/hns/hns_roce_qp.c b/drivers/infiniband/hw/hns/hns_roce_qp.c
@@ -1603,6 +1603,7 @@ void hns_roce_cleanup_qp_table(struct hns_roce_dev *hr_dev)
 	for (i = 0; i < HNS_ROCE_QP_BANK_NUM; i++)
 		ida_destroy(&hr_dev->qp_table.bank[i].ida);
 	xa_destroy(&hr_dev->qp_table.dip_xa);
+	xa_destroy(&hr_dev->qp_table_xa);
 	mutex_destroy(&hr_dev->qp_table.bank_mutex);
 	mutex_destroy(&hr_dev->qp_table.scc_mutex);
 }

Original file line number	Diff line number	Diff line change
`@@ -537,5 +537,6 @@ void hns_roce_cleanup_cq_table(struct hns_roce_dev *hr_dev)`
`537`	`537`
`538`	`538`	`for (i = 0; i < HNS_ROCE_CQ_BANK_NUM; i++)`
`539`	`539`	`ida_destroy(&hr_dev->cq_table.bank[i].ida);`
	`540`	`+ xa_destroy(&hr_dev->cq_table.array);`
`540`	`541`	`mutex_destroy(&hr_dev->cq_table.bank_mutex);`
`541`	`542`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1603,6 +1603,7 @@ void hns_roce_cleanup_qp_table(struct hns_roce_dev *hr_dev)`
`1603`	`1603`	`for (i = 0; i < HNS_ROCE_QP_BANK_NUM; i++)`
`1604`	`1604`	`ida_destroy(&hr_dev->qp_table.bank[i].ida);`
`1605`	`1605`	`xa_destroy(&hr_dev->qp_table.dip_xa);`
	`1606`	`+ xa_destroy(&hr_dev->qp_table_xa);`
`1606`	`1607`	`mutex_destroy(&hr_dev->qp_table.bank_mutex);`
`1607`	`1608`	`mutex_destroy(&hr_dev->qp_table.scc_mutex);`
`1608`	`1609`	`}`