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

Commit c0a6cbb9 authored by Israel Rukshin's avatar Israel Rukshin Committed by Jason Gunthorpe
Browse files

RDMA/core: Rename signature qp create flag and signature device capability 



Rename IB_QP_CREATE_SIGNATURE_EN to IB_QP_CREATE_INTEGRITY_EN
and IB_DEVICE_SIGNATURE_HANDOVER to IB_DEVICE_INTEGRITY_HANDOVER.

Signed-off-by: default avatarIsrael Rukshin <israelr@mellanox.com>
Reviewed-by: default avatarMax Gurtovoy <maxg@mellanox.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJason Gunthorpe <jgg@mellanox.com>
parent 5a6781a5

drivers/infiniband/core/rw.c

+2 −2
Original line number Diff line number Diff line
@@ -688,7 +688,7 @@ void rdma_rw_init_qp(struct ib_device *dev, struct ib_qp_init_attr *attr) 
	 * we'll need two additional MRs for the registrations and the

	 * invalidation.

	 */

	if (attr->create_flags & IB_QP_CREATE_SIGNATURE_EN)

	if (attr->create_flags & IB_QP_CREATE_INTEGRITY_EN)

		factor += 6;	/* (inv + reg) * (data + prot + sig) */

	else if (rdma_rw_can_use_mr(dev, attr->port_num))

		factor += 2;	/* inv + reg */
@@ -709,7 +709,7 @@ int rdma_rw_init_mrs(struct ib_qp *qp, struct ib_qp_init_attr *attr) 
	u32 nr_mrs = 0, nr_sig_mrs = 0;

	int ret = 0;



	if (attr->create_flags & IB_QP_CREATE_SIGNATURE_EN) {

	if (attr->create_flags & IB_QP_CREATE_INTEGRITY_EN) {

		nr_sig_mrs = attr->cap.max_rdma_ctxs;

		nr_mrs = attr->cap.max_rdma_ctxs * 2;

	} else if (rdma_rw_can_use_mr(dev, attr->port_num)) {

drivers/infiniband/hw/mlx5/main.c

+1 −1
Original line number Diff line number Diff line
@@ -889,7 +889,7 @@ static int mlx5_ib_query_device(struct ib_device *ibdev, 
	}

	props->device_cap_flags |= IB_DEVICE_MEM_MGT_EXTENSIONS;

	if (MLX5_CAP_GEN(mdev, sho)) {

		props->device_cap_flags |= IB_DEVICE_SIGNATURE_HANDOVER;

		props->device_cap_flags |= IB_DEVICE_INTEGRITY_HANDOVER;

		/* At this stage no support for signature handover */

		props->sig_prot_cap = IB_PROT_T10DIF_TYPE_1 |

				      IB_PROT_T10DIF_TYPE_2 |

drivers/infiniband/hw/mlx5/mlx5_ib.h

+1 −2
Original line number Diff line number Diff line
@@ -431,8 +431,7 @@ struct mlx5_ib_qp { 


	int			create_type;



	/* Store signature errors */

	bool			signature_en;

	bool			integrity_en;



	struct list_head	qps_list;

	struct list_head	cq_recv_list;

drivers/infiniband/hw/mlx5/qp.c

+7 −7
Original line number Diff line number Diff line
@@ -442,7 +442,7 @@ static int calc_send_wqe(struct ib_qp_init_attr *attr) 
	}



	size += attr->cap.max_send_sge * sizeof(struct mlx5_wqe_data_seg);

	if (attr->create_flags & IB_QP_CREATE_SIGNATURE_EN &&

	if (attr->create_flags & IB_QP_CREATE_INTEGRITY_EN &&

	    ALIGN(max_t(int, inl_size, size), MLX5_SEND_WQE_BB) < MLX5_SIG_WQE_SIZE)

		return MLX5_SIG_WQE_SIZE;

	else
@@ -496,8 +496,8 @@ static int calc_sq_size(struct mlx5_ib_dev *dev, struct ib_qp_init_attr *attr, 
			      sizeof(struct mlx5_wqe_inline_seg);

	attr->cap.max_inline_data = qp->max_inline_data;



	if (attr->create_flags & IB_QP_CREATE_SIGNATURE_EN)

		qp->signature_en = true;

	if (attr->create_flags & IB_QP_CREATE_INTEGRITY_EN)

		qp->integrity_en = true;



	wq_size = roundup_pow_of_two(attr->cap.max_send_wr * wqe_size);

	qp->sq.wqe_cnt = wq_size / MLX5_SEND_WQE_BB;
@@ -1039,7 +1039,7 @@ static int create_kernel_qp(struct mlx5_ib_dev *dev, 
	void *qpc;

	int err;



	if (init_attr->create_flags & ~(IB_QP_CREATE_SIGNATURE_EN |

	if (init_attr->create_flags & ~(IB_QP_CREATE_INTEGRITY_EN |

					IB_QP_CREATE_BLOCK_MULTICAST_LOOPBACK |

					IB_QP_CREATE_IPOIB_UD_LSO |

					IB_QP_CREATE_NETIF_QP |
@@ -4714,7 +4714,7 @@ static int set_pi_umr_wr(const struct ib_send_wr *send_wr, 


	if (unlikely(send_wr->num_sge != 0) ||

	    unlikely(wr->access & IB_ACCESS_REMOTE_ATOMIC) ||

	    unlikely(!sig_mr->sig) || unlikely(!qp->signature_en) ||

	    unlikely(!sig_mr->sig) || unlikely(!qp->integrity_en) ||

	    unlikely(!sig_mr->sig->sig_status_checked))

		return -EINVAL;
@@ -4763,7 +4763,7 @@ static int set_sig_umr_wr(const struct ib_send_wr *send_wr, 


	if (unlikely(wr->wr.num_sge != 1) ||

	    unlikely(wr->access_flags & IB_ACCESS_REMOTE_ATOMIC) ||

	    unlikely(!sig_mr->sig) || unlikely(!qp->signature_en) ||

	    unlikely(!sig_mr->sig) || unlikely(!qp->integrity_en) ||

	    unlikely(!sig_mr->sig->sig_status_checked))

		return -EINVAL;

drivers/infiniband/ulp/iser/iser_verbs.c

+2 −2
Original line number Diff line number Diff line
@@ -399,7 +399,7 @@ static int iser_create_ib_conn_res(struct ib_conn *ib_conn) 
	init_attr.qp_type	= IB_QPT_RC;

	if (ib_conn->pi_support) {

		init_attr.cap.max_send_wr = ISER_QP_SIG_MAX_REQ_DTOS + 1;

		init_attr.create_flags |= IB_QP_CREATE_SIGNATURE_EN;

		init_attr.create_flags |= IB_QP_CREATE_INTEGRITY_EN;

		iser_conn->max_cmds =

			ISER_GET_MAX_XMIT_CMDS(ISER_QP_SIG_MAX_REQ_DTOS);

	} else {
@@ -712,7 +712,7 @@ static void iser_addr_handler(struct rdma_cm_id *cma_id) 
	/* connection T10-PI support */

	if (iser_pi_enable) {

		if (!(device->ib_device->attrs.device_cap_flags &

		      IB_DEVICE_SIGNATURE_HANDOVER)) {

		      IB_DEVICE_INTEGRITY_HANDOVER)) {

			iser_warn("T10-PI requested but not supported on %s, "

				  "continue without T10-PI\n",

				  dev_name(&ib_conn->device->ib_device->dev));