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

Commit b1383aa6 authored by Noa Osherovich's avatar Noa Osherovich Committed by Doug Ledford
Browse files

IB/mlx5: Add PCI write end padding support 



Add the PCI write end padding flag to device_cap_flags enum and set it
during mlx5_ib_query_device so it will be reported to user-space.

During WQ/QP creation, set that capability for WQ/QP if user requested
it and HW supports it.

PCI write end padding modification is not supported for now. There's no
such flag for a QP but for a WQ, create and modify use the same flag.
Return an error if PCI write end padding flag is set during modify_wq.

Signed-off-by: default avatarNoa Osherovich <noaos@mellanox.com>
Reviewed-by: default avatarMajd Dibbiny <majd@mellanox.com>
Signed-off-by: default avatarLeon Romanovsky <leon@kernel.org>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent e1d2e887

drivers/infiniband/hw/mlx5/main.c

+3 −0
Original line number Diff line number Diff line
@@ -715,6 +715,9 @@ static int mlx5_ib_query_device(struct ib_device *ibdev, 
	if (mlx5_get_flow_namespace(dev->mdev, MLX5_FLOW_NAMESPACE_BYPASS))

		props->device_cap_flags |= IB_DEVICE_MANAGED_FLOW_STEERING;



	if (MLX5_CAP_GEN(mdev, end_pad))

		props->device_cap_flags |= IB_DEVICE_PCI_WRITE_END_PADDING;



	props->vendor_part_id	   = mdev->pdev->device;

	props->hw_ver		   = mdev->pdev->revision;

drivers/infiniband/hw/mlx5/mlx5_ib.h

+2 −1
Original line number Diff line number Diff line
@@ -228,6 +228,7 @@ struct wr_list { 


enum mlx5_ib_rq_flags {

	MLX5_IB_RQ_CVLAN_STRIPPING	= 1 << 0,

	MLX5_IB_RQ_PCI_WRITE_END_PADDING	= 1 << 1,

};



struct mlx5_ib_wq {
@@ -421,7 +422,7 @@ enum mlx5_ib_qp_flags { 
	MLX5_IB_QP_RSS				= 1 << 8,

	MLX5_IB_QP_CVLAN_STRIPPING		= 1 << 9,

	MLX5_IB_QP_UNDERLAY			= 1 << 10,

	/* Reserved for PCI_WRITE_PAD 		= 1 << 11, */

	MLX5_IB_QP_PCI_WRITE_END_PADDING	= 1 << 11,

	MLX5_IB_QP_TUNNEL_OFFLOAD		= 1 << 12,

};

drivers/infiniband/hw/mlx5/qp.c

+33 −3
Original line number Diff line number Diff line
@@ -1178,8 +1178,8 @@ static int create_raw_packet_qp_rq(struct mlx5_ib_dev *dev, 


	wq = MLX5_ADDR_OF(rqc, rqc, wq);

	MLX5_SET(wq, wq, wq_type, MLX5_WQ_TYPE_CYCLIC);

	MLX5_SET(wq, wq, end_padding_mode,

		 MLX5_GET(qpc, qpc, end_padding_mode));

	if (rq->flags & MLX5_IB_RQ_PCI_WRITE_END_PADDING)

		MLX5_SET(wq, wq, end_padding_mode, MLX5_WQ_END_PAD_MODE_ALIGN);

	MLX5_SET(wq, wq, page_offset, MLX5_GET(qpc, qpc, page_offset));

	MLX5_SET(wq, wq, pd, MLX5_GET(qpc, qpc, pd));

	MLX5_SET64(wq, wq, dbr_addr, MLX5_GET64(qpc, qpc, dbr_addr));
@@ -1276,6 +1276,8 @@ static int create_raw_packet_qp(struct mlx5_ib_dev *dev, struct mlx5_ib_qp *qp, 


		if (qp->flags & MLX5_IB_QP_CVLAN_STRIPPING)

			rq->flags |= MLX5_IB_RQ_CVLAN_STRIPPING;

		if (qp->flags & MLX5_IB_QP_PCI_WRITE_END_PADDING)

			rq->flags |= MLX5_IB_RQ_PCI_WRITE_END_PADDING;

		err = create_raw_packet_qp_rq(dev, rq, in);

		if (err)

			goto err_destroy_sq;
@@ -1821,6 +1823,19 @@ static int create_qp_common(struct mlx5_ib_dev *dev, struct ib_pd *pd, 
		qp->flags |= MLX5_IB_QP_LSO;

	}



	if (init_attr->create_flags & IB_QP_CREATE_PCI_WRITE_END_PADDING) {

		if (!MLX5_CAP_GEN(dev->mdev, end_pad)) {

			mlx5_ib_dbg(dev, "scatter end padding is not supported\n");

			err = -EOPNOTSUPP;

			goto err;

		} else if (init_attr->qp_type != IB_QPT_RAW_PACKET) {

			MLX5_SET(qpc, qpc, end_padding_mode,

				 MLX5_WQ_END_PAD_MODE_ALIGN);

		} else {

			qp->flags |= MLX5_IB_QP_PCI_WRITE_END_PADDING;

		}

	}



	if (init_attr->qp_type == IB_QPT_RAW_PACKET ||

	    qp->flags & MLX5_IB_QP_UNDERLAY) {

		qp->raw_packet_qp.sq.ubuffer.buf_addr = ucmd.sq_buf_addr;
@@ -1865,6 +1880,7 @@ static int create_qp_common(struct mlx5_ib_dev *dev, struct ib_pd *pd, 
	else if (qp->create_type == MLX5_QP_KERNEL)

		destroy_qp_kernel(dev, qp);



err:

	kvfree(in);

	return err;

}
@@ -4749,7 +4765,15 @@ static int create_rq(struct mlx5_ib_rwq *rwq, struct ib_pd *pd, 
	MLX5_SET(wq, wq, wq_type,

		 rwq->create_flags & MLX5_IB_WQ_FLAGS_STRIDING_RQ ?

		 MLX5_WQ_TYPE_CYCLIC_STRIDING_RQ : MLX5_WQ_TYPE_CYCLIC);

	if (init_attr->create_flags & IB_WQ_FLAGS_PCI_WRITE_END_PADDING) {

		if (!MLX5_CAP_GEN(dev->mdev, end_pad)) {

			mlx5_ib_dbg(dev, "Scatter end padding is not supported\n");

			err = -EOPNOTSUPP;

			goto out;

		} else {

			MLX5_SET(wq, wq, end_padding_mode, MLX5_WQ_END_PAD_MODE_ALIGN);

		}

	}

	MLX5_SET(wq, wq, log_wq_stride, rwq->log_rq_stride);

	if (rwq->create_flags & MLX5_IB_WQ_FLAGS_STRIDING_RQ) {

		MLX5_SET(wq, wq, two_byte_shift_en, rwq->two_byte_shift_en);
@@ -5129,6 +5153,12 @@ int mlx5_ib_modify_wq(struct ib_wq *wq, struct ib_wq_attr *wq_attr, 
			MLX5_SET(rqc, rqc, vsd,

				 (wq_attr->flags & IB_WQ_FLAGS_CVLAN_STRIPPING) ? 0 : 1);

		}



		if (wq_attr->flags_mask & IB_WQ_FLAGS_PCI_WRITE_END_PADDING) {

			mlx5_ib_dbg(dev, "Modifying scatter end padding is not supported\n");

			err = -EOPNOTSUPP;

			goto out;

		}

	}



	if (curr_wq_state == IB_WQS_RESET && wq_state == IB_WQS_RDY) {