Commit 75e98b34 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband: (104 commits)
  IB/iser: Don't change itt endianness
  IB/mlx4: Update module version and release date
  IPoIB: Handle case when P_Key is deleted and re-added at same index
  IB/iser: Release connection resources on RDMA_CM_EVENT_DEVICE_REMOVAL event
  IB/mlx4: Fix incorrect comment
  IB/mlx4: Fix race when detaching a QP from a multicast group
  IB/ehca: Support all ibv_devinfo values in query_device() and query_port()
  RDMA/nes: Free IRQ before killing tasklet
  IB/mthca: Update module version and release date
  IB/mlx4: Update QP state if query QP succeeds
  IB/mthca: Update QP state if query QP succeeds
  RDMA/amso1100: Add check for NULL reply_msg in c2_intr()
  IB/mlx4: Add support for resizing CQs
  IB/mlx4: Add support for modifying CQ moderation parameters
  IPoIB: Support modifying IPoIB CQ event moderation
  IB/core: Add support for modify CQ
  IPoIB: Add basic ethtool support
  mlx4_core: Increase max number of QPs to 128K
  RDMA/amso1100: Add support for "send with invalidate" work requests
  IB/core: Add support for "send with invalidate" work requests
  ...
parents 30bc9456 0a22ab92

drivers/infiniband/core/cm.c

+44 −19
Original line number Diff line number Diff line
@@ -467,6 +467,31 @@ static int cm_compare_private_data(u8 *private_data, 
	return memcmp(src, dst_data->data, IB_CM_COMPARE_SIZE);

}



/*

 * Trivial helpers to strip endian annotation and compare; the

 * endianness doesn't actually matter since we just need a stable

 * order for the RB tree.

 */

static int be32_lt(__be32 a, __be32 b)

{

	return (__force u32) a < (__force u32) b;

}



static int be32_gt(__be32 a, __be32 b)

{

	return (__force u32) a > (__force u32) b;

}



static int be64_lt(__be64 a, __be64 b)

{

	return (__force u64) a < (__force u64) b;

}



static int be64_gt(__be64 a, __be64 b)

{

	return (__force u64) a > (__force u64) b;

}



static struct cm_id_private * cm_insert_listen(struct cm_id_private *cm_id_priv)

{

	struct rb_node **link = &cm.listen_service_table.rb_node;
@@ -492,9 +517,9 @@ static struct cm_id_private * cm_insert_listen(struct cm_id_private *cm_id_priv) 
			link = &(*link)->rb_left;

		else if (cm_id_priv->id.device > cur_cm_id_priv->id.device)

			link = &(*link)->rb_right;

		else if (service_id < cur_cm_id_priv->id.service_id)

		else if (be64_lt(service_id, cur_cm_id_priv->id.service_id))

			link = &(*link)->rb_left;

		else if (service_id > cur_cm_id_priv->id.service_id)

		else if (be64_gt(service_id, cur_cm_id_priv->id.service_id))

			link = &(*link)->rb_right;

		else if (data_cmp < 0)

