Unverified Commit 05a5e799 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!9396 RDMA/hns: Fix deadlock on SRQ async events. 

Merge Pull Request from: @ci-robot 
 
PR sync from: Zhengchao Shao <shaozhengchao@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/C4H4ZSNMIDLQKDBEQGSDJZYJVMY7WEXN/ 
 
https://gitee.com/src-openeuler/kernel/issues/IA6SF1 
 
Link:https://gitee.com/openeuler/kernel/pulls/9396

 

Reviewed-by: default avatarYue Haibing <yuehaibing@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents f259c11c c887c77b

drivers/infiniband/hw/hns/hns_roce_srq.c

+3 −3
Original line number Diff line number Diff line
@@ -122,7 +122,7 @@ static int alloc_srqc(struct hns_roce_dev *hr_dev, struct hns_roce_srq *srq) 
		return ret;

	}



	ret = xa_err(xa_store(&srq_table->xa, srq->srqn, srq, GFP_KERNEL));

	ret = xa_err(xa_store_irq(&srq_table->xa, srq->srqn, srq, GFP_KERNEL));

	if (ret) {

		ibdev_err(ibdev, "failed to store SRQC, ret = %d.\n", ret);

		goto err_put;
@@ -135,7 +135,7 @@ static int alloc_srqc(struct hns_roce_dev *hr_dev, struct hns_roce_srq *srq) 
	return 0;



err_xa:

	xa_erase(&srq_table->xa, srq->srqn);

	xa_erase_irq(&srq_table->xa, srq->srqn);

err_put:

	hns_roce_table_put(hr_dev, &srq_table->table, srq->srqn);
@@ -153,7 +153,7 @@ static void free_srqc(struct hns_roce_dev *hr_dev, struct hns_roce_srq *srq) 
		dev_err(hr_dev->dev, "DESTROY_SRQ failed (%d) for SRQN %06lx\n",

			ret, srq->srqn);



	xa_erase(&srq_table->xa, srq->srqn);

	xa_erase_irq(&srq_table->xa, srq->srqn);



	if (refcount_dec_and_test(&srq->refcount))

		complete(&srq->free);