Commit 82f1f575 authored by Kashyap Desai's avatar Kashyap Desai Committed by Leon Romanovsky
Browse files

RDMA/bnxt_re: Fix allocation of QP table 



Driver is creating QP table too early while probing before
querying firmware capabilities. Driver currently is using
a hard coded values of 64K as size while creating QP table.
This resulted in a crash when firmwre supported QP count is
more than 64K.

To fix the issue, move the QP tabel creation after the firmware
capabilities are queried. Use the firmware returned maximum value
of QPs while creating the QP table.

Fixes: b1b66ae0 ("bnxt_en: Use FW defined resource limits for RoCE")
Reviewed-by: default avatarKalesh AP <kalesh-anakkur.purayil@broadcom.com>
Signed-off-by: default avatarKashyap Desai <kashyap.desai@broadcom.com>
Signed-off-by: default avatarSelvin Xavier <selvin.xavier@broadcom.com>
Link: https://patch.msgid.link/1741021178-2569-2-git-send-email-selvin.xavier@broadcom.com


Signed-off-by: default avatarLeon Romanovsky <leon@kernel.org>
parent 8ce2eb9d

drivers/infiniband/hw/bnxt_re/bnxt_re.h

+0 −6
Original line number Diff line number Diff line
@@ -53,12 +53,6 @@ 
#define BNXT_RE_MAX_MR_SIZE_HIGH	BIT_ULL(39)

#define BNXT_RE_MAX_MR_SIZE		BNXT_RE_MAX_MR_SIZE_HIGH



#define BNXT_RE_MAX_QPC_COUNT		(64 * 1024)

#define BNXT_RE_MAX_MRW_COUNT		(64 * 1024)

#define BNXT_RE_MAX_SRQC_COUNT		(64 * 1024)

#define BNXT_RE_MAX_CQ_COUNT		(64 * 1024)

#define BNXT_RE_MAX_MRW_COUNT_64K	(64 * 1024)

#define BNXT_RE_MAX_MRW_COUNT_256K	(256 * 1024)



/* Number of MRs to reserve for PF, leaving remainder for VFs */

#define BNXT_RE_RESVD_MR_FOR_PF         (32 * 1024)

drivers/infiniband/hw/bnxt_re/main.c

+1 −2
Original line number Diff line number Diff line
@@ -2130,8 +2130,7 @@ static int bnxt_re_dev_init(struct bnxt_re_dev *rdev, u8 op_type) 
	 * memory for the function and all child VFs

	 */

	rc = bnxt_qplib_alloc_rcfw_channel(&rdev->qplib_res, &rdev->rcfw,

					   &rdev->qplib_ctx,

					   BNXT_RE_MAX_QPC_COUNT);

					   &rdev->qplib_ctx);

	if (rc) {

		ibdev_err(&rdev->ibdev,

			  "Failed to allocate RCFW Channel: %#x\n", rc);

drivers/infiniband/hw/bnxt_re/qplib_rcfw.c

+1 −9
Original line number Diff line number Diff line
@@ -915,7 +915,6 @@ int bnxt_qplib_init_rcfw(struct bnxt_qplib_rcfw *rcfw, 


void bnxt_qplib_free_rcfw_channel(struct bnxt_qplib_rcfw *rcfw)

{

	kfree(rcfw->qp_tbl);

	kfree(rcfw->crsqe_tbl);

	bnxt_qplib_free_hwq(rcfw->res, &rcfw->cmdq.hwq);

	bnxt_qplib_free_hwq(rcfw->res, &rcfw->creq.hwq);
@@ -924,8 +923,7 @@ void bnxt_qplib_free_rcfw_channel(struct bnxt_qplib_rcfw *rcfw) 


int bnxt_qplib_alloc_rcfw_channel(struct bnxt_qplib_res *res,

				  struct bnxt_qplib_rcfw *rcfw,

				  struct bnxt_qplib_ctx *ctx,

				  int qp_tbl_sz)

				  struct bnxt_qplib_ctx *ctx)

{

	struct bnxt_qplib_hwq_attr hwq_attr = {};

	struct bnxt_qplib_sg_info sginfo = {};
@@ -969,12 +967,6 @@ int bnxt_qplib_alloc_rcfw_channel(struct bnxt_qplib_res *res, 
	if (!rcfw->crsqe_tbl)

		goto fail;



	/* Allocate one extra to hold the QP1 entries */

	rcfw->qp_tbl_size = qp_tbl_sz + 1;

	rcfw->qp_tbl = kcalloc(rcfw->qp_tbl_size, sizeof(struct bnxt_qplib_qp_node),

			       GFP_KERNEL);

	if (!rcfw->qp_tbl)

		goto fail;

	spin_lock_init(&rcfw->tbl_lock);



	rcfw->max_timeout = res->cctx->hwrm_cmd_max_timeout;

drivers/infiniband/hw/bnxt_re/qplib_rcfw.h

+1 −2
Original line number Diff line number Diff line
@@ -262,8 +262,7 @@ static inline void bnxt_qplib_fill_cmdqmsg(struct bnxt_qplib_cmdqmsg *msg, 
void bnxt_qplib_free_rcfw_channel(struct bnxt_qplib_rcfw *rcfw);

int bnxt_qplib_alloc_rcfw_channel(struct bnxt_qplib_res *res,

				  struct bnxt_qplib_rcfw *rcfw,

				  struct bnxt_qplib_ctx *ctx,

				  int qp_tbl_sz);

				  struct bnxt_qplib_ctx *ctx);

void bnxt_qplib_rcfw_stop_irq(struct bnxt_qplib_rcfw *rcfw, bool kill);

void bnxt_qplib_disable_rcfw_channel(struct bnxt_qplib_rcfw *rcfw);

int bnxt_qplib_rcfw_start_irq(struct bnxt_qplib_rcfw *rcfw, int msix_vector,

drivers/infiniband/hw/bnxt_re/qplib_res.c

+9 −0
Original line number Diff line number Diff line
@@ -871,6 +871,7 @@ int bnxt_qplib_init_res(struct bnxt_qplib_res *res) 


void bnxt_qplib_free_res(struct bnxt_qplib_res *res)

{

	kfree(res->rcfw->qp_tbl);

	bnxt_qplib_free_sgid_tbl(res, &res->sgid_tbl);

	bnxt_qplib_free_pd_tbl(&res->pd_tbl);

	bnxt_qplib_free_dpi_tbl(res, &res->dpi_tbl);
@@ -878,12 +879,20 @@ void bnxt_qplib_free_res(struct bnxt_qplib_res *res) 


int bnxt_qplib_alloc_res(struct bnxt_qplib_res *res, struct net_device *netdev)

{

	struct bnxt_qplib_rcfw *rcfw = res->rcfw;

	struct bnxt_qplib_dev_attr *dev_attr;

	int rc;



	res->netdev = netdev;

	dev_attr = res->dattr;



	/* Allocate one extra to hold the QP1 entries */

	rcfw->qp_tbl_size = max_t(u32, BNXT_RE_MAX_QPC_COUNT + 1, dev_attr->max_qp);

	rcfw->qp_tbl = kcalloc(rcfw->qp_tbl_size, sizeof(struct bnxt_qplib_qp_node),

			       GFP_KERNEL);

	if (!rcfw->qp_tbl)

		return -ENOMEM;



	rc = bnxt_qplib_alloc_sgid_tbl(res, &res->sgid_tbl, dev_attr->max_sgid);

	if (rc)

		goto fail;