Commit ffebedb7 authored by Roland Dreier's avatar Roland Dreier
Browse files

Merge branches 'amso1100', 'bkl', 'cma', 'cxgb3', 'cxgb4', 'ipoib', 'iser',... 

Merge branches 'amso1100', 'bkl', 'cma', 'cxgb3', 'cxgb4', 'ipoib', 'iser', 'masked-atomics', 'misc', 'mthca' and 'nes' into for-next
parents e7494440 bc1db9af 5d7220e8 617c9a7e be4c9bad d4143717 9fda1ac5 6fa8f719 9893e742 3a2baff7 53978b46

MAINTAINERS

+14 −0
Original line number Diff line number Diff line
@@ -1719,6 +1719,20 @@ W: http://www.openfabrics.org 
S:	Supported

F:	drivers/infiniband/hw/cxgb3/



CXGB4 ETHERNET DRIVER (CXGB4)

M:	Dimitris Michailidis <dm@chelsio.com>

L:	netdev@vger.kernel.org

W:	http://www.chelsio.com

S:	Supported

F:	drivers/net/cxgb4/



CXGB4 IWARP RNIC DRIVER (IW_CXGB4)

M:	Steve Wise <swise@chelsio.com>

L:	linux-rdma@vger.kernel.org

W:	http://www.openfabrics.org

S:	Supported

F:	drivers/infiniband/hw/cxgb4/



CYBERPRO FB DRIVER

M:	Russell King <linux@arm.linux.org.uk>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

drivers/infiniband/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ source "drivers/infiniband/hw/ipath/Kconfig" 
source "drivers/infiniband/hw/ehca/Kconfig"

source "drivers/infiniband/hw/amso1100/Kconfig"

source "drivers/infiniband/hw/cxgb3/Kconfig"

source "drivers/infiniband/hw/cxgb4/Kconfig"

source "drivers/infiniband/hw/mlx4/Kconfig"

source "drivers/infiniband/hw/nes/Kconfig"

drivers/infiniband/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ obj-$(CONFIG_INFINIBAND_IPATH) += hw/ipath/ 
obj-$(CONFIG_INFINIBAND_EHCA)		+= hw/ehca/

obj-$(CONFIG_INFINIBAND_AMSO1100)	+= hw/amso1100/

obj-$(CONFIG_INFINIBAND_CXGB3)		+= hw/cxgb3/

obj-$(CONFIG_INFINIBAND_CXGB4)		+= hw/cxgb4/

obj-$(CONFIG_MLX4_INFINIBAND)		+= hw/mlx4/

obj-$(CONFIG_INFINIBAND_NES)		+= hw/nes/

obj-$(CONFIG_INFINIBAND_IPOIB)		+= ulp/ipoib/

drivers/infiniband/core/cma.c

+27 −47
Original line number Diff line number Diff line
@@ -79,7 +79,6 @@ static DEFINE_IDR(sdp_ps); 
static DEFINE_IDR(tcp_ps);

static DEFINE_IDR(udp_ps);

static DEFINE_IDR(ipoib_ps);

static int next_port;



struct cma_device {

	struct list_head	list;
@@ -1677,13 +1676,13 @@ int rdma_set_ib_paths(struct rdma_cm_id *id, 
	if (!cma_comp_exch(id_priv, CMA_ADDR_RESOLVED, CMA_ROUTE_RESOLVED))

		return -EINVAL;



	id->route.path_rec = kmalloc(sizeof *path_rec * num_paths, GFP_KERNEL);

	id->route.path_rec = kmemdup(path_rec, sizeof *path_rec * num_paths,

				     GFP_KERNEL);

	if (!id->route.path_rec) {

		ret = -ENOMEM;

		goto err;

	}



	memcpy(id->route.path_rec, path_rec, sizeof *path_rec * num_paths);

	id->route.num_paths = num_paths;

	return 0;

err:
@@ -1970,47 +1969,33 @@ static int cma_alloc_port(struct idr *ps, struct rdma_id_private *id_priv, 


static int cma_alloc_any_port(struct idr *ps, struct rdma_id_private *id_priv)

{

	struct rdma_bind_list *bind_list;

	int port, ret, low, high;



	bind_list = kzalloc(sizeof *bind_list, GFP_KERNEL);

	if (!bind_list)

		return -ENOMEM;



retry:

	/* FIXME: add proper port randomization per like inet_csk_get_port */

	do {

		ret = idr_get_new_above(ps, bind_list, next_port, &port);

	} while ((ret == -EAGAIN) && idr_pre_get(ps, GFP_KERNEL));



	if (ret)

		goto err1;

	static unsigned int last_used_port;

	int low, high, remaining;

	unsigned int rover;



	inet_get_local_port_range(&low, &high);

	if (port > high) {

		if (next_port != low) {

			idr_remove(ps, port);

			next_port = low;

			goto retry;

	remaining = (high - low) + 1;

	rover = net_random() % remaining + low;

retry:

	if (last_used_port != rover &&

	    !idr_find(ps, (unsigned short) rover)) {

		int ret = cma_alloc_port(ps, id_priv, rover);

		/*

		 * Remember previously used port number in order to avoid

		 * re-using same port immediately after it is closed.

		 */

		if (!ret)

			last_used_port = rover;

		if (ret != -EADDRNOTAVAIL)

			return ret;

	}

		ret = -EADDRNOTAVAIL;

		goto err2;

	if (--remaining) {

		rover++;

		if ((rover < low) || (rover > high))

			rover = low;

		goto retry;

	}



	if (port == high)

		next_port = low;

	else

		next_port = port + 1;



	bind_list->ps = ps;

	bind_list->port = (unsigned short) port;

	cma_bind_port(bind_list, id_priv);

	return 0;

err2:

	idr_remove(ps, port);

err1:

	kfree(bind_list);

	return ret;

	return -EADDRNOTAVAIL;

}



static int cma_use_port(struct idr *ps, struct rdma_id_private *id_priv)
@@ -2995,12 +2980,7 @@ static void cma_remove_one(struct ib_device *device) 


static int __init cma_init(void)

{

	int ret, low, high, remaining;



	get_random_bytes(&next_port, sizeof next_port);

	inet_get_local_port_range(&low, &high);

	remaining = (high - low) + 1;

	next_port = ((unsigned int) next_port % remaining) + low;

	int ret;



	cma_wq = create_singlethread_workqueue("rdma_cm");

	if (!cma_wq)

drivers/infiniband/core/mad.c

+1 −3
Original line number Diff line number Diff line
@@ -291,13 +291,11 @@ struct ib_mad_agent *ib_register_mad_agent(struct ib_device *device, 
	}



	if (mad_reg_req) {

		reg_req = kmalloc(sizeof *reg_req, GFP_KERNEL);

		reg_req = kmemdup(mad_reg_req, sizeof *reg_req, GFP_KERNEL);

		if (!reg_req) {

			ret = ERR_PTR(-ENOMEM);

			goto error3;

		}

		/* Make a copy of the MAD registration request */

		memcpy(reg_req, mad_reg_req, sizeof *reg_req);

	}



	/* Now, fill in the various structures */