Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 81fe16e0 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'qed-Slowpath-Queue-bug-fixes' 



Denis Bolotin says:

====================
qed: Slowpath Queue bug fixes

This patch series fixes several bugs in the SPQ mechanism.
It deals with SPQ entries management, preventing resource leaks, memory
corruptions and handles error cases throughout the driver.
Please consider applying to net.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 0d5b9311 fa5c448d

drivers/net/ethernet/qlogic/qed/qed_fcoe.c

+8 −3
Original line number Diff line number Diff line
@@ -147,7 +147,8 @@ qed_sp_fcoe_func_start(struct qed_hwfn *p_hwfn, 
		       "Cannot satisfy CQ amount. CQs requested %d, CQs available %d. Aborting function start\n",

		       fcoe_pf_params->num_cqs,

		       p_hwfn->hw_info.feat_num[QED_FCOE_CQ]);

		return -EINVAL;

		rc = -EINVAL;

		goto err;

	}



	p_data->mtu = cpu_to_le16(fcoe_pf_params->mtu);
@@ -156,14 +157,14 @@ qed_sp_fcoe_func_start(struct qed_hwfn *p_hwfn, 


	rc = qed_cxt_acquire_cid(p_hwfn, PROTOCOLID_FCOE, &dummy_cid);

	if (rc)

		return rc;

		goto err;



	cxt_info.iid = dummy_cid;

	rc = qed_cxt_get_cid_info(p_hwfn, &cxt_info);

	if (rc) {

		DP_NOTICE(p_hwfn, "Cannot find context info for dummy cid=%d\n",

			  dummy_cid);

		return rc;

		goto err;

	}

	p_cxt = cxt_info.p_cxt;

	SET_FIELD(p_cxt->tstorm_ag_context.flags3,
@@ -240,6 +241,10 @@ qed_sp_fcoe_func_start(struct qed_hwfn *p_hwfn, 
	rc = qed_spq_post(p_hwfn, p_ent, NULL);



	return rc;



err:

	qed_sp_destroy_request(p_hwfn, p_ent);

	return rc;

}



static int

drivers/net/ethernet/qlogic/qed/qed_iscsi.c

+1 −0
Original line number Diff line number Diff line
@@ -200,6 +200,7 @@ qed_sp_iscsi_func_start(struct qed_hwfn *p_hwfn, 
		       "Cannot satisfy CQ amount. Queues requested %d, CQs available %d. Aborting function start\n",

		       p_params->num_queues,

		       p_hwfn->hw_info.feat_num[QED_ISCSI_CQ]);

		qed_sp_destroy_request(p_hwfn, p_ent);

		return -EINVAL;

	}

drivers/net/ethernet/qlogic/qed/qed_l2.c

+8 −4
Original line number Diff line number Diff line
@@ -740,8 +740,7 @@ int qed_sp_vport_update(struct qed_hwfn *p_hwfn, 


	rc = qed_sp_vport_update_rss(p_hwfn, p_ramrod, p_rss_params);

	if (rc) {

		/* Return spq entry which is taken in qed_sp_init_request()*/

		qed_spq_return_entry(p_hwfn, p_ent);

		qed_sp_destroy_request(p_hwfn, p_ent);

		return rc;

	}
@@ -1355,6 +1354,7 @@ qed_filter_ucast_common(struct qed_hwfn *p_hwfn, 
			DP_NOTICE(p_hwfn,

				  "%d is not supported yet\n",

				  p_filter_cmd->opcode);

			qed_sp_destroy_request(p_hwfn, *pp_ent);

			return -EINVAL;

		}
@@ -2056,13 +2056,13 @@ qed_configure_rfs_ntuple_filter(struct qed_hwfn *p_hwfn, 
	} else {

		rc = qed_fw_vport(p_hwfn, p_params->vport_id, &abs_vport_id);

		if (rc)

			return rc;

			goto err;



		if (p_params->qid != QED_RFS_NTUPLE_QID_RSS) {

			rc = qed_fw_l2_queue(p_hwfn, p_params->qid,

					     &abs_rx_q_id);

			if (rc)

				return rc;

				goto err;



			p_ramrod->rx_qid_valid = 1;

			p_ramrod->rx_qid = cpu_to_le16(abs_rx_q_id);
@@ -2083,6 +2083,10 @@ qed_configure_rfs_ntuple_filter(struct qed_hwfn *p_hwfn, 
		   (u64)p_params->addr, p_params->length);



	return qed_spq_post(p_hwfn, p_ent, NULL);



err:

	qed_sp_destroy_request(p_hwfn, p_ent);

	return rc;

}



int qed_get_rxq_coalesce(struct qed_hwfn *p_hwfn,

drivers/net/ethernet/qlogic/qed/qed_rdma.c

+1 −0
Original line number Diff line number Diff line
@@ -1514,6 +1514,7 @@ qed_rdma_register_tid(void *rdma_cxt, 
	default:

		rc = -EINVAL;

		DP_VERBOSE(p_hwfn, QED_MSG_RDMA, "rc = %d\n", rc);

		qed_sp_destroy_request(p_hwfn, p_ent);

		return rc;

	}

	SET_FIELD(p_ramrod->flags1,

drivers/net/ethernet/qlogic/qed/qed_roce.c

+1 −0
Original line number Diff line number Diff line
@@ -745,6 +745,7 @@ static int qed_roce_sp_destroy_qp_responder(struct qed_hwfn *p_hwfn, 
		DP_NOTICE(p_hwfn,

			  "qed destroy responder failed: cannot allocate memory (ramrod). rc = %d\n",

			  rc);

		qed_sp_destroy_request(p_hwfn, p_ent);

		return rc;

	}