Commit 2d873449 authored by Doug Ledford's avatar Doug Ledford
Browse files

Merge branch 'k.o/wip/dl-for-rc' into k.o/wip/dl-for-next 



Due to bug fixes found by the syzkaller bot and taken into the for-rc
branch after development for the 4.17 merge window had already started
being taken into the for-next branch, there were fairly non-trivial
merge issues that would need to be resolved between the for-rc branch
and the for-next branch.  This merge resolves those conflicts and
provides a unified base upon which ongoing development for 4.17 can
be based.

Conflicts:
	drivers/infiniband/hw/mlx5/main.c - Commit 42cea83f
	(IB/mlx5: Fix cleanup order on unload) added to for-rc and
	commit b5ca15ad (IB/mlx5: Add proper representors support)
	add as part of the devel cycle both needed to modify the
	init/de-init functions used by mlx5.  To support the new
	representors, the new functions added by the cleanup patch
	needed to be made non-static, and the init/de-init list
	added by the representors patch needed to be modified to
	match the init/de-init list changes made by the cleanup
	patch.
Updates:
	drivers/infiniband/hw/mlx5/mlx5_ib.h - Update function
	prototypes added by representors patch to reflect new function
	names as changed by cleanup patch
	drivers/infiniband/hw/mlx5/ib_rep.c - Update init/de-init
	stage list to match new order from cleanup patch

Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parents 06892cc1 bd8602ca

drivers/infiniband/core/addr.c

+5 −10
Original line number Diff line number Diff line
@@ -550,18 +550,13 @@ static int addr_resolve(struct sockaddr *src_in, 
		dst_release(dst);

	}



	if (ndev->flags & IFF_LOOPBACK) {

	if (ndev) {

		if (ndev->flags & IFF_LOOPBACK)

			ret = rdma_translate_ip(dst_in, addr);

		/*

		 * Put the loopback device and get the translated

		 * device instead.

		 */

		dev_put(ndev);

		ndev = dev_get_by_index(addr->net, addr->bound_dev_if);

	} else {

		else

			addr->bound_dev_if = ndev->ifindex;

	}

		dev_put(ndev);

	}



	return ret;

}

drivers/infiniband/core/cma.c