			link = &(*link)->rb_left;
@@ -527,9 +552,9 @@ static struct cm_id_private * cm_find_listen(struct ib_device *device, 
			node = node->rb_left;

		else if (device > cm_id_priv->id.device)

			node = node->rb_right;

		else if (service_id < cm_id_priv->id.service_id)

		else if (be64_lt(service_id, cm_id_priv->id.service_id))

			node = node->rb_left;

		else if (service_id > cm_id_priv->id.service_id)

		else if (be64_gt(service_id, cm_id_priv->id.service_id))

			node = node->rb_right;

		else if (data_cmp < 0)

			node = node->rb_left;
@@ -552,13 +577,13 @@ static struct cm_timewait_info * cm_insert_remote_id(struct cm_timewait_info 
		parent = *link;

		cur_timewait_info = rb_entry(parent, struct cm_timewait_info,

					     remote_id_node);

		if (remote_id < cur_timewait_info->work.remote_id)

		if (be32_lt(remote_id, cur_timewait_info->work.remote_id))

			link = &(*link)->rb_left;

		else if (remote_id > cur_timewait_info->work.remote_id)

		else if (be32_gt(remote_id, cur_timewait_info->work.remote_id))

			link = &(*link)->rb_right;

		else if (remote_ca_guid < cur_timewait_info->remote_ca_guid)

		else if (be64_lt(remote_ca_guid, cur_timewait_info->remote_ca_guid))

			link = &(*link)->rb_left;

		else if (remote_ca_guid > cur_timewait_info->remote_ca_guid)

		else if (be64_gt(remote_ca_guid, cur_timewait_info->remote_ca_guid))

			link = &(*link)->rb_right;

		else

			return cur_timewait_info;
@@ -578,13 +603,13 @@ static struct cm_timewait_info * cm_find_remote_id(__be64 remote_ca_guid, 
	while (node) {

		timewait_info = rb_entry(node, struct cm_timewait_info,

					 remote_id_node);

		if (remote_id < timewait_info->work.remote_id)

		if (be32_lt(remote_id, timewait_info->work.remote_id))

			node = node->rb_left;

		else if (remote_id > timewait_info->work.remote_id)

		else if (be32_gt(remote_id, timewait_info->work.remote_id))

			node = node->rb_right;

		else if (remote_ca_guid < timewait_info->remote_ca_guid)

		else if (be64_lt(remote_ca_guid, timewait_info->remote_ca_guid))

			node = node->rb_left;

		else if (remote_ca_guid > timewait_info->remote_ca_guid)

		else if (be64_gt(remote_ca_guid, timewait_info->remote_ca_guid))

			node = node->rb_right;

		else

			return timewait_info;
@@ -605,13 +630,13 @@ static struct cm_timewait_info * cm_insert_remote_qpn(struct cm_timewait_info 
		parent = *link;

		cur_timewait_info = rb_entry(parent, struct cm_timewait_info,

					     remote_qp_node);

		if (remote_qpn < cur_timewait_info->remote_qpn)

		if (be32_lt(remote_qpn, cur_timewait_info->remote_qpn))

			link = &(*link)->rb_left;

		else if (remote_qpn > cur_timewait_info->remote_qpn)

		else if (be32_gt(remote_qpn, cur_timewait_info->remote_qpn))

			link = &(*link)->rb_right;

		else if (remote_ca_guid < cur_timewait_info->remote_ca_guid)

		else if (be64_lt(remote_ca_guid, cur_timewait_info->remote_ca_guid))

			link = &(*link)->rb_left;

		else if (remote_ca_guid > cur_timewait_info->remote_ca_guid)

		else if (be64_gt(remote_ca_guid, cur_timewait_info->remote_ca_guid))

			link = &(*link)->rb_right;

		else

			return cur_timewait_info;
@@ -635,9 +660,9 @@ static struct cm_id_private * cm_insert_remote_sidr(struct cm_id_private 
		parent = *link;

		cur_cm_id_priv = rb_entry(parent, struct cm_id_private,

					  sidr_id_node);

		if (remote_id < cur_cm_id_priv->id.remote_id)

		if (be32_lt(remote_id, cur_cm_id_priv->id.remote_id))

			link = &(*link)->rb_left;

		else if (remote_id > cur_cm_id_priv->id.remote_id)

		else if (be32_gt(remote_id, cur_cm_id_priv->id.remote_id))

			link = &(*link)->rb_right;

		else {

			int cmp;
@@ -2848,7 +2873,7 @@ static void cm_format_sidr_req(struct cm_sidr_req_msg *sidr_req_msg, 
	cm_format_mad_hdr(&sidr_req_msg->hdr, CM_SIDR_REQ_ATTR_ID,

			  cm_form_tid(cm_id_priv, CM_MSG_SEQUENCE_SIDR));

	sidr_req_msg->request_id = cm_id_priv->id.local_id;

	sidr_req_msg->pkey = cpu_to_be16(param->path->pkey);

	sidr_req_msg->pkey = param->path->pkey;

	sidr_req_msg->service_id = param->service_id;



	if (param->private_data && param->private_data_len)

drivers/infiniband/core/cma.c

+1 −1
Original line number Diff line number Diff line
@@ -1289,7 +1289,7 @@ static int iw_conn_req_handler(struct iw_cm_id *cm_id, 
	new_cm_id = rdma_create_id(listen_id->id.event_handler,

				   listen_id->id.context,

				   RDMA_PS_TCP);

	if (!new_cm_id) {

	if (IS_ERR(new_cm_id)) {

		ret = -ENOMEM;

		goto out;

	}

drivers/infiniband/core/fmr_pool.c

+1 −2
Original line number Diff line number Diff line
@@ -158,8 +158,7 @@ static void ib_fmr_batch_release(struct ib_fmr_pool *pool) 
#endif

	}



	list_splice(&pool->dirty_list, &unmap_list);

	INIT_LIST_HEAD(&pool->dirty_list);

	list_splice_init(&pool->dirty_list, &unmap_list);

	pool->dirty_len = 0;



	spin_unlock_irq(&pool->pool_lock);

drivers/infiniband/core/ucma.c

+1 −1
Original line number Diff line number Diff line
@@ -614,7 +614,7 @@ static ssize_t ucma_query_route(struct ucma_file *file, 
	if (!ctx->cm_id->device)

		goto out;



	resp.node_guid = ctx->cm_id->device->node_guid;

	resp.node_guid = (__force __u64) ctx->cm_id->device->node_guid;

	resp.port_num = ctx->cm_id->port_num;

	switch (rdma_node_get_transport(ctx->cm_id->device->node_type)) {

	case RDMA_TRANSPORT_IB:

drivers/infiniband/core/uverbs.h

+2 −2
Original line number Diff line number Diff line
@@ -81,13 +81,13 @@ struct ib_uverbs_device { 


struct ib_uverbs_event_file {

	struct kref				ref;

	struct file			       *file;

	struct ib_uverbs_file		       *uverbs_file;

	spinlock_t				lock;

	int					is_async;

	wait_queue_head_t			poll_wait;

	struct fasync_struct		       *async_queue;

	struct list_head			event_list;

	int					is_async;

	int					is_closed;

};



struct ib_uverbs_file {

CRA Git | Maintained and supported by SUSTech CRA and CCSE