Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband (99f1c97d) · Commits · 戴 / test

Documentation/feature-removal-schedule.txt

+0 −10

Original line number	Diff line number	Diff line
		@@ -295,16 +295,6 @@ Who: linuxppc-dev@ozlabs.org

		---------------------------

		What: mthca driver's MSI support
		When: January 2008
		Files: drivers/infiniband/hw/mthca/*.[ch]
		Why: All mthca hardware also supports MSI-X, which provides
		strictly more functionality than MSI. So there is no point in
		having both MSI-X and MSI support in the driver.
		Who: Roland Dreier <rolandd@cisco.com>

		---------------------------

		What: sk98lin network driver
		When: Feburary 2008
		Why: In kernel tree version of driver is unmaintained. Sk98lin driver

drivers/infiniband/core/cm.c

+288 −18

Original line number	Diff line number	Diff line
		/*
		* Copyright (c) 2004-2006 Intel Corporation. All rights reserved.
		* Copyright (c) 2004-2007 Intel Corporation. All rights reserved.
		* Copyright (c) 2004 Topspin Corporation. All rights reserved.
		* Copyright (c) 2004, 2005 Voltaire Corporation. All rights reserved.
		* Copyright (c) 2005 Sun Microsystems, Inc. All rights reserved.
		@@ -37,12 +37,14 @@

		#include <linux/completion.h>
		#include <linux/dma-mapping.h>
		#include <linux/device.h>
		#include <linux/err.h>
		#include <linux/idr.h>
		#include <linux/interrupt.h>
		#include <linux/random.h>
		#include <linux/rbtree.h>
		#include <linux/spinlock.h>
		#include <linux/sysfs.h>
		#include <linux/workqueue.h>

		#include <rdma/ib_cache.h>
		@@ -78,17 +80,94 @@ static struct ib_cm {
		struct workqueue_struct *wq;
		} cm;

		/* Counter indexes ordered by attribute ID */
		enum {
		CM_REQ_COUNTER,
		CM_MRA_COUNTER,
		CM_REJ_COUNTER,
		CM_REP_COUNTER,
		CM_RTU_COUNTER,
		CM_DREQ_COUNTER,
		CM_DREP_COUNTER,
		CM_SIDR_REQ_COUNTER,
		CM_SIDR_REP_COUNTER,
		CM_LAP_COUNTER,
		CM_APR_COUNTER,
		CM_ATTR_COUNT,
		CM_ATTR_ID_OFFSET = 0x0010,
		};

		enum {
		CM_XMIT,
		CM_XMIT_RETRIES,
		CM_RECV,
		CM_RECV_DUPLICATES,
		CM_COUNTER_GROUPS
		};

		static char const counter_group_names[CM_COUNTER_GROUPS]
		[sizeof("cm_rx_duplicates")] = {
		"cm_tx_msgs", "cm_tx_retries",
		"cm_rx_msgs", "cm_rx_duplicates"
		};

		struct cm_counter_group {
		struct kobject obj;
		atomic_long_t counter[CM_ATTR_COUNT];
		};

		struct cm_counter_attribute {
		struct attribute attr;
		int index;
		};

		#define CM_COUNTER_ATTR(_name, _index) \
		struct cm_counter_attribute cm_##_name##_counter_attr = { \
		.attr = { .name = __stringify(_name), .mode = 0444, .owner = THIS_MODULE }, \
		.index = _index \
		}

		static CM_COUNTER_ATTR(req, CM_REQ_COUNTER);
		static CM_COUNTER_ATTR(mra, CM_MRA_COUNTER);
		static CM_COUNTER_ATTR(rej, CM_REJ_COUNTER);
		static CM_COUNTER_ATTR(rep, CM_REP_COUNTER);
		static CM_COUNTER_ATTR(rtu, CM_RTU_COUNTER);
		static CM_COUNTER_ATTR(dreq, CM_DREQ_COUNTER);
		static CM_COUNTER_ATTR(drep, CM_DREP_COUNTER);
		static CM_COUNTER_ATTR(sidr_req, CM_SIDR_REQ_COUNTER);
		static CM_COUNTER_ATTR(sidr_rep, CM_SIDR_REP_COUNTER);
		static CM_COUNTER_ATTR(lap, CM_LAP_COUNTER);
		static CM_COUNTER_ATTR(apr, CM_APR_COUNTER);

		static struct attribute *cm_counter_default_attrs[] = {
		&cm_req_counter_attr.attr,
		&cm_mra_counter_attr.attr,
		&cm_rej_counter_attr.attr,
		&cm_rep_counter_attr.attr,
		&cm_rtu_counter_attr.attr,
		&cm_dreq_counter_attr.attr,
		&cm_drep_counter_attr.attr,
		&cm_sidr_req_counter_attr.attr,
		&cm_sidr_rep_counter_attr.attr,
		&cm_lap_counter_attr.attr,
		&cm_apr_counter_attr.attr,
		NULL
		};

		struct cm_port {
		struct cm_device *cm_dev;
		struct ib_mad_agent *mad_agent;
		struct kobject port_obj;
		u8 port_num;
		struct cm_counter_group counter_group[CM_COUNTER_GROUPS];
		};

		struct cm_device {
		struct list_head list;
		struct ib_device *device;
		struct kobject dev_obj;
		u8 ack_delay;
		struct cm_port port[0];
		struct cm_port *port[0];
		};

		struct cm_av {
		@@ -278,7 +357,7 @@ static int cm_init_av_by_path(struct ib_sa_path_rec path, struct cm_av av)
		list_for_each_entry(cm_dev, &cm.device_list, list) {
		if (!ib_find_cached_gid(cm_dev->device, &path->sgid,
		&p, NULL)) {
		port = &cm_dev->port[p-1];
		port = cm_dev->port[p-1];
		break;
		}
		}
		@@ -1270,6 +1349,9 @@ static void cm_dup_req_handler(struct cm_work *work,
		struct ib_mad_send_buf *msg = NULL;
		int ret;

		atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
		counter[CM_REQ_COUNTER]);

		/* Quick state check to discard duplicate REQs. */
		if (cm_id_priv->id.state == IB_CM_REQ_RCVD)
		return;
		@@ -1616,6 +1698,8 @@ static void cm_dup_rep_handler(struct cm_work *work)
		if (!cm_id_priv)
		return;

		atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
		counter[CM_REP_COUNTER]);
		ret = cm_alloc_response_msg(work->port, work->mad_recv_wc, &msg);
		if (ret)
		goto deref;
		@@ -1781,6 +1865,8 @@ static int cm_rtu_handler(struct cm_work *work)
		if (cm_id_priv->id.state != IB_CM_REP_SENT &&
		cm_id_priv->id.state != IB_CM_MRA_REP_RCVD) {
		spin_unlock_irq(&cm_id_priv->lock);
		atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
		counter[CM_RTU_COUNTER]);
		goto out;
		}
		cm_id_priv->id.state = IB_CM_ESTABLISHED;
		@@ -1958,6 +2044,8 @@ static int cm_dreq_handler(struct cm_work *work)
		cm_id_priv = cm_acquire_id(dreq_msg->remote_comm_id,
		dreq_msg->local_comm_id);
		if (!cm_id_priv) {
		atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
		counter[CM_DREQ_COUNTER]);
		cm_issue_drep(work->port, work->mad_recv_wc);
		return -EINVAL;
		}
		@@ -1977,6 +2065,8 @@ static int cm_dreq_handler(struct cm_work *work)
		case IB_CM_MRA_REP_RCVD:
		break;
		case IB_CM_TIMEWAIT:
		atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
		counter[CM_DREQ_COUNTER]);
		if (cm_alloc_response_msg(work->port, work->mad_recv_wc, &msg))
		goto unlock;

		@@ -1988,6 +2078,10 @@ static int cm_dreq_handler(struct cm_work *work)
		if (ib_post_send_mad(msg, NULL))
		cm_free_msg(msg);
		goto deref;
		case IB_CM_DREQ_RCVD:
		atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
		counter[CM_DREQ_COUNTER]);
		goto unlock;
		default:
		goto unlock;
		}
		@@ -2339,10 +2433,20 @@ static int cm_mra_handler(struct cm_work *work)
		if (cm_mra_get_msg_mraed(mra_msg) != CM_MSG_RESPONSE_OTHER \|\|
		cm_id_priv->id.lap_state != IB_CM_LAP_SENT \|\|
		ib_modify_mad(cm_id_priv->av.port->mad_agent,
		cm_id_priv->msg, timeout))
		cm_id_priv->msg, timeout)) {
		if (cm_id_priv->id.lap_state == IB_CM_MRA_LAP_RCVD)
		atomic_long_inc(&work->port->
		counter_group[CM_RECV_DUPLICATES].
		counter[CM_MRA_COUNTER]);
		goto out;
		}
		cm_id_priv->id.lap_state = IB_CM_MRA_LAP_RCVD;
		break;
		case IB_CM_MRA_REQ_RCVD:
		case IB_CM_MRA_REP_RCVD:
		atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
		counter[CM_MRA_COUNTER]);
		/* fall through */
		default:
		goto out;
		}
		@@ -2502,6 +2606,8 @@ static int cm_lap_handler(struct cm_work *work)
		case IB_CM_LAP_IDLE:
		break;
		case IB_CM_MRA_LAP_SENT:
		atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
		counter[CM_LAP_COUNTER]);
		if (cm_alloc_response_msg(work->port, work->mad_recv_wc, &msg))
		goto unlock;

		@@ -2515,6 +2621,10 @@ static int cm_lap_handler(struct cm_work *work)
		if (ib_post_send_mad(msg, NULL))
		cm_free_msg(msg);
		goto deref;
		case IB_CM_LAP_RCVD:
		atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
		counter[CM_LAP_COUNTER]);
		goto unlock;
		default:
		goto unlock;
		}
		@@ -2796,6 +2906,8 @@ static int cm_sidr_req_handler(struct cm_work *work)
		cur_cm_id_priv = cm_insert_remote_sidr(cm_id_priv);
		if (cur_cm_id_priv) {
		spin_unlock_irq(&cm.lock);
		atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
		counter[CM_SIDR_REQ_COUNTER]);
		goto out; /* Duplicate message. */
		}
		cm_id_priv->id.state = IB_CM_SIDR_REQ_RCVD;
		@@ -2990,6 +3102,27 @@ static void cm_send_handler(struct ib_mad_agent *mad_agent,
		struct ib_mad_send_wc *mad_send_wc)
		{
		struct ib_mad_send_buf *msg = mad_send_wc->send_buf;
		struct cm_port *port;
		u16 attr_index;

		port = mad_agent->context;
		attr_index = be16_to_cpu(((struct ib_mad_hdr *)
		msg->mad)->attr_id) - CM_ATTR_ID_OFFSET;

		/*
		* If the send was in response to a received message (context[0] is not
		* set to a cm_id), and is not a REJ, then it is a send that was
		* manually retried.
		*/
		if (!msg->context[0] && (attr_index != CM_REJ_COUNTER))
		msg->retries = 1;

		atomic_long_add(1 + msg->retries,
		&port->counter_group[CM_XMIT].counter[attr_index]);
		if (msg->retries)
		atomic_long_add(msg->retries,
		&port->counter_group[CM_XMIT_RETRIES].
		counter[attr_index]);

		switch (mad_send_wc->status) {
		case IB_WC_SUCCESS:
		@@ -3148,8 +3281,10 @@ EXPORT_SYMBOL(ib_cm_notify);
		static void cm_recv_handler(struct ib_mad_agent *mad_agent,
		struct ib_mad_recv_wc *mad_recv_wc)
		{
		struct cm_port *port = mad_agent->context;
		struct cm_work *work;
		enum ib_cm_event_type event;
		u16 attr_id;
		int paths = 0;

		switch (mad_recv_wc->recv_buf.mad->mad_hdr.attr_id) {
		@@ -3194,6 +3329,10 @@ static void cm_recv_handler(struct ib_mad_agent *mad_agent,
		return;
		}

		attr_id = be16_to_cpu(mad_recv_wc->recv_buf.mad->mad_hdr.attr_id);
		atomic_long_inc(&port->counter_group[CM_RECV].
		counter[attr_id - CM_ATTR_ID_OFFSET]);

		work = kmalloc(sizeof work + sizeof(struct ib_sa_path_rec) paths,
		GFP_KERNEL);
		if (!work) {
		@@ -3204,7 +3343,7 @@ static void cm_recv_handler(struct ib_mad_agent *mad_agent,
		INIT_DELAYED_WORK(&work->work, cm_work_handler);
		work->cm_event.event = event;
		work->mad_recv_wc = mad_recv_wc;
		work->port = (struct cm_port *)mad_agent->context;
		work->port = port;
		queue_delayed_work(cm.wq, &work->work, 0);
		}

		@@ -3379,6 +3518,108 @@ static void cm_get_ack_delay(struct cm_device *cm_dev)
		cm_dev->ack_delay = attr.local_ca_ack_delay;
		}

		static ssize_t cm_show_counter(struct kobject obj, struct attribute attr,
		char *buf)
		{
		struct cm_counter_group *group;
		struct cm_counter_attribute *cm_attr;

		group = container_of(obj, struct cm_counter_group, obj);
		cm_attr = container_of(attr, struct cm_counter_attribute, attr);

		return sprintf(buf, "%ld\n",
		atomic_long_read(&group->counter[cm_attr->index]));
		}

		static struct sysfs_ops cm_counter_ops = {
		.show = cm_show_counter
		};

		static struct kobj_type cm_counter_obj_type = {
		.sysfs_ops = &cm_counter_ops,
		.default_attrs = cm_counter_default_attrs
		};

		static void cm_release_port_obj(struct kobject *obj)
		{
		struct cm_port *cm_port;

		printk(KERN_ERR "free cm port\n");

		cm_port = container_of(obj, struct cm_port, port_obj);
		kfree(cm_port);
		}

		static struct kobj_type cm_port_obj_type = {
		.release = cm_release_port_obj
		};

		static void cm_release_dev_obj(struct kobject *obj)
		{
		struct cm_device *cm_dev;

		printk(KERN_ERR "free cm dev\n");

		cm_dev = container_of(obj, struct cm_device, dev_obj);
		kfree(cm_dev);
		}

		static struct kobj_type cm_dev_obj_type = {
		.release = cm_release_dev_obj
		};

		struct class cm_class = {
		.name = "infiniband_cm",
		};
		EXPORT_SYMBOL(cm_class);

		static void cm_remove_fs_obj(struct kobject *obj)
		{
		kobject_put(obj->parent);
		kobject_put(obj);
		}

		static int cm_create_port_fs(struct cm_port *port)
		{
		int i, ret;

		ret = kobject_init_and_add(&port->port_obj, &cm_port_obj_type,
		kobject_get(&port->cm_dev->dev_obj),
		"%d", port->port_num);
		if (ret) {
		kfree(port);
		return ret;
		}

		for (i = 0; i < CM_COUNTER_GROUPS; i++) {
		ret = kobject_init_and_add(&port->counter_group[i].obj,
		&cm_counter_obj_type,
		kobject_get(&port->port_obj),
		"%s", counter_group_names[i]);
		if (ret)
		goto error;
		}

		return 0;

		error:
		while (i--)
		cm_remove_fs_obj(&port->counter_group[i].obj);
		cm_remove_fs_obj(&port->port_obj);
		return ret;

		}

		static void cm_remove_port_fs(struct cm_port *port)
		{
		int i;

		for (i = 0; i < CM_COUNTER_GROUPS; i++)
		cm_remove_fs_obj(&port->counter_group[i].obj);

		cm_remove_fs_obj(&port->port_obj);
		}

		static void cm_add_one(struct ib_device *device)
		{
		struct cm_device *cm_dev;
		@@ -3397,7 +3638,7 @@ static void cm_add_one(struct ib_device *device)
		if (rdma_node_get_transport(device->node_type) != RDMA_TRANSPORT_IB)
		return;

		cm_dev = kmalloc(sizeof(cm_dev) + sizeof(port) *
		cm_dev = kzalloc(sizeof(cm_dev) + sizeof(port) *
		device->phys_port_cnt, GFP_KERNEL);
		if (!cm_dev)
		return;
		@@ -3405,11 +3646,27 @@ static void cm_add_one(struct ib_device *device)
		cm_dev->device = device;
		cm_get_ack_delay(cm_dev);

		ret = kobject_init_and_add(&cm_dev->dev_obj, &cm_dev_obj_type,
		&cm_class.subsys.kobj, "%s", device->name);
		if (ret) {
		kfree(cm_dev);
		return;
		}

		set_bit(IB_MGMT_METHOD_SEND, reg_req.method_mask);
		for (i = 1; i <= device->phys_port_cnt; i++) {
		port = &cm_dev->port[i-1];
		port = kzalloc(sizeof *port, GFP_KERNEL);
		if (!port)
		goto error1;

		cm_dev->port[i-1] = port;
		port->cm_dev = cm_dev;
		port->port_num = i;

		ret = cm_create_port_fs(port);
		if (ret)
		goto error1;

		port->mad_agent = ib_register_mad_agent(device, i,
		IB_QPT_GSI,
		&reg_req,
		@@ -3418,11 +3675,11 @@ static void cm_add_one(struct ib_device *device)
		cm_recv_handler,
		port);
		if (IS_ERR(port->mad_agent))
		goto error1;
		goto error2;

		ret = ib_modify_port(device, i, 0, &port_modify);
		if (ret)
		goto error2;
		goto error3;
		}
		ib_set_client_data(device, &cm_client, cm_dev);

		@@ -3431,17 +3688,20 @@ static void cm_add_one(struct ib_device *device)
		write_unlock_irqrestore(&cm.device_lock, flags);
		return;

		error2:
		error3:
		ib_unregister_mad_agent(port->mad_agent);
		error2:
		cm_remove_port_fs(port);
		error1:
		port_modify.set_port_cap_mask = 0;
		port_modify.clr_port_cap_mask = IB_PORT_CM_SUP;
		while (--i) {
		port = &cm_dev->port[i-1];
		port = cm_dev->port[i-1];
		ib_modify_port(device, port->port_num, 0, &port_modify);
		ib_unregister_mad_agent(port->mad_agent);
		cm_remove_port_fs(port);
		}
		kfree(cm_dev);
		cm_remove_fs_obj(&cm_dev->dev_obj);
		}

		static void cm_remove_one(struct ib_device *device)
		@@ -3463,11 +3723,12 @@ static void cm_remove_one(struct ib_device *device)
		write_unlock_irqrestore(&cm.device_lock, flags);

		for (i = 1; i <= device->phys_port_cnt; i++) {
		port = &cm_dev->port[i-1];
		port = cm_dev->port[i-1];
		ib_modify_port(device, port->port_num, 0, &port_modify);
		ib_unregister_mad_agent(port->mad_agent);
		cm_remove_port_fs(port);
		}
		kfree(cm_dev);
		cm_remove_fs_obj(&cm_dev->dev_obj);
		}

		static int __init ib_cm_init(void)
		@@ -3488,17 +3749,25 @@ static int __init ib_cm_init(void)
		idr_pre_get(&cm.local_id_table, GFP_KERNEL);
		INIT_LIST_HEAD(&cm.timewait_list);

		cm.wq = create_workqueue("ib_cm");
		if (!cm.wq)
		ret = class_register(&cm_class);
		if (ret)
		return -ENOMEM;

		cm.wq = create_workqueue("ib_cm");
		if (!cm.wq) {
		ret = -ENOMEM;
		goto error1;
		}

		ret = ib_register_client(&cm_client);
		if (ret)
		goto error;
		goto error2;

		return 0;
		error:
		error2:
		destroy_workqueue(cm.wq);
		error1:
		class_unregister(&cm_class);
		return ret;
		}

		@@ -3519,6 +3788,7 @@ static void __exit ib_cm_cleanup(void)
		}

		ib_unregister_client(&cm_client);
		class_unregister(&cm_class);
		idr_destroy(&cm.local_id_table);
		}

drivers/infiniband/core/cma.c

+33 −27

Original line number	Diff line number	Diff line
		@@ -488,7 +488,8 @@ void rdma_destroy_qp(struct rdma_cm_id *id)
		}
		EXPORT_SYMBOL(rdma_destroy_qp);

		static int cma_modify_qp_rtr(struct rdma_id_private *id_priv)
		static int cma_modify_qp_rtr(struct rdma_id_private *id_priv,
		struct rdma_conn_param *conn_param)
		{
		struct ib_qp_attr qp_attr;
		int qp_attr_mask, ret;
		@@ -514,13 +515,16 @@ static int cma_modify_qp_rtr(struct rdma_id_private *id_priv)
		if (ret)
		goto out;

		if (conn_param)
		qp_attr.max_dest_rd_atomic = conn_param->responder_resources;
		ret = ib_modify_qp(id_priv->id.qp, &qp_attr, qp_attr_mask);
		out:
		mutex_unlock(&id_priv->qp_mutex);
		return ret;
		}

		static int cma_modify_qp_rts(struct rdma_id_private *id_priv)
		static int cma_modify_qp_rts(struct rdma_id_private *id_priv,
		struct rdma_conn_param *conn_param)
		{
		struct ib_qp_attr qp_attr;
		int qp_attr_mask, ret;
		@@ -536,6 +540,8 @@ static int cma_modify_qp_rts(struct rdma_id_private *id_priv)
		if (ret)
		goto out;

		if (conn_param)
		qp_attr.max_rd_atomic = conn_param->initiator_depth;
		ret = ib_modify_qp(id_priv->id.qp, &qp_attr, qp_attr_mask);
		out:
		mutex_unlock(&id_priv->qp_mutex);
		@@ -866,11 +872,11 @@ static int cma_rep_recv(struct rdma_id_private *id_priv)
		{
		int ret;

		ret = cma_modify_qp_rtr(id_priv);
		ret = cma_modify_qp_rtr(id_priv, NULL);
		if (ret)
		goto reject;

		ret = cma_modify_qp_rts(id_priv);
		ret = cma_modify_qp_rts(id_priv, NULL);
		if (ret)
		goto reject;

		@@ -1122,8 +1128,10 @@ static int cma_req_handler(struct ib_cm_id cm_id, struct ib_cm_event ib_event)
		cm_id->cm_handler = cma_ib_handler;

		ret = conn_id->id.event_handler(&conn_id->id, &event);
		if (!ret)
		if (!ret) {
		cma_enable_remove(conn_id);
		goto out;
		}

		/* Destroy the CM ID by returning a non-zero value. */
		conn_id->cm_id.ib = NULL;
		@@ -1262,6 +1270,7 @@ static int iw_conn_req_handler(struct iw_cm_id *cm_id,
		struct net_device *dev = NULL;
		struct rdma_cm_event event;
		int ret;
		struct ib_device_attr attr;

		listen_id = cm_id->context;
		if (cma_disable_remove(listen_id, CMA_LISTEN))
		@@ -1311,10 +1320,19 @@ static int iw_conn_req_handler(struct iw_cm_id *cm_id,
		sin = (struct sockaddr_in *) &new_cm_id->route.addr.dst_addr;
		*sin = iw_event->remote_addr;

		ret = ib_query_device(conn_id->id.device, &attr);
		if (ret) {
		cma_enable_remove(conn_id);
		rdma_destroy_id(new_cm_id);
		goto out;
		}

		memset(&event, 0, sizeof event);
		event.event = RDMA_CM_EVENT_CONNECT_REQUEST;
		event.param.conn.private_data = iw_event->private_data;
		event.param.conn.private_data_len = iw_event->private_data_len;
		event.param.conn.initiator_depth = attr.max_qp_init_rd_atom;
		event.param.conn.responder_resources = attr.max_qp_rd_atom;
		ret = conn_id->id.event_handler(&conn_id->id, &event);
		if (ret) {
		/* User wants to destroy the CM ID */
		@@ -2272,7 +2290,7 @@ static int cma_connect_iw(struct rdma_id_private *id_priv,
		sin = (struct sockaddr_in*) &id_priv->id.route.addr.dst_addr;
		cm_id->remote_addr = *sin;

		ret = cma_modify_qp_rtr(id_priv);
		ret = cma_modify_qp_rtr(id_priv, conn_param);
		if (ret)
		goto out;

		@@ -2335,25 +2353,15 @@ static int cma_accept_ib(struct rdma_id_private *id_priv,
		struct rdma_conn_param *conn_param)
		{
		struct ib_cm_rep_param rep;
		struct ib_qp_attr qp_attr;
		int qp_attr_mask, ret;

		if (id_priv->id.qp) {
		ret = cma_modify_qp_rtr(id_priv);
		if (ret)
		goto out;
		int ret;

		qp_attr.qp_state = IB_QPS_RTS;
		ret = ib_cm_init_qp_attr(id_priv->cm_id.ib, &qp_attr,
		&qp_attr_mask);
		ret = cma_modify_qp_rtr(id_priv, conn_param);
		if (ret)
		goto out;

		qp_attr.max_rd_atomic = conn_param->initiator_depth;
		ret = ib_modify_qp(id_priv->id.qp, &qp_attr, qp_attr_mask);
		ret = cma_modify_qp_rts(id_priv, conn_param);
		if (ret)
		goto out;
		}

		memset(&rep, 0, sizeof rep);
		rep.qp_num = id_priv->qp_num;
		@@ -2378,7 +2386,7 @@ static int cma_accept_iw(struct rdma_id_private *id_priv,
		struct iw_cm_conn_param iw_param;
		int ret;

		ret = cma_modify_qp_rtr(id_priv);
		ret = cma_modify_qp_rtr(id_priv, conn_param);
		if (ret)
		return ret;

		@@ -2598,11 +2606,9 @@ static void cma_set_mgid(struct rdma_id_private *id_priv,
		/* IPv6 address is an SA assigned MGID. */
		memcpy(mgid, &sin6->sin6_addr, sizeof *mgid);
		} else {
		ip_ib_mc_map(sin->sin_addr.s_addr, mc_map);
		ip_ib_mc_map(sin->sin_addr.s_addr, dev_addr->broadcast, mc_map);
		if (id_priv->id.ps == RDMA_PS_UDP)
		mc_map[7] = 0x01; /* Use RDMA CM signature */
		mc_map[8] = ib_addr_get_pkey(dev_addr) >> 8;
		mc_map[9] = (unsigned char) ib_addr_get_pkey(dev_addr);
		mgid = (union ib_gid *) (mc_map + 4);
		}
		}

drivers/infiniband/core/fmr_pool.c

+21 −12

Original line number	Diff line number	Diff line
		@@ -139,7 +139,7 @@ static inline struct ib_pool_fmr ib_fmr_cache_lookup(struct ib_fmr_pool pool,
		static void ib_fmr_batch_release(struct ib_fmr_pool *pool)
		{
		int ret;
		struct ib_pool_fmr *fmr;
		struct ib_pool_fmr fmr, next;
		LIST_HEAD(unmap_list);
		LIST_HEAD(fmr_list);

		@@ -158,6 +158,20 @@ static void ib_fmr_batch_release(struct ib_fmr_pool *pool)
		#endif
		}

		/*
		* The free_list may hold FMRs that have been put there
		* because they haven't reached the max_remap count.
		* Invalidate their mapping as well.
		*/
		list_for_each_entry_safe(fmr, next, &pool->free_list, list) {
		if (fmr->remap_count == 0)
		continue;
		hlist_del_init(&fmr->cache_node);
		fmr->remap_count = 0;
		list_add_tail(&fmr->fmr->list, &fmr_list);
		list_move(&fmr->list, &unmap_list);
		}

		list_splice(&pool->dirty_list, &unmap_list);
		INIT_LIST_HEAD(&pool->dirty_list);
		pool->dirty_len = 0;
		@@ -182,8 +196,7 @@ static int ib_fmr_cleanup_thread(void *pool_ptr)
		struct ib_fmr_pool *pool = pool_ptr;

		do {
		if (pool->dirty_len >= pool->dirty_watermark \|\|
		atomic_read(&pool->flush_ser) - atomic_read(&pool->req_ser) < 0) {
		if (atomic_read(&pool->flush_ser) - atomic_read(&pool->req_ser) < 0) {
		ib_fmr_batch_release(pool);

		atomic_inc(&pool->flush_ser);
		@@ -194,8 +207,7 @@ static int ib_fmr_cleanup_thread(void *pool_ptr)
		}

		set_current_state(TASK_INTERRUPTIBLE);
		if (pool->dirty_len < pool->dirty_watermark &&
		atomic_read(&pool->flush_ser) - atomic_read(&pool->req_ser) >= 0 &&
		if (atomic_read(&pool->flush_ser) - atomic_read(&pool->req_ser) >= 0 &&
		!kthread_should_stop())
		schedule();
		__set_current_state(TASK_RUNNING);
		@@ -369,11 +381,6 @@ void ib_destroy_fmr_pool(struct ib_fmr_pool *pool)

		i = 0;
		list_for_each_entry_safe(fmr, tmp, &pool->free_list, list) {
		if (fmr->remap_count) {
		INIT_LIST_HEAD(&fmr_list);
		list_add_tail(&fmr->fmr->list, &fmr_list);
		ib_unmap_fmr(&fmr_list);
		}
		ib_dealloc_fmr(fmr->fmr);
		list_del(&fmr->list);
		kfree(fmr);
		@@ -511,10 +518,12 @@ int ib_fmr_pool_unmap(struct ib_pool_fmr *fmr)
		list_add_tail(&fmr->list, &pool->free_list);
		} else {
		list_add_tail(&fmr->list, &pool->dirty_list);
		++pool->dirty_len;
		if (++pool->dirty_len >= pool->dirty_watermark) {
		atomic_inc(&pool->req_ser);
		wake_up_process(pool->thread);
		}
		}
		}

		#ifdef DEBUG
		if (fmr->ref_count < 0)

drivers/infiniband/core/mad.c

+10 −16

Original line number	Diff line number	Diff line
		@@ -701,7 +701,8 @@ static int handle_outgoing_dr_smp(struct ib_mad_agent_private *mad_agent_priv,
		}

		/* Check to post send on QP or process locally */
		if (smi_check_local_smp(smp, device) == IB_SMI_DISCARD)
		if (smi_check_local_smp(smp, device) == IB_SMI_DISCARD &&
		smi_check_local_returning_smp(smp, device) == IB_SMI_DISCARD)
		goto out;

		local = kmalloc(sizeof *local, GFP_ATOMIC);
		@@ -752,8 +753,7 @@ static int handle_outgoing_dr_smp(struct ib_mad_agent_private *mad_agent_priv,
		port_priv = ib_get_mad_port(mad_agent_priv->agent.device,
		mad_agent_priv->agent.port_num);
		if (port_priv) {
		mad_priv->mad.mad.mad_hdr.tid =
		((struct ib_mad *)smp)->mad_hdr.tid;
		memcpy(&mad_priv->mad.mad, smp, sizeof(struct ib_mad));
		recv_mad_agent = find_mad_agent(port_priv,
		&mad_priv->mad.mad);
		}
		@@ -1100,7 +1100,9 @@ int ib_post_send_mad(struct ib_mad_send_buf *send_buf,
		mad_send_wr->tid = ((struct ib_mad_hdr *) send_buf->mad)->tid;
		/* Timeout will be updated after send completes */
		mad_send_wr->timeout = msecs_to_jiffies(send_buf->timeout_ms);
		mad_send_wr->retries = send_buf->retries;
		mad_send_wr->max_retries = send_buf->retries;
		mad_send_wr->retries_left = send_buf->retries;
		send_buf->retries = 0;
		/* Reference for work request to QP + response */
		mad_send_wr->refcount = 1 + (mad_send_wr->timeout > 0);
		mad_send_wr->status = IB_WC_SUCCESS;
		@@ -1931,15 +1933,6 @@ local:
		if (port_priv->device->process_mad) {
		int ret;

		if (!response) {
		printk(KERN_ERR PFX "No memory for response MAD\n");
		/*
		* Is it better to assume that
		* it wouldn't be processed ?
		*/
		goto out;
		}

		ret = port_priv->device->process_mad(port_priv->device, 0,
		port_priv->port_num,
		wc, &recv->grh,
		@@ -2282,8 +2275,6 @@ static void cancel_mads(struct ib_mad_agent_private *mad_agent_priv)

		/* Empty wait list to prevent receives from finding a request */
		list_splice_init(&mad_agent_priv->wait_list, &cancel_list);
		/* Empty local completion list as well */
		list_splice_init(&mad_agent_priv->local_list, &cancel_list);
		spin_unlock_irqrestore(&mad_agent_priv->lock, flags);

		/* Report all cancelled requests */
		@@ -2445,9 +2436,12 @@ static int retry_send(struct ib_mad_send_wr_private *mad_send_wr)
		{
		int ret;

		if (!mad_send_wr->retries--)
		if (!mad_send_wr->retries_left)
		return -ETIMEDOUT;

		mad_send_wr->retries_left--;
		mad_send_wr->send_buf.retries++;

		mad_send_wr->timeout = msecs_to_jiffies(mad_send_wr->send_buf.timeout_ms);

		if (mad_send_wr->mad_agent_priv->agent.rmpp_version) {

Admin message