diff mbox series

[for-next,2/2] RDMA/bnxt_re: Retrieve the driver gid context from gid_attr

Message ID 1576146143-28264-3-git-send-email-selvin.xavier@broadcom.com (mailing list archive)
State Superseded
Headers show
Series Retrieve HW GID context from ib_gid_attr | expand

Commit Message

Selvin Xavier Dec. 12, 2019, 10:22 a.m. UTC 
Use the container_of macro to retrieve the driver gid
context.

Signed-off-by: Devesh Sharma <devesh.sharma@broadcom.com>
Signed-off-by: Selvin Xavier <selvin.xavier@broadcom.com>
---
 drivers/infiniband/hw/bnxt_re/ib_verbs.c | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

Comments

Parav Pandit Dec. 13, 2019, 11:21 p.m. UTC | #1 
On 12/12/2019 3:52 PM, Selvin Xavier wrote:
> Use the container_of macro to retrieve the driver gid
> context.
> 
> Signed-off-by: Devesh Sharma <devesh.sharma@broadcom.com>
> Signed-off-by: Selvin Xavier <selvin.xavier@broadcom.com>
> ---
>  drivers/infiniband/hw/bnxt_re/ib_verbs.c | 28 +++++++++++++++-------------
>  1 file changed, 15 insertions(+), 13 deletions(-)
> 
> diff --git a/drivers/infiniband/hw/bnxt_re/ib_verbs.c b/drivers/infiniband/hw/bnxt_re/ib_verbs.c
> index ad5112a..bd657fb 100644
> --- a/drivers/infiniband/hw/bnxt_re/ib_verbs.c
> +++ b/drivers/infiniband/hw/bnxt_re/ib_verbs.c
> @@ -640,6 +640,8 @@ int bnxt_re_create_ah(struct ib_ah *ib_ah, struct rdma_ah_attr *ah_attr,
>  	struct bnxt_re_dev *rdev = pd->rdev;
>  	const struct ib_gid_attr *sgid_attr;
>  	struct bnxt_re_ah *ah = container_of(ib_ah, struct bnxt_re_ah, ib_ah);
> +	struct ib_gid_attr_info *info;
> +	struct bnxt_re_gid_ctx *ctx = NULL;
ctx is alwyas asigned without any condition from info.
So no need for null initialzation.

>  	u8 nw_type;
>  	int rc;
>  
> @@ -651,22 +653,21 @@ int bnxt_re_create_ah(struct ib_ah *ib_ah, struct rdma_ah_attr *ah_attr,
>  	ah->rdev = rdev;
>  	ah->qplib_ah.pd = &pd->qplib_pd;
>  
> +	sgid_attr = grh->sgid_attr;
> +
> +	info = container_of(sgid_attr, struct ib_gid_attr_info, attr);
> +	ctx = info->context;
> +
>  	/* Supply the configuration for the HW */
>  	memcpy(ah->qplib_ah.dgid.data, grh->dgid.raw,
>  	       sizeof(union ib_gid));
> -	/*
> -	 * If RoCE V2 is enabled, stack will have two entries for
> -	 * each GID entry. Avoiding this duplicte entry in HW. Dividing
> -	 * the GID index by 2 for RoCE V2
> -	 */
> -	ah->qplib_ah.sgid_index = grh->sgid_index / 2;
> +	ah->qplib_ah.sgid_index = ctx->idx;
>  	ah->qplib_ah.host_sgid_index = grh->sgid_index;
>  	ah->qplib_ah.traffic_class = grh->traffic_class;
>  	ah->qplib_ah.flow_label = grh->flow_label;
>  	ah->qplib_ah.hop_limit = grh->hop_limit;
>  	ah->qplib_ah.sl = rdma_ah_get_sl(ah_attr);
>  
> -	sgid_attr = grh->sgid_attr;
>  	/* Get network header type for this GID */
>  	nw_type = rdma_gid_attr_network_type(sgid_attr);
>  	ah->qplib_ah.nw_type = bnxt_re_stack_to_dev_nw_type(nw_type);
> @@ -1521,6 +1522,8 @@ int bnxt_re_modify_qp(struct ib_qp *ib_qp, struct ib_qp_attr *qp_attr,
>  	struct bnxt_re_dev *rdev = qp->rdev;
>  	struct bnxt_qplib_dev_attr *dev_attr = &rdev->dev_attr;
>  	enum ib_qp_state curr_qp_state, new_qp_state;
> +	struct ib_gid_attr_info *info;
> +	struct bnxt_re_gid_ctx *ctx = NULL;
>  	int rc, entries;
>  	unsigned int flags;
>  	u8 nw_type;
> @@ -1592,6 +1595,10 @@ int bnxt_re_modify_qp(struct ib_qp *ib_qp, struct ib_qp_attr *qp_attr,
>  			rdma_ah_read_grh(&qp_attr->ah_attr);
>  		const struct ib_gid_attr *sgid_attr;
>  
> +		sgid_attr = qp_attr->ah_attr.grh.sgid_attr;
> +		info = container_of(sgid_attr, struct ib_gid_attr_info, attr);
> +		ctx = info->context;
> +
>  		qp->qplib_qp.modify_flags |= CMDQ_MODIFY_QP_MODIFY_MASK_DGID |
>  				     CMDQ_MODIFY_QP_MODIFY_MASK_FLOW_LABEL |
>  				     CMDQ_MODIFY_QP_MODIFY_MASK_SGID_INDEX |
> @@ -1602,11 +1609,7 @@ int bnxt_re_modify_qp(struct ib_qp *ib_qp, struct ib_qp_attr *qp_attr,
>  		memcpy(qp->qplib_qp.ah.dgid.data, grh->dgid.raw,
>  		       sizeof(qp->qplib_qp.ah.dgid.data));
>  		qp->qplib_qp.ah.flow_label = grh->flow_label;
> -		/* If RoCE V2 is enabled, stack will have two entries for
> -		 * each GID entry. Avoiding this duplicte entry in HW. Dividing
> -		 * the GID index by 2 for RoCE V2
> -		 */
> -		qp->qplib_qp.ah.sgid_index = grh->sgid_index / 2;
> +		qp->qplib_qp.ah.sgid_index = ctx->idx;
>  		qp->qplib_qp.ah.host_sgid_index = grh->sgid_index;
>  		qp->qplib_qp.ah.hop_limit = grh->hop_limit;
>  		qp->qplib_qp.ah.traffic_class = grh->traffic_class;
> @@ -1614,7 +1617,6 @@ int bnxt_re_modify_qp(struct ib_qp *ib_qp, struct ib_qp_attr *qp_attr,
>  		ether_addr_copy(qp->qplib_qp.ah.dmac,
>  				qp_attr->ah_attr.roce.dmac);
>  
> -		sgid_attr = qp_attr->ah_attr.grh.sgid_attr;
>  		rc = rdma_read_gid_l2_fields(sgid_attr, NULL,
>  					     &qp->qplib_qp.smac[0]);
>  		if (rc)
>
diff mbox series

Patch

diff --git a/drivers/infiniband/hw/bnxt_re/ib_verbs.c b/drivers/infiniband/hw/bnxt_re/ib_verbs.c
index ad5112a..bd657fb 100644
--- a/drivers/infiniband/hw/bnxt_re/ib_verbs.c
+++ b/drivers/infiniband/hw/bnxt_re/ib_verbs.c
@@ -640,6 +640,8 @@  int bnxt_re_create_ah(struct ib_ah *ib_ah, struct rdma_ah_attr *ah_attr,
 	struct bnxt_re_dev *rdev = pd->rdev;
 	const struct ib_gid_attr *sgid_attr;
 	struct bnxt_re_ah *ah = container_of(ib_ah, struct bnxt_re_ah, ib_ah);
+	struct ib_gid_attr_info *info;
+	struct bnxt_re_gid_ctx *ctx = NULL;
 	u8 nw_type;
 	int rc;
 
@@ -651,22 +653,21 @@  int bnxt_re_create_ah(struct ib_ah *ib_ah, struct rdma_ah_attr *ah_attr,
 	ah->rdev = rdev;
 	ah->qplib_ah.pd = &pd->qplib_pd;
 
+	sgid_attr = grh->sgid_attr;
+
+	info = container_of(sgid_attr, struct ib_gid_attr_info, attr);
+	ctx = info->context;
+
 	/* Supply the configuration for the HW */
 	memcpy(ah->qplib_ah.dgid.data, grh->dgid.raw,
 	       sizeof(union ib_gid));
-	/*
-	 * If RoCE V2 is enabled, stack will have two entries for
-	 * each GID entry. Avoiding this duplicte entry in HW. Dividing
-	 * the GID index by 2 for RoCE V2
-	 */
-	ah->qplib_ah.sgid_index = grh->sgid_index / 2;
+	ah->qplib_ah.sgid_index = ctx->idx;
 	ah->qplib_ah.host_sgid_index = grh->sgid_index;
 	ah->qplib_ah.traffic_class = grh->traffic_class;
 	ah->qplib_ah.flow_label = grh->flow_label;
 	ah->qplib_ah.hop_limit = grh->hop_limit;
 	ah->qplib_ah.sl = rdma_ah_get_sl(ah_attr);
 
-	sgid_attr = grh->sgid_attr;
 	/* Get network header type for this GID */
 	nw_type = rdma_gid_attr_network_type(sgid_attr);
 	ah->qplib_ah.nw_type = bnxt_re_stack_to_dev_nw_type(nw_type);
@@ -1521,6 +1522,8 @@  int bnxt_re_modify_qp(struct ib_qp *ib_qp, struct ib_qp_attr *qp_attr,
 	struct bnxt_re_dev *rdev = qp->rdev;
 	struct bnxt_qplib_dev_attr *dev_attr = &rdev->dev_attr;
 	enum ib_qp_state curr_qp_state, new_qp_state;
+	struct ib_gid_attr_info *info;
+	struct bnxt_re_gid_ctx *ctx = NULL;
 	int rc, entries;
 	unsigned int flags;
 	u8 nw_type;
@@ -1592,6 +1595,10 @@  int bnxt_re_modify_qp(struct ib_qp *ib_qp, struct ib_qp_attr *qp_attr,
 			rdma_ah_read_grh(&qp_attr->ah_attr);
 		const struct ib_gid_attr *sgid_attr;
 
+		sgid_attr = qp_attr->ah_attr.grh.sgid_attr;
+		info = container_of(sgid_attr, struct ib_gid_attr_info, attr);
+		ctx = info->context;
+
 		qp->qplib_qp.modify_flags |= CMDQ_MODIFY_QP_MODIFY_MASK_DGID |
 				     CMDQ_MODIFY_QP_MODIFY_MASK_FLOW_LABEL |
 				     CMDQ_MODIFY_QP_MODIFY_MASK_SGID_INDEX |
@@ -1602,11 +1609,7 @@  int bnxt_re_modify_qp(struct ib_qp *ib_qp, struct ib_qp_attr *qp_attr,
 		memcpy(qp->qplib_qp.ah.dgid.data, grh->dgid.raw,
 		       sizeof(qp->qplib_qp.ah.dgid.data));
 		qp->qplib_qp.ah.flow_label = grh->flow_label;
-		/* If RoCE V2 is enabled, stack will have two entries for
-		 * each GID entry. Avoiding this duplicte entry in HW. Dividing
-		 * the GID index by 2 for RoCE V2
-		 */
-		qp->qplib_qp.ah.sgid_index = grh->sgid_index / 2;
+		qp->qplib_qp.ah.sgid_index = ctx->idx;
 		qp->qplib_qp.ah.host_sgid_index = grh->sgid_index;
 		qp->qplib_qp.ah.hop_limit = grh->hop_limit;
 		qp->qplib_qp.ah.traffic_class = grh->traffic_class;
@@ -1614,7 +1617,6 @@  int bnxt_re_modify_qp(struct ib_qp *ib_qp, struct ib_qp_attr *qp_attr,
 		ether_addr_copy(qp->qplib_qp.ah.dmac,
 				qp_attr->ah_attr.roce.dmac);
 
-		sgid_attr = qp_attr->ah_attr.grh.sgid_attr;
 		rc = rdma_read_gid_l2_fields(sgid_attr, NULL,
 					     &qp->qplib_qp.smac[0]);
 		if (rc)