Commit 5b1e985f authored by Sindhu Devale's avatar Sindhu Devale Committed by Jason Gunthorpe
Browse files

RDMA/irdma: Skip CQP ring during a reset 

Due to duplicate reset flags, CQP commands are processed during reset.

This leads CQP failures such as below:

 irdma0: [Delete Local MAC Entry Cmd Error][op_code=49] status=-27 waiting=1 completion_err=0 maj=0x0 min=0x0

Remove the redundant flag and set the correct reset flag so CPQ is paused
during reset

Fixes: 8498a30e ("RDMA/irdma: Register auxiliary driver and implement private channel OPs")
Link: https://lore.kernel.org/r/20210916191222.824-2-shiraz.saleem@intel.com


Reported-by: default avatarLiLiang <liali@redhat.com>
Signed-off-by: default avatarSindhu Devale <sindhu.devale@intel.com>
Signed-off-by: default avatarShiraz Saleem <shiraz.saleem@intel.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@nvidia.com>
parent ebcc36ea

drivers/infiniband/hw/irdma/cm.c

+2 −2
Original line number Diff line number Diff line
@@ -3496,7 +3496,7 @@ static void irdma_cm_disconn_true(struct irdma_qp *iwqp) 
	     original_hw_tcp_state == IRDMA_TCP_STATE_TIME_WAIT ||

	     last_ae == IRDMA_AE_RDMAP_ROE_BAD_LLP_CLOSE ||

	     last_ae == IRDMA_AE_BAD_CLOSE ||

	     last_ae == IRDMA_AE_LLP_CONNECTION_RESET || iwdev->reset)) {

	     last_ae == IRDMA_AE_LLP_CONNECTION_RESET || iwdev->rf->reset)) {

		issue_close = 1;

		iwqp->cm_id = NULL;

		qp->term_flags = 0;
@@ -4250,7 +4250,7 @@ void irdma_cm_teardown_connections(struct irdma_device *iwdev, u32 *ipaddr, 
				       teardown_entry);

		attr.qp_state = IB_QPS_ERR;

		irdma_modify_qp(&cm_node->iwqp->ibqp, &attr, IB_QP_STATE, NULL);

		if (iwdev->reset)

		if (iwdev->rf->reset)

			irdma_cm_disconn(cm_node->iwqp);

		irdma_rem_ref_cm_node(cm_node);

	}

drivers/infiniband/hw/irdma/hw.c

+3 −3
Original line number Diff line number Diff line
@@ -1489,7 +1489,7 @@ void irdma_reinitialize_ieq(struct irdma_sc_vsi *vsi) 


	irdma_puda_dele_rsrc(vsi, IRDMA_PUDA_RSRC_TYPE_IEQ, false);

	if (irdma_initialize_ieq(iwdev)) {

		iwdev->reset = true;

		iwdev->rf->reset = true;

		rf->gen_ops.request_reset(rf);

	}

}
@@ -1632,13 +1632,13 @@ void irdma_rt_deinit_hw(struct irdma_device *iwdev) 
	case IEQ_CREATED:

		if (!iwdev->roce_mode)

			irdma_puda_dele_rsrc(&iwdev->vsi, IRDMA_PUDA_RSRC_TYPE_IEQ,

					     iwdev->reset);

					     iwdev->rf->reset);

		fallthrough;

	case ILQ_CREATED:

		if (!iwdev->roce_mode)

			irdma_puda_dele_rsrc(&iwdev->vsi,

					     IRDMA_PUDA_RSRC_TYPE_ILQ,

					     iwdev->reset);

					     iwdev->rf->reset);

		break;

	default:

		ibdev_warn(&iwdev->ibdev, "bad init_state = %d\n", iwdev->init_state);

drivers/infiniband/hw/irdma/i40iw_if.c

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ static void i40iw_close(struct i40e_info *cdev_info, struct i40e_client *client, 


	iwdev = to_iwdev(ibdev);

	if (reset)

		iwdev->reset = true;

		iwdev->rf->reset = true;



	iwdev->iw_status = 0;

	irdma_port_ibevent(iwdev);

drivers/infiniband/hw/irdma/main.h

+0 −1
Original line number Diff line number Diff line
@@ -346,7 +346,6 @@ struct irdma_device { 
	bool roce_mode:1;

	bool roce_dcqcn_en:1;

	bool dcb:1;

	bool reset:1;

	bool iw_ooo:1;

	enum init_completion_state init_state;

drivers/infiniband/hw/irdma/utils.c

+1 −1
Original line number Diff line number Diff line
@@ -2507,7 +2507,7 @@ void irdma_modify_qp_to_err(struct irdma_sc_qp *sc_qp) 
	struct irdma_qp *qp = sc_qp->qp_uk.back_qp;

	struct ib_qp_attr attr;



	if (qp->iwdev->reset)

	if (qp->iwdev->rf->reset)

		return;

	attr.qp_state = IB_QPS_ERR;