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

Commit ed88451e authored by Majd Dibbiny's avatar Majd Dibbiny Committed by Doug Ledford
Browse files

IB/mlx5: Assign DSCP for R-RoCE QPs Address Path 



For Routable RoCE QPs, the DSCP should be set in the QP's
address path.

The DSCP's value is derived from the traffic class.

Fixes: 2811ba51 ("IB/mlx5: Add RoCE fields to Address Vector")
Cc: Achiad Shochat <achiad@mellanox.com>
Signed-off-by: default avatarMajd Dibbiny <majd@mellanox.com>
Reviewed-by: default avatarMoni Shoua <monis@mellanox.com>
Signed-off-by: default avatarLeon Romanovsky <leon@kernel.org>
Reviewed-by: default avatarYuval Shaia <yuval.shaia@oracle.com>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent 1e0e50b6

drivers/infiniband/hw/mlx5/main.c

+21 −0
Original line number Diff line number Diff line
@@ -325,6 +325,27 @@ __be16 mlx5_get_roce_udp_sport(struct mlx5_ib_dev *dev, u8 port_num, 
	return cpu_to_be16(MLX5_CAP_ROCE(dev->mdev, r_roce_min_src_udp_port));

}



int mlx5_get_roce_gid_type(struct mlx5_ib_dev *dev, u8 port_num,

			   int index, enum ib_gid_type *gid_type)

{

	struct ib_gid_attr attr;

	union ib_gid gid;

	int ret;



	ret = ib_get_cached_gid(&dev->ib_dev, port_num, index, &gid, &attr);

	if (ret)

		return ret;



	if (!attr.ndev)

		return -ENODEV;



	dev_put(attr.ndev);



	*gid_type = attr.gid_type;



	return 0;

}



static int mlx5_use_mad_ifc(struct mlx5_ib_dev *dev)

{

	if (MLX5_CAP_GEN(dev->mdev, port_type) == MLX5_CAP_PORT_TYPE_IB)

drivers/infiniband/hw/mlx5/mlx5_ib.h

+2 −0
Original line number Diff line number Diff line
@@ -872,6 +872,8 @@ int mlx5_ib_set_vf_guid(struct ib_device *device, int vf, u8 port, 


__be16 mlx5_get_roce_udp_sport(struct mlx5_ib_dev *dev, u8 port_num,

			       int index);

int mlx5_get_roce_gid_type(struct mlx5_ib_dev *dev, u8 port_num,

			   int index, enum ib_gid_type *gid_type);



/* GSI QP helper functions */

struct ib_qp *mlx5_ib_gsi_create_qp(struct ib_pd *pd,

drivers/infiniband/hw/mlx5/qp.c

+7 −0
Original line number Diff line number Diff line
@@ -2198,6 +2198,7 @@ static int mlx5_set_path(struct mlx5_ib_dev *dev, struct mlx5_ib_qp *qp, 
{

	enum rdma_link_layer ll = rdma_port_get_link_layer(&dev->ib_dev, port);

	int err;

	enum ib_gid_type gid_type;



	if (attr_mask & IB_QP_PKEY_INDEX)

		path->pkey_index = cpu_to_be16(alt ? attr->alt_pkey_index :
@@ -2216,10 +2217,16 @@ static int mlx5_set_path(struct mlx5_ib_dev *dev, struct mlx5_ib_qp *qp, 
	if (ll == IB_LINK_LAYER_ETHERNET) {

		if (!(ah->ah_flags & IB_AH_GRH))

			return -EINVAL;

		err = mlx5_get_roce_gid_type(dev, port, ah->grh.sgid_index,

					     &gid_type);

		if (err)

			return err;

		memcpy(path->rmac, ah->dmac, sizeof(ah->dmac));

		path->udp_sport = mlx5_get_roce_udp_sport(dev, port,

							  ah->grh.sgid_index);

		path->dci_cfi_prio_sl = (ah->sl & 0x7) << 4;

		if (gid_type == IB_GID_TYPE_ROCE_UDP_ENCAP)

			path->ecn_dscp = (ah->grh.traffic_class >> 2) & 0x3f;

	} else {

		path->fl_free_ar = (path_flags & MLX5_PATH_FLAG_FL) ? 0x80 : 0;

		path->fl_free_ar |=