Commit 47ec3866 authored by Parav Pandit's avatar Parav Pandit Committed by Jason Gunthorpe
Browse files

RDMA: Convert drivers to use sgid_attr instead of sgid_index 



The core code now ensures that all driver callbacks that receive an
rdma_ah_attrs will have a sgid_attr's pointer if there is a GRH present.

Drivers can use this pointer instead of calling a query function with
sgid_index. This simplifies the drivers and also avoids races where a
gid_index lookup may return different data if it is changed.

Signed-off-by: default avatarParav Pandit <parav@mellanox.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@mellanox.com>
Signed-off-by: default avatarLeon Romanovsky <leonro@mellanox.com>
parent d97099fe

drivers/infiniband/hw/bnxt_re/ib_verbs.c

+22 −41
Original line number Diff line number Diff line
@@ -672,8 +672,6 @@ struct ib_ah *bnxt_re_create_ah(struct ib_pd *ib_pd, 
	int rc;

	u8 nw_type;



	struct ib_gid_attr sgid_attr;



	if (!(rdma_ah_get_ah_flags(ah_attr) & IB_AH_GRH)) {

		dev_err(rdev_to_dev(rdev), "Failed to alloc AH: GRH not set");

		return ERR_PTR(-EINVAL);
@@ -704,20 +702,11 @@ struct ib_ah *bnxt_re_create_ah(struct ib_pd *ib_pd, 
				    grh->dgid.raw) &&

	    !rdma_link_local_addr((struct in6_addr *)

				  grh->dgid.raw)) {

		union ib_gid sgid;

		const struct ib_gid_attr *sgid_attr;



		rc = ib_get_cached_gid(&rdev->ibdev, 1,

				       grh->sgid_index, &sgid,

				       &sgid_attr);

		if (rc) {

			dev_err(rdev_to_dev(rdev),

				"Failed to query gid at index %d",

				grh->sgid_index);

			goto fail;

		}

		dev_put(sgid_attr.ndev);

		sgid_attr = grh->sgid_attr;

		/* Get network header type for this GID */

		nw_type = ib_gid_to_network_type(sgid_attr.gid_type, &sgid);

		nw_type = rdma_gid_attr_network_type(sgid_attr);

		switch (nw_type) {

		case RDMA_NETWORK_IPV4:

			ah->qplib_ah.nw_type = CMDQ_CREATE_AH_TYPE_V2IPV4;
@@ -1598,9 +1587,6 @@ int bnxt_re_modify_qp(struct ib_qp *ib_qp, struct ib_qp_attr *qp_attr, 
	struct bnxt_qplib_dev_attr *dev_attr = &rdev->dev_attr;

	enum ib_qp_state curr_qp_state, new_qp_state;

	int rc, entries;

	int status;

	union ib_gid sgid;

	struct ib_gid_attr sgid_attr;

	unsigned int flags;

	u8 nw_type;
@@ -1667,6 +1653,7 @@ int bnxt_re_modify_qp(struct ib_qp *ib_qp, struct ib_qp_attr *qp_attr, 
	if (qp_attr_mask & IB_QP_AV) {

		const struct ib_global_route *grh =

			rdma_ah_read_grh(&qp_attr->ah_attr);

		const struct ib_gid_attr *sgid_attr;



		qp->qplib_qp.modify_flags |= CMDQ_MODIFY_QP_MODIFY_MASK_DGID |

				     CMDQ_MODIFY_QP_MODIFY_MASK_FLOW_LABEL |
@@ -1690,15 +1677,10 @@ 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);



		status = ib_get_cached_gid(&rdev->ibdev, 1,

					   grh->sgid_index,

					   &sgid, &sgid_attr);

		if (!status) {

			memcpy(qp->qplib_qp.smac, sgid_attr.ndev->dev_addr,

		sgid_attr = qp_attr->ah_attr.grh.sgid_attr;

		memcpy(qp->qplib_qp.smac, sgid_attr->ndev->dev_addr,

		       ETH_ALEN);

			dev_put(sgid_attr.ndev);

			nw_type = ib_gid_to_network_type(sgid_attr.gid_type,

							 &sgid);

		nw_type = rdma_gid_attr_network_type(sgid_attr);

		switch (nw_type) {

		case RDMA_NETWORK_IPV4:

			qp->qplib_qp.nw_type =
@@ -1714,7 +1696,6 @@ int bnxt_re_modify_qp(struct ib_qp *ib_qp, struct ib_qp_attr *qp_attr, 
			break;

		}

	}

	}



	if (qp_attr_mask & IB_QP_PATH_MTU) {

		qp->qplib_qp.modify_flags |=
@@ -1934,7 +1915,7 @@ static int bnxt_re_build_qp1_send_v2(struct bnxt_re_qp *qp, 
		dev_put(sgid_attr.ndev);

	}

	/* Get network header type for this GID */

	nw_type = ib_gid_to_network_type(sgid_attr.gid_type, &sgid);

	nw_type = rdma_gid_attr_network_type(&sgid_attr);

	switch (nw_type) {

	case RDMA_NETWORK_IPV4:

		nw_type = BNXT_RE_ROCEV2_IPV4_PACKET;

drivers/infiniband/hw/hns/hns_roce_ah.c

+4 −15
Original line number Diff line number Diff line
@@ -44,13 +44,11 @@ struct ib_ah *hns_roce_create_ah(struct ib_pd *ibpd, 
				 struct ib_udata *udata)

{

	struct hns_roce_dev *hr_dev = to_hr_dev(ibpd->device);

	const struct ib_gid_attr *gid_attr;

	struct device *dev = hr_dev->dev;

	struct ib_gid_attr gid_attr;

	struct hns_roce_ah *ah;

	u16 vlan_tag = 0xffff;

	const struct ib_global_route *grh = rdma_ah_read_grh(ah_attr);

	union ib_gid sgid;

	int ret;



	ah = kzalloc(sizeof(*ah), GFP_ATOMIC);

	if (!ah)
@@ -59,18 +57,9 @@ struct ib_ah *hns_roce_create_ah(struct ib_pd *ibpd, 
	/* Get mac address */

	memcpy(ah->av.mac, ah_attr->roce.dmac, ETH_ALEN);



	/* Get source gid */

	ret = ib_get_cached_gid(ibpd->device, rdma_ah_get_port_num(ah_attr),

				grh->sgid_index, &sgid, &gid_attr);

	if (ret) {

		dev_err(dev, "get sgid failed! ret = %d\n", ret);

		kfree(ah);

		return ERR_PTR(ret);

	}



	if (is_vlan_dev(gid_attr.ndev))

		vlan_tag = vlan_dev_vlan_id(gid_attr.ndev);

	dev_put(gid_attr.ndev);

	gid_attr = ah_attr->grh.sgid_attr;

	if (is_vlan_dev(gid_attr->ndev))

		vlan_tag = vlan_dev_vlan_id(gid_attr->ndev);



	if (vlan_tag < 0x1000)

		vlan_tag |= (rdma_ah_get_sl(ah_attr) &

drivers/infiniband/hw/mlx4/ah.c

+6 −10
Original line number Diff line number Diff line
@@ -82,12 +82,11 @@ static struct ib_ah *create_iboe_ah(struct ib_pd *pd, 
				    struct mlx4_ib_ah *ah)

{

	struct mlx4_ib_dev *ibdev = to_mdev(pd->device);

	const struct ib_gid_attr *gid_attr;

	struct mlx4_dev *dev = ibdev->dev;

	int is_mcast = 0;

	struct in6_addr in6;

	u16 vlan_tag = 0xffff;

	union ib_gid sgid;

	struct ib_gid_attr gid_attr;

	const struct ib_global_route *grh = rdma_ah_read_grh(ah_attr);

	int ret;
@@ -96,15 +95,12 @@ static struct ib_ah *create_iboe_ah(struct ib_pd *pd, 
		is_mcast = 1;



	memcpy(ah->av.eth.mac, ah_attr->roce.dmac, ETH_ALEN);

	ret = ib_get_cached_gid(pd->device, rdma_ah_get_port_num(ah_attr),

				grh->sgid_index, &sgid, &gid_attr);

	if (ret)

		return ERR_PTR(ret);

	eth_zero_addr(ah->av.eth.s_mac);

	if (is_vlan_dev(gid_attr.ndev))

		vlan_tag = vlan_dev_vlan_id(gid_attr.ndev);

	memcpy(ah->av.eth.s_mac, gid_attr.ndev->dev_addr, ETH_ALEN);

	dev_put(gid_attr.ndev);

	gid_attr = ah_attr->grh.sgid_attr;

	if (is_vlan_dev(gid_attr->ndev))

		vlan_tag = vlan_dev_vlan_id(gid_attr->ndev);

	memcpy(ah->av.eth.s_mac, gid_attr->ndev->dev_addr, ETH_ALEN);



	if (vlan_tag < 0x1000)

		vlan_tag |= (rdma_ah_get_sl(ah_attr) & 7) << 13;

	ah->av.eth.port_pd = cpu_to_be32(to_mpd(pd)->pdn |

drivers/infiniband/hw/mlx4/qp.c

+11 −20
Original line number Diff line number Diff line
@@ -2176,6 +2176,7 @@ static int __mlx4_ib_modify_qp(void *src, enum mlx4_ib_source_type src_type, 
{

	struct ib_uobject *ibuobject;

	struct ib_srq  *ibsrq;

	const struct ib_gid_attr *gid_attr = NULL;

	struct ib_rwq_ind_table *rwq_ind_tbl;

	enum ib_qp_type qp_type;

	struct mlx4_ib_dev *dev;
@@ -2356,29 +2357,17 @@ static int __mlx4_ib_modify_qp(void *src, enum mlx4_ib_source_type src_type, 
	if (attr_mask & IB_QP_AV) {

		u8 port_num = mlx4_is_bonded(dev->dev) ? 1 :

			attr_mask & IB_QP_PORT ? attr->port_num : qp->port;

		union ib_gid gid;

		struct ib_gid_attr gid_attr = {.gid_type = IB_GID_TYPE_IB};

		u16 vlan = 0xffff;

		u8 smac[ETH_ALEN];

		int status = 0;

		int is_eth =

			rdma_cap_eth_ah(&dev->ib_dev, port_num) &&

			rdma_ah_get_ah_flags(&attr->ah_attr) & IB_AH_GRH;



		if (is_eth) {

			int index =

				rdma_ah_read_grh(&attr->ah_attr)->sgid_index;



			status = ib_get_cached_gid(&dev->ib_dev, port_num,

						   index, &gid, &gid_attr);

			if (!status) {

				vlan = rdma_vlan_dev_vlan_id(gid_attr.ndev);

				memcpy(smac, gid_attr.ndev->dev_addr, ETH_ALEN);

				dev_put(gid_attr.ndev);

			}

			gid_attr = attr->ah_attr.grh.sgid_attr;

			vlan = rdma_vlan_dev_vlan_id(gid_attr->ndev);

			memcpy(smac, gid_attr->ndev->dev_addr, ETH_ALEN);

		}

		if (status)

			goto out;



		if (mlx4_set_path(dev, attr, attr_mask, qp, &context->pri_path,

				  port_num, vlan, smac))
@@ -2389,7 +2378,7 @@ static int __mlx4_ib_modify_qp(void *src, enum mlx4_ib_source_type src_type, 


		if (is_eth &&

		    (cur_state == IB_QPS_INIT && new_state == IB_QPS_RTR)) {

			u8 qpc_roce_mode = gid_type_to_qpc(gid_attr.gid_type);

			u8 qpc_roce_mode = gid_type_to_qpc(gid_attr->gid_type);



			if (qpc_roce_mode == MLX4_QPC_ROCE_MODE_UNDEFINED) {

				err = -EINVAL;
@@ -3181,10 +3170,12 @@ static int build_mlx_header(struct mlx4_ib_sqp *sqp, struct ib_ud_wr *wr, 
					to_mdev(ib_dev)->sriov.demux[sqp->qp.port - 1].

						       guid_cache[ah->av.ib.gid_index];

			} else {

				ib_get_cached_gid(ib_dev,

				err = rdma_query_gid(ib_dev,

					be32_to_cpu(ah->av.ib.port_pd) >> 24,

					ah->av.ib.gid_index,

						  &sqp->ud_header.grh.source_gid, NULL);

					&sqp->ud_header.grh.source_gid);

				if (err)

					return err;

			}

		}

		memcpy(sqp->ud_header.grh.destination_gid.raw,

drivers/infiniband/hw/mlx5/ah.c

+2 −9
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ static struct ib_ah *create_ib_ah(struct mlx5_ib_dev *dev, 
				  struct rdma_ah_attr *ah_attr)

{

	enum ib_gid_type gid_type;

	int err;



	if (rdma_ah_get_ah_flags(ah_attr) & IB_AH_GRH) {

		const struct ib_global_route *grh = rdma_ah_read_grh(ah_attr);
@@ -53,18 +52,12 @@ static struct ib_ah *create_ib_ah(struct mlx5_ib_dev *dev, 
	ah->av.stat_rate_sl = (rdma_ah_get_static_rate(ah_attr) << 4);



	if (ah_attr->type == RDMA_AH_ATTR_TYPE_ROCE) {

		err = mlx5_get_roce_gid_type(dev, ah_attr->port_num,

					     ah_attr->grh.sgid_index,

					     &gid_type);

		if (err)

			return ERR_PTR(err);

		gid_type = ah_attr->grh.sgid_attr->gid_type;



		memcpy(ah->av.rmac, ah_attr->roce.dmac,

		       sizeof(ah_attr->roce.dmac));

		ah->av.udp_sport =

		mlx5_get_roce_udp_sport(dev,

					rdma_ah_get_port_num(ah_attr),

					rdma_ah_read_grh(ah_attr)->sgid_index);

			mlx5_get_roce_udp_sport(dev, ah_attr->grh.sgid_attr);

		ah->av.stat_rate_sl |= (rdma_ah_get_sl(ah_attr) & 0x7) << 1;

		if (gid_type == IB_GID_TYPE_ROCE_UDP_ENCAP)

#define MLX5_ECN_ENABLED BIT(1)

CRA Git | Maintained and supported by SUSTech CRA and CCSE