Commit d892273b authored by Doug Ledford's avatar Doug Ledford
Browse files

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma into for-next 



I had merged the hfi1-tid code into my local copy of for-next, but was
waiting on 0day testing before pushing it (I pushed it to my wip
branch).  Having waited several days for 0day testing to show up, I'm
finally just going to push it out.  In the meantime, though, Jason
pushed other stuff to for-next, so I needed to merge up the branches
before pushing.

Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parents 82771f20 a8714595

.clang-format

+1 −0
Original line number Diff line number Diff line
@@ -240,6 +240,7 @@ ForEachMacros: 
  - 'for_each_set_bit'

  - 'for_each_set_bit_from'

  - 'for_each_sg'

  - 'for_each_sg_dma_page'

  - 'for_each_sg_page'

  - 'for_each_sibling_event'

  - '__for_each_thread'

drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c

+7 −1
Original line number Diff line number Diff line
@@ -311,7 +311,13 @@ static dma_addr_t __vmw_piter_dma_addr(struct vmw_piter *viter) 


static dma_addr_t __vmw_piter_sg_addr(struct vmw_piter *viter)

{

	return sg_page_iter_dma_address(&viter->iter);

	/*

	 * FIXME: This driver wrongly mixes DMA and CPU SG list iteration and

	 * needs revision. See

	 * https://lore.kernel.org/lkml/20190104223531.GA1705@ziepe.ca/

	 */

	return sg_page_iter_dma_address(

		container_of(&viter->iter, struct sg_dma_page_iter, base));

}

drivers/infiniband/core/cache.c

+3 −0
Original line number Diff line number Diff line
@@ -1460,6 +1460,9 @@ void ib_cache_release_one(struct ib_device *device) 
{

	int p;



	if (!device->cache.ports)

		return;



	/*

	 * The release function frees all the cache elements.

	 * This function should be called as part of freeing

drivers/infiniband/core/cma.c

+36 −0
Original line number Diff line number Diff line
@@ -888,6 +888,7 @@ struct rdma_cm_id *__rdma_create_id(struct net *net, 
	id_priv->id.ps = ps;

	id_priv->id.qp_type = qp_type;

	id_priv->tos_set = false;

	id_priv->timeout_set = false;

	id_priv->gid_type = IB_GID_TYPE_IB;

	spin_lock_init(&id_priv->lock);

	mutex_init(&id_priv->qp_mutex);
@@ -1130,6 +1131,9 @@ int rdma_init_qp_attr(struct rdma_cm_id *id, struct ib_qp_attr *qp_attr, 
	} else

		ret = -ENOSYS;



	if ((*qp_attr_mask & IB_QP_TIMEOUT) && id_priv->timeout_set)

		qp_attr->timeout = id_priv->timeout;



	return ret;

}

EXPORT_SYMBOL(rdma_init_qp_attr);
@@ -2410,6 +2414,7 @@ static int cma_iw_listen(struct rdma_id_private *id_priv, int backlog) 
		return PTR_ERR(id);



	id->tos = id_priv->tos;

	id->tos_set = id_priv->tos_set;

	id_priv->cm_id.iw = id;



	memcpy(&id_priv->cm_id.iw->local_addr, cma_src_addr(id_priv),
@@ -2462,6 +2467,8 @@ static void cma_listen_on_dev(struct rdma_id_private *id_priv, 
	atomic_inc(&id_priv->refcount);

	dev_id_priv->internal_id = 1;

	dev_id_priv->afonly = id_priv->afonly;

	dev_id_priv->tos_set = id_priv->tos_set;

	dev_id_priv->tos = id_priv->tos;



	ret = rdma_listen(id, id_priv->backlog);

	if (ret)
@@ -2490,6 +2497,34 @@ void rdma_set_service_type(struct rdma_cm_id *id, int tos) 
}

EXPORT_SYMBOL(rdma_set_service_type);



/**

 * rdma_set_ack_timeout() - Set the ack timeout of QP associated

 *                          with a connection identifier.

 * @id: Communication identifier to associated with service type.

 * @timeout: Ack timeout to set a QP, expressed as 4.096 * 2^(timeout) usec.

 *

 * This function should be called before rdma_connect() on active side,

 * and on passive side before rdma_accept(). It is applicable to primary

 * path only. The timeout will affect the local side of the QP, it is not

 * negotiated with remote side and zero disables the timer.

 *

 * Return: 0 for success

 */

int rdma_set_ack_timeout(struct rdma_cm_id *id, u8 timeout)

{

	struct rdma_id_private *id_priv;



	if (id->qp_type != IB_QPT_RC)

		return -EINVAL;



	id_priv = container_of(id, struct rdma_id_private, id);

	id_priv->timeout = timeout;

	id_priv->timeout_set = true;



	return 0;

}

EXPORT_SYMBOL(rdma_set_ack_timeout);



static void cma_query_handler(int status, struct sa_path_rec *path_rec,

			      void *context)

{
@@ -3809,6 +3844,7 @@ static int cma_connect_iw(struct rdma_id_private *id_priv, 
		return PTR_ERR(cm_id);



	cm_id->tos = id_priv->tos;

	cm_id->tos_set = id_priv->tos_set;

	id_priv->cm_id.iw = cm_id;



	memcpy(&cm_id->local_addr, cma_src_addr(id_priv),

drivers/infiniband/core/cma_priv.h

+3 −1
Original line number Diff line number Diff line
@@ -84,9 +84,11 @@ struct rdma_id_private { 
	u32			options;

	u8			srq;

	u8			tos;

	bool			tos_set;

	u8			tos_set:1;

	u8                      timeout_set:1;

	u8			reuseaddr;

	u8			afonly;

	u8			timeout;

	enum ib_gid_type	gid_type;



	/*

CRA Git | Maintained and supported by SUSTech CRA and CCSE