Commit f7cf2b7b authored by Xinghai Cen's avatar Xinghai Cen
Browse files

Revert "RDMA/hns: Fix flush cqe error when racing with destroy qp" 

driver inclusion
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/IBIXIN


CVE: NA

----------------------------------------------------------------------

This reverts commit a3174445.
This reverts commit 2b39c452

Fixes: a3174445 ("RDMA/hns: Fix flush cqe error when racing with destroy qp")
Fixes: 2b39c452 ("RDMA/hns: Fix flush cqe error when racing with destroy qp")
Signed-off-by: default avatarXinghai Cen <cenxinghai@h-partners.com>
parent 08e54ea5

drivers/infiniband/hw/hns/hns_roce_device.h

+0 −2
Original line number Diff line number Diff line
@@ -717,7 +717,6 @@ struct hns_roce_dev; 


enum {

	HNS_ROCE_FLUSH_FLAG = 0,

	HNS_ROCE_STOP_FLUSH_FLAG = 1,

};



struct hns_roce_work {
@@ -778,7 +777,6 @@ struct hns_roce_qp { 
	bool			delayed_destroy_flag;

	struct hns_roce_mtr_node *mtr_node;

	struct hns_roce_dip *dip;

	spinlock_t flush_lock;

};



struct hns_roce_ib_iboe {

drivers/infiniband/hw/hns/hns_roce_hw_v2.c

+0 −12
Original line number Diff line number Diff line
@@ -6330,23 +6330,11 @@ int hns_roce_v2_destroy_qp(struct ib_qp *ibqp, struct ib_udata *udata) 
{

	struct hns_roce_dev *hr_dev = to_hr_dev(ibqp->device);

	struct hns_roce_qp *hr_qp = to_hr_qp(ibqp);

	unsigned long flags;

	int ret;

	/* Make sure flush_cqe() is completed */

	spin_lock_irqsave(&hr_qp->flush_lock, flags);

	set_bit(HNS_ROCE_STOP_FLUSH_FLAG, &hr_qp->flush_flag);

	spin_unlock_irqrestore(&hr_qp->flush_lock, flags);

	flush_work(&hr_qp->flush_work.work);



	if (hr_qp->congest_type == HNS_ROCE_CONGEST_TYPE_DIP)

		put_dip_ctx_idx(hr_dev, hr_qp);



	/* Make sure flush_cqe() is completed */

	spin_lock_irqsave(&hr_qp->flush_lock, flags);

	set_bit(HNS_ROCE_STOP_FLUSH_FLAG, &hr_qp->flush_flag);

	spin_unlock_irqrestore(&hr_qp->flush_lock, flags);

	flush_work(&hr_qp->flush_work.work);



	ret = hns_roce_v2_destroy_qp_common(hr_dev, hr_qp, udata);

	if (ret)

		ibdev_err_ratelimited(&hr_dev->ib_dev,

drivers/infiniband/hw/hns/hns_roce_qp.c

+2 −13
Original line number Diff line number Diff line
@@ -90,18 +90,11 @@ static void flush_work_handle(struct work_struct *work) 
void init_flush_work(struct hns_roce_dev *hr_dev, struct hns_roce_qp *hr_qp)

{

	struct hns_roce_work *flush_work = &hr_qp->flush_work;

	unsigned long flags;



	spin_lock_irqsave(&hr_qp->flush_lock, flags);

	/* Exit directly after destroy_qp() */

	if (test_bit(HNS_ROCE_STOP_FLUSH_FLAG, &hr_qp->flush_flag)) {

		spin_unlock_irqrestore(&hr_qp->flush_lock, flags);

		return;

	}



	flush_work->hr_dev = hr_dev;

	INIT_WORK(&flush_work->work, flush_work_handle);

	refcount_inc(&hr_qp->refcount);

	queue_work(hr_dev->irq_workq, &flush_work->work);

	spin_unlock_irqrestore(&hr_qp->flush_lock, flags);

}



void flush_cqe(struct hns_roce_dev *dev, struct hns_roce_qp *qp)
@@ -1371,7 +1364,6 @@ static int hns_roce_create_qp_common(struct hns_roce_dev *hr_dev, 
				     struct ib_udata *udata,

				     struct hns_roce_qp *hr_qp)

{

	struct hns_roce_work *flush_work = &hr_qp->flush_work;

	struct hns_roce_ib_create_qp_resp resp = {};

	struct ib_device *ibdev = &hr_dev->ib_dev;

	struct hns_roce_ib_create_qp ucmd = {};
@@ -1380,12 +1372,9 @@ static int hns_roce_create_qp_common(struct hns_roce_dev *hr_dev, 
	mutex_init(&hr_qp->mutex);

	spin_lock_init(&hr_qp->sq.lock);

	spin_lock_init(&hr_qp->rq.lock);

	spin_lock_init(&hr_qp->flush_lock);



	hr_qp->state = IB_QPS_RESET;

	hr_qp->flush_flag = 0;

	flush_work->hr_dev = hr_dev;

	INIT_WORK(&flush_work->work, flush_work_handle);



	ret = set_qp_param(hr_dev, hr_qp, init_attr, udata, &ucmd);

	if (ret) {