Commit 9264cd6a authored by Kalesh AP's avatar Kalesh AP Committed by Leon Romanovsky
Browse files

RDMA/bnxt_re: Allocate dev_attr information dynamically 



In order to optimize the size of driver private structure,
the memory for dev_attr is allocated dynamically during the
chip context initialization. In order to make certain runtime
decisions, store dev_attr in the qplib_res structure.

Signed-off-by: default avatarKalesh AP <kalesh-anakkur.purayil@broadcom.com>
Signed-off-by: default avatarSelvin Xavier <selvin.xavier@broadcom.com>
Link: https://patch.msgid.link/1736446693-6692-3-git-send-email-selvin.xavier@broadcom.com


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

drivers/infiniband/hw/bnxt_re/bnxt_re.h

+1 −1
Original line number Diff line number Diff line
@@ -204,7 +204,7 @@ struct bnxt_re_dev { 
	struct bnxt_re_nq_record	*nqr;



	/* Device Resources */

	struct bnxt_qplib_dev_attr	dev_attr;

	struct bnxt_qplib_dev_attr	*dev_attr;

	struct bnxt_qplib_ctx		qplib_ctx;

	struct bnxt_qplib_res		qplib_res;

	struct bnxt_qplib_dpi		dpi_privileged;

drivers/infiniband/hw/bnxt_re/hw_counters.c

+1 −1
Original line number Diff line number Diff line
@@ -348,7 +348,7 @@ int bnxt_re_ib_get_hw_stats(struct ib_device *ibdev, 
			goto done;

		}

		bnxt_re_copy_err_stats(rdev, stats, err_s);

		if (_is_ext_stats_supported(rdev->dev_attr.dev_cap_flags) &&

		if (_is_ext_stats_supported(rdev->dev_attr->dev_cap_flags) &&

		    !rdev->is_virtfn) {

			rc = bnxt_re_get_ext_stat(rdev, stats);

			if (rc) {

drivers/infiniband/hw/bnxt_re/ib_verbs.c

+19 −19
Original line number Diff line number Diff line
@@ -159,7 +159,7 @@ static int __qp_access_flags_to_ib(struct bnxt_qplib_chip_ctx *cctx, u8 qflags) 
static void bnxt_re_check_and_set_relaxed_ordering(struct bnxt_re_dev *rdev,

						   struct bnxt_qplib_mrw *qplib_mr)

{

	if (_is_relaxed_ordering_supported(rdev->dev_attr.dev_cap_flags2) &&

	if (_is_relaxed_ordering_supported(rdev->dev_attr->dev_cap_flags2) &&

	    pcie_relaxed_ordering_enabled(rdev->en_dev->pdev))

		qplib_mr->flags |= CMDQ_REGISTER_MR_FLAGS_ENABLE_RO;

}
@@ -184,7 +184,7 @@ int bnxt_re_query_device(struct ib_device *ibdev, 
			 struct ib_udata *udata)

{

	struct bnxt_re_dev *rdev = to_bnxt_re_dev(ibdev, ibdev);

	struct bnxt_qplib_dev_attr *dev_attr = &rdev->dev_attr;

	struct bnxt_qplib_dev_attr *dev_attr = rdev->dev_attr;



	memset(ib_attr, 0, sizeof(*ib_attr));

	memcpy(&ib_attr->fw_ver, dev_attr->fw_ver,
@@ -273,7 +273,7 @@ int bnxt_re_query_port(struct ib_device *ibdev, u32 port_num, 
		       struct ib_port_attr *port_attr)

{

	struct bnxt_re_dev *rdev = to_bnxt_re_dev(ibdev, ibdev);

	struct bnxt_qplib_dev_attr *dev_attr = &rdev->dev_attr;

	struct bnxt_qplib_dev_attr *dev_attr = rdev->dev_attr;

	int rc;



	memset(port_attr, 0, sizeof(*port_attr));
@@ -331,8 +331,8 @@ void bnxt_re_query_fw_str(struct ib_device *ibdev, char *str) 
	struct bnxt_re_dev *rdev = to_bnxt_re_dev(ibdev, ibdev);



	snprintf(str, IB_FW_VERSION_NAME_MAX, "%d.%d.%d.%d",

		 rdev->dev_attr.fw_ver[0], rdev->dev_attr.fw_ver[1],

		 rdev->dev_attr.fw_ver[2], rdev->dev_attr.fw_ver[3]);

		 rdev->dev_attr->fw_ver[0], rdev->dev_attr->fw_ver[1],

		 rdev->dev_attr->fw_ver[2], rdev->dev_attr->fw_ver[3]);

}



int bnxt_re_query_pkey(struct ib_device *ibdev, u32 port_num,
@@ -583,7 +583,7 @@ static int bnxt_re_create_fence_mr(struct bnxt_re_pd *pd) 
	mr->qplib_mr.pd = &pd->qplib_pd;

	mr->qplib_mr.type = CMDQ_ALLOCATE_MRW_MRW_FLAGS_PMR;

	mr->qplib_mr.access_flags = __from_ib_access_flags(mr_access_flags);

	if (!_is_alloc_mr_unified(rdev->dev_attr.dev_cap_flags)) {

	if (!_is_alloc_mr_unified(rdev->dev_attr->dev_cap_flags)) {

		rc = bnxt_qplib_alloc_mrw(&rdev->qplib_res, &mr->qplib_mr);

		if (rc) {

			ibdev_err(&rdev->ibdev, "Failed to alloc fence-HW-MR\n");
@@ -1060,7 +1060,7 @@ static int bnxt_re_setup_swqe_size(struct bnxt_re_qp *qp, 
	rdev = qp->rdev;

	qplqp = &qp->qplib_qp;

	sq = &qplqp->sq;

	dev_attr = &rdev->dev_attr;

	dev_attr = rdev->dev_attr;



	align = sizeof(struct sq_send_hdr);

	ilsize = ALIGN(init_attr->cap.max_inline_data, align);
@@ -1280,7 +1280,7 @@ static int bnxt_re_init_rq_attr(struct bnxt_re_qp *qp, 
	rdev = qp->rdev;

	qplqp = &qp->qplib_qp;

	rq = &qplqp->rq;

	dev_attr = &rdev->dev_attr;

	dev_attr = rdev->dev_attr;



	if (init_attr->srq) {

		struct bnxt_re_srq *srq;
@@ -1317,7 +1317,7 @@ static void bnxt_re_adjust_gsi_rq_attr(struct bnxt_re_qp *qp) 


	rdev = qp->rdev;

	qplqp = &qp->qplib_qp;

	dev_attr = &rdev->dev_attr;

	dev_attr = rdev->dev_attr;



	if (!bnxt_qplib_is_chip_gen_p5_p7(rdev->chip_ctx)) {

		qplqp->rq.max_sge = dev_attr->max_qp_sges;
@@ -1343,7 +1343,7 @@ static int bnxt_re_init_sq_attr(struct bnxt_re_qp *qp, 
	rdev = qp->rdev;

	qplqp = &qp->qplib_qp;

	sq = &qplqp->sq;

	dev_attr = &rdev->dev_attr;

	dev_attr = rdev->dev_attr;



	sq->max_sge = init_attr->cap.max_send_sge;

	entries = init_attr->cap.max_send_wr;
@@ -1396,7 +1396,7 @@ static void bnxt_re_adjust_gsi_sq_attr(struct bnxt_re_qp *qp, 


	rdev = qp->rdev;

	qplqp = &qp->qplib_qp;

	dev_attr = &rdev->dev_attr;

	dev_attr = rdev->dev_attr;



	if (!bnxt_qplib_is_chip_gen_p5_p7(rdev->chip_ctx)) {

		entries = bnxt_re_init_depth(init_attr->cap.max_send_wr + 1, uctx);
@@ -1445,7 +1445,7 @@ static int bnxt_re_init_qp_attr(struct bnxt_re_qp *qp, struct bnxt_re_pd *pd, 


	rdev = qp->rdev;

	qplqp = &qp->qplib_qp;

	dev_attr = &rdev->dev_attr;

	dev_attr = rdev->dev_attr;



	/* Setup misc params */

	ether_addr_copy(qplqp->smac, rdev->netdev->dev_addr);
@@ -1615,7 +1615,7 @@ int bnxt_re_create_qp(struct ib_qp *ib_qp, struct ib_qp_init_attr *qp_init_attr, 
	ib_pd = ib_qp->pd;

	pd = container_of(ib_pd, struct bnxt_re_pd, ib_pd);

	rdev = pd->rdev;

	dev_attr = &rdev->dev_attr;

	dev_attr = rdev->dev_attr;

	qp = container_of(ib_qp, struct bnxt_re_qp, ib_qp);



	uctx = rdma_udata_to_drv_context(udata, struct bnxt_re_ucontext, ib_uctx);
@@ -1843,7 +1843,7 @@ int bnxt_re_create_srq(struct ib_srq *ib_srq, 
	ib_pd = ib_srq->pd;

	pd = container_of(ib_pd, struct bnxt_re_pd, ib_pd);

	rdev = pd->rdev;

	dev_attr = &rdev->dev_attr;

	dev_attr = rdev->dev_attr;

	srq = container_of(ib_srq, struct bnxt_re_srq, ib_srq);



	if (srq_init_attr->attr.max_wr >= dev_attr->max_srq_wqes) {
@@ -2047,7 +2047,7 @@ int bnxt_re_modify_qp(struct ib_qp *ib_qp, struct ib_qp_attr *qp_attr, 
{

	struct bnxt_re_qp *qp = container_of(ib_qp, struct bnxt_re_qp, ib_qp);

	struct bnxt_re_dev *rdev = qp->rdev;

	struct bnxt_qplib_dev_attr *dev_attr = &rdev->dev_attr;

	struct bnxt_qplib_dev_attr *dev_attr = rdev->dev_attr;

	enum ib_qp_state curr_qp_state, new_qp_state;

	int rc, entries;

	unsigned int flags;
@@ -3089,7 +3089,7 @@ int bnxt_re_create_cq(struct ib_cq *ibcq, const struct ib_cq_init_attr *attr, 
	struct ib_udata *udata = &attrs->driver_udata;

	struct bnxt_re_ucontext *uctx =

		rdma_udata_to_drv_context(udata, struct bnxt_re_ucontext, ib_uctx);

	struct bnxt_qplib_dev_attr *dev_attr = &rdev->dev_attr;

	struct bnxt_qplib_dev_attr *dev_attr = rdev->dev_attr;

	struct bnxt_qplib_chip_ctx *cctx;

	int cqe = attr->cqe;

	int rc, entries;
@@ -3224,7 +3224,7 @@ int bnxt_re_resize_cq(struct ib_cq *ibcq, int cqe, struct ib_udata *udata) 


	cq =  container_of(ibcq, struct bnxt_re_cq, ib_cq);

	rdev = cq->rdev;

	dev_attr = &rdev->dev_attr;

	dev_attr = rdev->dev_attr;

	if (!ibcq->uobject) {

		ibdev_err(&rdev->ibdev, "Kernel CQ Resize not supported");

		return -EOPNOTSUPP;
@@ -4197,7 +4197,7 @@ static struct ib_mr *__bnxt_re_user_reg_mr(struct ib_pd *ib_pd, u64 length, u64 
	mr->qplib_mr.access_flags = __from_ib_access_flags(mr_access_flags);

	mr->qplib_mr.type = CMDQ_ALLOCATE_MRW_MRW_FLAGS_MR;



	if (!_is_alloc_mr_unified(rdev->dev_attr.dev_cap_flags)) {

	if (!_is_alloc_mr_unified(rdev->dev_attr->dev_cap_flags)) {

		rc = bnxt_qplib_alloc_mrw(&rdev->qplib_res, &mr->qplib_mr);

		if (rc) {

			ibdev_err(&rdev->ibdev, "Failed to allocate MR rc = %d", rc);
@@ -4289,7 +4289,7 @@ int bnxt_re_alloc_ucontext(struct ib_ucontext *ctx, struct ib_udata *udata) 
	struct bnxt_re_ucontext *uctx =

		container_of(ctx, struct bnxt_re_ucontext, ib_uctx);

	struct bnxt_re_dev *rdev = to_bnxt_re_dev(ibdev, ibdev);

	struct bnxt_qplib_dev_attr *dev_attr = &rdev->dev_attr;

	struct bnxt_qplib_dev_attr *dev_attr = rdev->dev_attr;

	struct bnxt_re_user_mmap_entry *entry;

	struct bnxt_re_uctx_resp resp = {};

	struct bnxt_re_uctx_req ureq = {};

drivers/infiniband/hw/bnxt_re/main.c

+23 −13
Original line number Diff line number Diff line
@@ -148,6 +148,10 @@ static void bnxt_re_destroy_chip_ctx(struct bnxt_re_dev *rdev) 


	if (!rdev->chip_ctx)

		return;



	kfree(rdev->dev_attr);

	rdev->dev_attr = NULL;



	chip_ctx = rdev->chip_ctx;

	rdev->chip_ctx = NULL;

	rdev->rcfw.res = NULL;
@@ -161,7 +165,7 @@ static int bnxt_re_setup_chip_ctx(struct bnxt_re_dev *rdev) 
{

	struct bnxt_qplib_chip_ctx *chip_ctx;

	struct bnxt_en_dev *en_dev;

	int rc;

	int rc = -ENOMEM;



	en_dev = rdev->en_dev;
@@ -177,7 +181,10 @@ static int bnxt_re_setup_chip_ctx(struct bnxt_re_dev *rdev) 


	rdev->qplib_res.cctx = rdev->chip_ctx;

	rdev->rcfw.res = &rdev->qplib_res;

	rdev->qplib_res.dattr = &rdev->dev_attr;

	rdev->dev_attr = kzalloc(sizeof(*rdev->dev_attr), GFP_KERNEL);

	if (!rdev->dev_attr)

		goto free_chip_ctx;

	rdev->qplib_res.dattr = rdev->dev_attr;

	rdev->qplib_res.is_vf = BNXT_EN_VF(en_dev);

	rdev->qplib_res.en_dev = en_dev;
@@ -185,16 +192,20 @@ static int bnxt_re_setup_chip_ctx(struct bnxt_re_dev *rdev) 


	bnxt_re_set_db_offset(rdev);

	rc = bnxt_qplib_map_db_bar(&rdev->qplib_res);

	if (rc) {

		kfree(rdev->chip_ctx);

		rdev->chip_ctx = NULL;

		return rc;

	}

	if (rc)

		goto free_dev_attr;



	if (bnxt_qplib_determine_atomics(en_dev->pdev))

		ibdev_info(&rdev->ibdev,

			   "platform doesn't support global atomics.");

	return 0;

free_dev_attr:

	kfree(rdev->dev_attr);

	rdev->dev_attr = NULL;

free_chip_ctx:

	kfree(rdev->chip_ctx);

	rdev->chip_ctx = NULL;

	return rc;

}



/* SR-IOV helper functions */
@@ -216,7 +227,7 @@ static void bnxt_re_limit_pf_res(struct bnxt_re_dev *rdev) 
	struct bnxt_qplib_ctx *ctx;

	int i;



	attr = &rdev->dev_attr;

	attr = rdev->dev_attr;

	ctx = &rdev->qplib_ctx;



	ctx->qpc_count = min_t(u32, BNXT_RE_MAX_QPC_COUNT,
@@ -230,7 +241,7 @@ static void bnxt_re_limit_pf_res(struct bnxt_re_dev *rdev) 
	if (!bnxt_qplib_is_chip_gen_p5_p7(rdev->chip_ctx))

		for (i = 0; i < MAX_TQM_ALLOC_REQ; i++)

			rdev->qplib_ctx.tqm_ctx.qcount[i] =

			rdev->dev_attr.tqm_alloc_reqs[i];

			rdev->dev_attr->tqm_alloc_reqs[i];

}



static void bnxt_re_limit_vf_res(struct bnxt_qplib_ctx *qplib_ctx, u32 num_vf)
@@ -1726,12 +1737,11 @@ static int bnxt_re_alloc_res(struct bnxt_re_dev *rdev) 


	/* Configure and allocate resources for qplib */

	rdev->qplib_res.rcfw = &rdev->rcfw;

	rc = bnxt_qplib_get_dev_attr(&rdev->rcfw, &rdev->dev_attr);

	rc = bnxt_qplib_get_dev_attr(&rdev->rcfw);

	if (rc)

		goto fail;



	rc = bnxt_qplib_alloc_res(&rdev->qplib_res, rdev->en_dev->pdev,

				  rdev->netdev, &rdev->dev_attr);

	rc = bnxt_qplib_alloc_res(&rdev->qplib_res, rdev->netdev);

	if (rc)

		goto fail;
@@ -2160,7 +2170,7 @@ static int bnxt_re_dev_init(struct bnxt_re_dev *rdev, u8 op_type) 
			rdev->pacing.dbr_pacing = false;

		}

	}

	rc = bnxt_qplib_get_dev_attr(&rdev->rcfw, &rdev->dev_attr);

	rc = bnxt_qplib_get_dev_attr(&rdev->rcfw);

	if (rc)

		goto disable_rcfw;

drivers/infiniband/hw/bnxt_re/qplib_res.c

+3 −4
Original line number Diff line number Diff line
@@ -876,14 +876,13 @@ void bnxt_qplib_free_res(struct bnxt_qplib_res *res) 
	bnxt_qplib_free_dpi_tbl(res, &res->dpi_tbl);

}



int bnxt_qplib_alloc_res(struct bnxt_qplib_res *res, struct pci_dev *pdev,

			 struct net_device *netdev,

			 struct bnxt_qplib_dev_attr *dev_attr)

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

{

	struct bnxt_qplib_dev_attr *dev_attr;

	int rc;



	res->pdev = pdev;

	res->netdev = netdev;

	dev_attr = res->dattr;



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

	if (rc)