+10 −5
Original line number Diff line number Diff line
@@ -3043,7 +3043,8 @@ static int cma_port_is_unique(struct rdma_bind_list *bind_list, 
			continue;



		/* different dest port -> unique */

		if (!cma_any_port(cur_daddr) &&

		if (!cma_any_port(daddr) &&

		    !cma_any_port(cur_daddr) &&

		    (dport != cur_dport))

			continue;
@@ -3054,7 +3055,8 @@ static int cma_port_is_unique(struct rdma_bind_list *bind_list, 
			continue;



		/* different dst address -> unique */

		if (!cma_any_addr(cur_daddr) &&

		if (!cma_any_addr(daddr) &&

		    !cma_any_addr(cur_daddr) &&

		    cma_addr_cmp(daddr, cur_daddr))

			continue;
@@ -3352,13 +3354,13 @@ int rdma_bind_addr(struct rdma_cm_id *id, struct sockaddr *addr) 
		}

#endif

	}

	daddr = cma_dst_addr(id_priv);

	daddr->sa_family = addr->sa_family;



	ret = cma_get_port(id_priv);

	if (ret)

		goto err2;



	daddr = cma_dst_addr(id_priv);

	daddr->sa_family = addr->sa_family;



	return 0;

err2:

	if (id_priv->cma_dev) {
@@ -4153,6 +4155,9 @@ int rdma_join_multicast(struct rdma_cm_id *id, struct sockaddr *addr, 
	struct cma_multicast *mc;

	int ret;



	if (!id->device)

		return -EINVAL;



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

	if (!cma_comp(id_priv, RDMA_CM_ADDR_BOUND) &&

	    !cma_comp(id_priv, RDMA_CM_ADDR_RESOLVED))

drivers/infiniband/core/cq.c

+11 −10
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 


/* # of WCs to poll for with a single call to ib_poll_cq */

#define IB_POLL_BATCH			16

#define IB_POLL_BATCH_DIRECT		8



/* # of WCs to iterate over before yielding */

#define IB_POLL_BUDGET_IRQ		256
@@ -25,17 +26,17 @@ 
#define IB_POLL_FLAGS \

	(IB_CQ_NEXT_COMP | IB_CQ_REPORT_MISSED_EVENTS)



static int __ib_process_cq(struct ib_cq *cq, int budget, struct ib_wc *poll_wc)

static int __ib_process_cq(struct ib_cq *cq, int budget, struct ib_wc *wcs,

			   int batch)

{

	int i, n, completed = 0;

	struct ib_wc *wcs = poll_wc ? : cq->wc;



	/*

	 * budget might be (-1) if the caller does not

	 * want to bound this call, thus we need unsigned

	 * minimum here.

	 */

	while ((n = ib_poll_cq(cq, min_t(u32, IB_POLL_BATCH,

	while ((n = ib_poll_cq(cq, min_t(u32, batch,

					 budget - completed), wcs)) > 0) {

		for (i = 0; i < n; i++) {

			struct ib_wc *wc = &wcs[i];
@@ -48,8 +49,7 @@ static int __ib_process_cq(struct ib_cq *cq, int budget, struct ib_wc *poll_wc) 


		completed += n;



		if (n != IB_POLL_BATCH ||

		    (budget != -1 && completed >= budget))

		if (n != batch || (budget != -1 && completed >= budget))

			break;

	}
@@ -72,9 +72,9 @@ static int __ib_process_cq(struct ib_cq *cq, int budget, struct ib_wc *poll_wc) 
 */

int ib_process_cq_direct(struct ib_cq *cq, int budget)

{

	struct ib_wc wcs[IB_POLL_BATCH];

	struct ib_wc wcs[IB_POLL_BATCH_DIRECT];



	return __ib_process_cq(cq, budget, wcs);

	return __ib_process_cq(cq, budget, wcs, IB_POLL_BATCH_DIRECT);

}

EXPORT_SYMBOL(ib_process_cq_direct);
@@ -88,7 +88,7 @@ static int ib_poll_handler(struct irq_poll *iop, int budget) 
	struct ib_cq *cq = container_of(iop, struct ib_cq, iop);

	int completed;



	completed = __ib_process_cq(cq, budget, NULL);

	completed = __ib_process_cq(cq, budget, cq->wc, IB_POLL_BATCH);

	if (completed < budget) {

		irq_poll_complete(&cq->iop);

		if (ib_req_notify_cq(cq, IB_POLL_FLAGS) > 0)
@@ -108,7 +108,8 @@ static void ib_cq_poll_work(struct work_struct *work) 
	struct ib_cq *cq = container_of(work, struct ib_cq, work);

	int completed;



	completed = __ib_process_cq(cq, IB_POLL_BUDGET_WORKQUEUE, NULL);

	completed = __ib_process_cq(cq, IB_POLL_BUDGET_WORKQUEUE, cq->wc,

				    IB_POLL_BATCH);

	if (completed >= IB_POLL_BUDGET_WORKQUEUE ||

	    ib_req_notify_cq(cq, IB_POLL_FLAGS) > 0)

		queue_work(ib_comp_wq, &cq->work);

drivers/infiniband/core/device.c

+4 −2
Original line number Diff line number Diff line
@@ -536,14 +536,14 @@ int ib_register_device(struct ib_device *device, 
	ret = device->query_device(device, &device->attrs, &uhw);

	if (ret) {

		pr_warn("Couldn't query the device attributes\n");

		goto cache_cleanup;

		goto cg_cleanup;

	}



	ret = ib_device_register_sysfs(device, port_callback);

	if (ret) {

		pr_warn("Couldn't register device %s with driver model\n",

			device->name);

		goto cache_cleanup;

		goto cg_cleanup;

	}



	device->reg_state = IB_DEV_REGISTERED;
@@ -559,6 +559,8 @@ int ib_register_device(struct ib_device *device, 
	mutex_unlock(&device_mutex);

	return 0;



cg_cleanup:

	ib_device_unregister_rdmacg(device);

cache_cleanup:

	ib_cache_cleanup_one(device);

	ib_cache_release_one(device);

drivers/infiniband/core/sa_query.c

+3 −4
Original line number Diff line number Diff line
@@ -1291,10 +1291,9 @@ int ib_init_ah_attr_from_path(struct ib_device *device, u8 port_num, 


		resolved_dev = dev_get_by_index(dev_addr.net,

						dev_addr.bound_dev_if);

		if (resolved_dev->flags & IFF_LOOPBACK) {

			dev_put(resolved_dev);

			resolved_dev = idev;

			dev_hold(resolved_dev);

		if (!resolved_dev) {

			dev_put(idev);

			return -ENODEV;

		}

		ndev = ib_get_ndev_from_path(rec);

		rcu_read_lock();

CRA Git | Maintained and supported by SUSTech CRA and CCSE