On Fri, 2007-02-23 at 12:15 -0800, Sean Hefty wrote:
> I would like these fixes in OFED 1.2 as well. What git tree / branch do I
> generate a patch against?
>
> - Sean
git://git.openfabrics.org/~vlad/ofed_1_2/.git
branch: ofed_1_2
- Vladimir
>
> ---
>
> rdma_cm: remove unused node_guid from cma_device structure.
> ib_cm: remove ca_guid from cm_device structure.
> rdma_cm: request reversible paths only.
> ib_core: Set hop limit in ib_init_ah_from_wc correctly.
>
> The patches are in:
>
> git://git.openfabrics.org/~shefty/rdma-dev.git for-roland
>
> (sign-off line was added to the actual commit messages)
>
> Signed-off-by: Sean Hefty <[EMAIL PROTECTED]>
> ---
> commit 28e218621d36cf9da42f07af08775769eb289fc0
> Author: Sean Hefty <[EMAIL PROTECTED]>
> Date: Thu Feb 22 11:37:44 2007 -0800
>
> rdma_cm: remove unused node_guid from cma_device structure.
>
> diff --git a/drivers/infiniband/core/cma.c b/drivers/infiniband/core/cma.c
> index bb27ce9..d441815 100644
> --- a/drivers/infiniband/core/cma.c
> +++ b/drivers/infiniband/core/cma.c
> @@ -77,7 +77,6 @@ static int next_port;
> struct cma_device {
> struct list_head list;
> struct ib_device *device;
> - __be64 node_guid;
> struct completion comp;
> atomic_t refcount;
> struct list_head id_list;
> @@ -2674,7 +2673,6 @@ static void cma_add_one(struct ib_device *device)
> return;
>
> cma_dev->device = device;
> - cma_dev->node_guid = device->node_guid;
>
> init_completion(&cma_dev->comp);
> atomic_set(&cma_dev->refcount, 1);
>
> commit 6de97f2a3373357d720b1653dfc0aac6d40b7506
> Author: Sean Hefty <[EMAIL PROTECTED]>
> Date: Thu Feb 22 11:37:38 2007 -0800
>
> ib_cm: remove ca_guid from cm_device structure.
>
> The cm_device references an ib_device, which contains the node_guid.
>
> diff --git a/drivers/infiniband/core/cm.c b/drivers/infiniband/core/cm.c
> index d446998..842cd0b 100644
> --- a/drivers/infiniband/core/cm.c
> +++ b/drivers/infiniband/core/cm.c
> @@ -88,7 +88,6 @@ struct cm_port {
> struct cm_device {
> struct list_head list;
> struct ib_device *device;
> - __be64 ca_guid;
> struct cm_port port[0];
> };
>
> @@ -739,8 +738,8 @@ retest:
> ib_cancel_mad(cm_id_priv->av.port->mad_agent, cm_id_priv->msg);
> spin_unlock_irqrestore(&cm_id_priv->lock, flags);
> ib_send_cm_rej(cm_id, IB_CM_REJ_TIMEOUT,
> - &cm_id_priv->av.port->cm_dev->ca_guid,
> - sizeof cm_id_priv->av.port->cm_dev->ca_guid,
> + &cm_id_priv->id.device->node_guid,
> + sizeof cm_id_priv->id.device->node_guid,
> NULL, 0);
> break;
> case IB_CM_REQ_RCVD:
> @@ -883,7 +882,7 @@ static void cm_format_req(struct cm_req_msg *req_msg,
>
> req_msg->local_comm_id = cm_id_priv->id.local_id;
> req_msg->service_id = param->service_id;
> - req_msg->local_ca_guid = cm_id_priv->av.port->cm_dev->ca_guid;
> + req_msg->local_ca_guid = cm_id_priv->id.device->node_guid;
> cm_req_set_local_qpn(req_msg, cpu_to_be32(param->qp_num));
> cm_req_set_resp_res(req_msg, param->responder_resources);
> cm_req_set_init_depth(req_msg, param->initiator_depth);
> @@ -1442,7 +1441,7 @@ static void cm_format_rep(struct cm_rep_msg *rep_msg,
> cm_rep_set_flow_ctrl(rep_msg, param->flow_control);
> cm_rep_set_rnr_retry_count(rep_msg, param->rnr_retry_count);
> cm_rep_set_srq(rep_msg, param->srq);
> - rep_msg->local_ca_guid = cm_id_priv->av.port->cm_dev->ca_guid;
> + rep_msg->local_ca_guid = cm_id_priv->id.device->node_guid;
>
> if (param->private_data && param->private_data_len)
> memcpy(rep_msg->private_data, param->private_data,
> @@ -3385,7 +3384,6 @@ static void cm_add_one(struct ib_device *device)
> return;
>
> cm_dev->device = device;
> - cm_dev->ca_guid = device->node_guid;
>
> set_bit(IB_MGMT_METHOD_SEND, reg_req.method_mask);
> for (i = 1; i <= device->phys_port_cnt; i++) {
>
> commit 87680047dd09ca4a4e8ec575dad215c92cf45ed3
> Author: Sean Hefty <[EMAIL PROTECTED]>
> Date: Wed Feb 21 16:40:44 2007 -0800
>
> rdma_cm: request reversible paths only
>
> The rdma_cm requires that path records be reversible. Set the reversible
> bit when issuing an path record query.
>
> diff --git a/drivers/infiniband/core/cma.c b/drivers/infiniband/core/cma.c
> index f8d69b3..bb27ce9 100644
> --- a/drivers/infiniband/core/cma.c
> +++ b/drivers/infiniband/core/cma.c
> @@ -1492,11 +1492,13 @@ static int cma_query_ib_route(struct rdma_id_private
> *id_priv, int timeout_ms,
> ib_addr_get_dgid(addr, &path_rec.dgid);
> path_rec.pkey = cpu_to_be16(ib_addr_get_pkey(addr));
> path_rec.numb_path = 1;
> + path_rec.reversible = 1;
>
> id_priv->query_id = ib_sa_path_rec_get(&sa_client, id_priv->id.device,
> id_priv->id.port_num, &path_rec,
> IB_SA_PATH_REC_DGID | IB_SA_PATH_REC_SGID |
> - IB_SA_PATH_REC_PKEY | IB_SA_PATH_REC_NUMB_PATH,
> + IB_SA_PATH_REC_PKEY | IB_SA_PATH_REC_NUMB_PATH |
> + IB_SA_PATH_REC_REVERSIBLE,
> timeout_ms, GFP_KERNEL,
> cma_query_handler, work, &id_priv->query);
>
>
> commit 30947e5b7db42184d66746ac1187d4abbf89018d
> Author: Sean Hefty <[EMAIL PROTECTED]>
> Date: Wed Feb 21 16:37:31 2007 -0800
>
> ib_core: Set hop limit in ib_init_ah_from_wc correctly.
>
> The hop_limit value in the ah_attr should be 0xFF, not the value read
> from the received GRH (which should be 0). See 13.5.4.4 in the 1.2 IB
> spec.
>
> diff --git a/drivers/infiniband/core/verbs.c b/drivers/infiniband/core/verbs.c
> index 8b5dd36..ccdf93d 100644
> --- a/drivers/infiniband/core/verbs.c
> +++ b/drivers/infiniband/core/verbs.c
> @@ -167,7 +167,7 @@ int ib_init_ah_from_wc(struct ib_device *device, u8
> port_num, struct ib_wc *wc,
> ah_attr->grh.sgid_index = (u8) gid_index;
> flow_class = be32_to_cpu(grh->version_tclass_flow);
> ah_attr->grh.flow_label = flow_class & 0xFFFFF;
> - ah_attr->grh.hop_limit = grh->hop_limit;
> + ah_attr->grh.hop_limit = 0xFF;
> ah_attr->grh.traffic_class = (flow_class >> 20) & 0xFF;
> }
> return 0;
_______________________________________________
openib-general mailing list
[email protected]
http://openib.org/mailman/listinfo/openib-general
To unsubscribe, please visit http://openib.org/mailman/listinfo/openib-general
