[openib-general] [PATCH] RE: regression in ofed 1.2

[Steve Wise]

Should this be a problem for OFED 1.2?  I would think the ABI for all
backports should be the same, so it wouldn't be a problem.  Is this
true?  I'm assuming all backported UCMA modules would have the same
ABI.  



On Wed, 2007-01-31 at 11:19 -0800, Sean Hefty wrote:
> Here's a first attempt at a patch to allow the latest librdmacm to work with kernel ABI
> version 3 without crashing the kernel.  If you're trying to use a developmental kernel
> that has ABI 4, you'll have to update the kernel cma.
> 
> Note that I didn't actually run this against an older kernel (I need to reload that on my
> system), but did test this fix by forcing the abi to version 3 with a newer kernel loaded.
> 
> Signed-off-by: Sean Hefty <sean.hefty at intel.com>
> ---
> diff --git a/src/cma.c b/src/cma.c
> index 2d2a587..c5f8cd9 100644
> --- a/src/cma.c
> +++ b/src/cma.c
> @@ -653,11 +653,49 @@ static int ucma_modify_qp_err(struct rdma_cm_id *id)
>  	return ibv_modify_qp(id->qp, &qp_attr, IBV_QP_STATE);
>  }
>  
> +static int ucma_find_pkey(struct cma_device *cma_dev, uint8_t port_num,
> +			  uint16_t pkey, uint16_t *pkey_index)
> +{
> +	int ret, i;
> +	uint16_t chk_pkey;
> +
> +	for (i = 0, ret = 0; !ret; i++) {
> +		ret = ibv_query_pkey(cma_dev->verbs, port_num, i, &chk_pkey);
> +		if (!ret && pkey == chk_pkey) {
> +			*pkey_index = (uint16_t) i;
> +			return 0;
> +		}
> +	}
> +	return -EINVAL;
> +}
> +
> +static int ucma_init_conn_qp3(struct cma_id_private *id_priv, struct ibv_qp *qp)
> +{
> +	struct ibv_qp_attr qp_attr;
> +	int ret;
> +
> +	ret = ucma_find_pkey(id_priv->cma_dev, id_priv->id.port_num,
> +			     id_priv->id.route.addr.addr.ibaddr.pkey,
> +			     &qp_attr.pkey_index);
> +	if (ret)
> +		return ret;
> +
> +	qp_attr.port_num = id_priv->id.port_num;
> +	qp_attr.qp_state = IBV_QPS_INIT;
> +	qp_attr.qp_access_flags = 0;
> +
> +	return ibv_modify_qp(qp, &qp_attr, IBV_QP_STATE | IBV_QP_ACCESS_FLAGS |
> +					   IBV_QP_PKEY_INDEX | IBV_QP_PORT);
> +}
> +
>  static int ucma_init_conn_qp(struct cma_id_private *id_priv, struct ibv_qp *qp)
>  {
>  	struct ibv_qp_attr qp_attr;
>  	int qp_attr_mask, ret;
>  
> +	if (abi_ver == 3)
> +		return ucma_init_conn_qp3(id_priv, qp);
> +
>  	qp_attr.qp_state = IBV_QPS_INIT;
>  	ret = rdma_init_qp_attr(&id_priv->id, &qp_attr, &qp_attr_mask);
>  	if (ret)
> @@ -666,11 +704,44 @@ static int ucma_init_conn_qp(struct cma_id_private *id_priv, struct
> ibv_qp *qp)
>  	return ibv_modify_qp(qp, &qp_attr, qp_attr_mask);
>  }
>  
> +static int ucma_init_ud_qp3(struct cma_id_private *id_priv, struct ibv_qp *qp)
> +{
> +	struct ibv_qp_attr qp_attr;
> +	int ret;
> +
> +	ret = ucma_find_pkey(id_priv->cma_dev, id_priv->id.port_num,
> +			     id_priv->id.route.addr.addr.ibaddr.pkey,
> +			     &qp_attr.pkey_index);
> +	if (ret)
> +		return ret;
> +
> +	qp_attr.port_num = id_priv->id.port_num;
> +	qp_attr.qp_state = IBV_QPS_INIT;
> +	qp_attr.qkey = RDMA_UDP_QKEY;
> +
> +	ret = ibv_modify_qp(qp, &qp_attr, IBV_QP_STATE | IBV_QP_QKEY |
> +					  IBV_QP_PKEY_INDEX | IBV_QP_PORT);
> +	if (ret)
> +		return ret;
> +
> +	qp_attr.qp_state = IBV_QPS_RTR;
> +	ret = ibv_modify_qp(qp, &qp_attr, IBV_QP_STATE);
> +	if (ret)
> +		return ret;
> +
> +	qp_attr.qp_state = IBV_QPS_RTS;
> +	qp_attr.sq_psn = 0;
> +	return ibv_modify_qp(qp, &qp_attr, IBV_QP_STATE | IBV_QP_SQ_PSN);
> +}
> +
>  static int ucma_init_ud_qp(struct cma_id_private *id_priv, struct ibv_qp *qp)
>  {
>  	struct ibv_qp_attr qp_attr;
>  	int qp_attr_mask, ret;
>  
> +	if (abi_ver == 3)
> +		return ucma_init_ud_qp3(id_priv, qp);
> +
>  	qp_attr.qp_state = IBV_QPS_INIT;
>  	ret = rdma_init_qp_attr(&id_priv->id, &qp_attr, &qp_attr_mask);
>  	if (ret)
>