Commit 5d19373d authored by Zhaojiahui's avatar Zhaojiahui
Browse files

Revert "RDMA/hns: Fix an AEQE overflow error caused by untimely update of eq_db_ci" 

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


CVE: NA

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

This reverts commit abcc57d3.

Fixes: abcc57d3 ("RDMA/hns: Fix an AEQE overflow error caused by untimely update of eq_db_ci")
Signed-off-by: default avatarZhaojiahui <zhaojiahui12@h-partners.com>
parent 696f55e1

drivers/infiniband/hw/hns/hns_roce_device.h

+0 −1
Original line number Diff line number Diff line
@@ -1538,7 +1538,6 @@ void hns_roce_cq_completion(struct hns_roce_dev *hr_dev, u32 cqn); 
void hns_roce_cq_event(struct hns_roce_dev *hr_dev, u32 cqn, int event_type);

void flush_cqe(struct hns_roce_dev *dev, struct hns_roce_qp *qp);

void hns_roce_qp_event(struct hns_roce_dev *hr_dev, u32 qpn, int event_type);

void hns_roce_flush_cqe(struct hns_roce_dev *hr_dev, u32 qpn);

void hns_roce_srq_event(struct hns_roce_dev *hr_dev, u32 srqn, int event_type);

u8 hns_get_gid_index(struct hns_roce_dev *hr_dev, u8 port, int gid_index);

void hns_roce_handle_device_err(struct hns_roce_dev *hr_dev);

drivers/infiniband/hw/hns/hns_roce_hw_v2.c

+1 −6
Original line number Diff line number Diff line
@@ -6780,12 +6780,7 @@ static void hns_roce_irq_work_handle(struct work_struct *work) 
	case HNS_ROCE_EVENT_TYPE_PATH_MIG_FAILED:

	case HNS_ROCE_EVENT_TYPE_COMM_EST:

	case HNS_ROCE_EVENT_TYPE_SQ_DRAINED:

	case HNS_ROCE_EVENT_TYPE_WQ_CATAS_ERROR:

	case HNS_ROCE_EVENT_TYPE_SRQ_LAST_WQE_REACH:

	case HNS_ROCE_EVENT_TYPE_INV_REQ_LOCAL_WQ_ERROR:

	case HNS_ROCE_EVENT_TYPE_LOCAL_WQ_ACCESS_ERROR:

	case HNS_ROCE_EVENT_TYPE_XRCD_VIOLATION:

	case HNS_ROCE_EVENT_TYPE_INVALID_XRCETH:

		hns_roce_qp_event(hr_dev, queue_num, event_type);

		break;

	case HNS_ROCE_EVENT_TYPE_SRQ_LIMIT_REACH:
@@ -6884,7 +6879,7 @@ static irqreturn_t hns_roce_v2_aeq_int(struct hns_roce_dev *hr_dev, 
		case HNS_ROCE_EVENT_TYPE_LOCAL_WQ_ACCESS_ERROR:

		case HNS_ROCE_EVENT_TYPE_XRCD_VIOLATION:

		case HNS_ROCE_EVENT_TYPE_INVALID_XRCETH:

			hns_roce_flush_cqe(hr_dev, queue_num);

			hns_roce_qp_event(hr_dev, queue_num, event_type);

			break;

		case HNS_ROCE_EVENT_TYPE_MB:

			hns_roce_cmd_event(hr_dev,

drivers/infiniband/hw/hns/hns_roce_qp.c

+19 −35
Original line number Diff line number Diff line
@@ -39,25 +39,6 @@ 
#include "hns_roce_hem.h"

#include "hns_roce_dca.h"



static struct hns_roce_qp *hns_roce_qp_lookup(struct hns_roce_dev *hr_dev,

					      u32 qpn)

{

	struct device *dev = hr_dev->dev;

	struct hns_roce_qp *qp;

	unsigned long flags;



	xa_lock_irqsave(&hr_dev->qp_table_xa, flags);

	qp = __hns_roce_qp_lookup(hr_dev, qpn);

	if (qp)

		refcount_inc(&qp->refcount);

	xa_unlock_irqrestore(&hr_dev->qp_table_xa, flags);



	if (!qp)

		dev_warn(dev, "async event for bogus QP %08x\n", qpn);



	return qp;

}



static void flush_work_handle(struct work_struct *work)

{

	struct hns_roce_work *flush_work = container_of(work,
@@ -114,28 +95,31 @@ void flush_cqe(struct hns_roce_dev *dev, struct hns_roce_qp *qp) 


void hns_roce_qp_event(struct hns_roce_dev *hr_dev, u32 qpn, int event_type)

{

	struct device *dev = hr_dev->dev;

	struct hns_roce_qp *qp;



	qp = hns_roce_qp_lookup(hr_dev, qpn);

	if (!qp)

		return;



	qp->event(qp, (enum hns_roce_event)event_type);



	if (refcount_dec_and_test(&qp->refcount))

		complete(&qp->free);

}



void hns_roce_flush_cqe(struct hns_roce_dev *hr_dev, u32 qpn)

{

	struct hns_roce_qp *qp;

	xa_lock(&hr_dev->qp_table_xa);

	qp = __hns_roce_qp_lookup(hr_dev, qpn);

	if (qp)

		refcount_inc(&qp->refcount);

	xa_unlock(&hr_dev->qp_table_xa);



	qp = hns_roce_qp_lookup(hr_dev, qpn);

	if (!qp)

	if (!qp) {

		dev_warn(dev, "Async event for bogus QP %08x\n", qpn);

		return;

	}



	if (event_type == HNS_ROCE_EVENT_TYPE_WQ_CATAS_ERROR ||

	    event_type == HNS_ROCE_EVENT_TYPE_INV_REQ_LOCAL_WQ_ERROR ||

	    event_type == HNS_ROCE_EVENT_TYPE_LOCAL_WQ_ACCESS_ERROR ||

	    event_type == HNS_ROCE_EVENT_TYPE_XRCD_VIOLATION ||

	    event_type == HNS_ROCE_EVENT_TYPE_INVALID_XRCETH) {

		qp->state = IB_QPS_ERR;



		flush_cqe(hr_dev, qp);

	}



	qp->event(qp, (enum hns_roce_event)event_type);



	if (refcount_dec_and_test(&qp->refcount))

		complete(&qp->free);