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

Commit 5992fd19 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband 

* 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband:
  IPoIB: Correct debugging output when path record lookup fails
  RDMA/cxgb3: Stop the EP Timer on BAD CLOSE
  RDMA/cxgb3: cleanups
  RDMA/cma: Remove unused node_guid from cma_device structure
  IB/cm: Remove ca_guid from cm_device structure
  RDMA/cma: Request reversible paths only
  IB/core: Set hop limit in ib_init_ah_from_wc correctly
  IB/uverbs: Return correct error for invalid PD in register MR
  IPoIB: Remove unused local_rate tracking
  IPoIB/cm: Improve small message bandwidth
  IB/mthca: Make 2 functions static
parents eafb4f18 843613b0

drivers/infiniband/core/cm.c

+4 −6
Original line number Diff line number Diff line
@@ -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 @@ static void cm_destroy_id(struct ib_cm_id *cm_id, int err) 
		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++) {

drivers/infiniband/core/cma.c

+3 −3
Original line number Diff line number Diff line
@@ -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;
@@ -1492,11 +1491,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);
@@ -2672,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);

drivers/infiniband/core/uverbs_cmd.c

+3 −1
Original line number Diff line number Diff line
@@ -622,8 +622,10 @@ ssize_t ib_uverbs_reg_mr(struct ib_uverbs_file *file, 
	obj->umem.virt_base = cmd.hca_va;



	pd = idr_read_pd(cmd.pd_handle, file->ucontext);

	if (!pd)

	if (!pd) {

		ret = -EINVAL;

		goto err_release;

	}



	mr = pd->device->reg_user_mr(pd, &obj->umem, cmd.access_flags, &udata);

	if (IS_ERR(mr)) {

drivers/infiniband/core/verbs.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

drivers/infiniband/hw/cxgb3/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -8,5 +8,4 @@ iw_cxgb3-y := iwch_cm.o iwch_ev.o iwch_cq.o iwch_qp.o iwch_mem.o \ 


ifdef CONFIG_INFINIBAND_CXGB3_DEBUG

EXTRA_CFLAGS += -DDEBUG

iw_cxgb3-y += cxio_dbg.o

endif