Commit 2490138c 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: (48 commits)
  RDMA/iwcm: Reject the connection when the cm_id is destroyed
  RDMA/cxgb3: Clean up properly on FW mismatch failures
  RDMA/cxgb3: Don't ignore insert_handle() failures
  MAINTAINERS: InfiniBand/RDMA mailing list transition to vger
  IB/mad: Allow tuning of QP0 and QP1 sizes
  IB/mad: Fix possible lock-lock-timer deadlock
  RDMA/nes: Map MTU to IB_MTU_* and correctly report link state
  RDMA/nes: Rework the disconn routine for terminate and flushing
  RDMA/nes: Use the flush code to fill in cqe error
  RDMA/nes: Make poll_cq return correct number of wqes during flush
  RDMA/nes: Use flush mechanism to set status for wqe in error
  RDMA/nes: Implement Terminate Packet
  RDMA/nes: Add CQ error handling
  RDMA/nes: Clean out CQ completions when QP is destroyed
  RDMA/nes: Change memory allocation for cqp request to GFP_ATOMIC
  RDMA/nes: Allocate work item for disconnect event handling
  RDMA/nes: Update refcnt during disconnect
  IB/mthca: Don't allow userspace open while recovering from catastrophic error
  IB/mthca: Distinguish multiple devices in /proc/interrupts
  IB/mthca: Annotate CQ locking
  ...
parents f6f79190 73f526da

MAINTAINERS

+6 −6
Original line number Original line Diff line number Diff line
@@ -439,7 +439,7 @@ F: drivers/hwmon/ams/ 
AMSO1100 RNIC DRIVER

AMSO1100 RNIC DRIVER

M:	Tom Tucker <tom@opengridcomputing.com>

M:	Tom Tucker <tom@opengridcomputing.com>

M:	Steve Wise <swise@opengridcomputing.com>

M:	Steve Wise <swise@opengridcomputing.com>

L:	general@lists.openfabrics.org

L:	linux-rdma@vger.kernel.org

S:	Maintained

S:	Maintained

F:	drivers/infiniband/hw/amso1100/

F:	drivers/infiniband/hw/amso1100/
@@ -1494,7 +1494,7 @@ F: drivers/net/cxgb3/ 




CXGB3 IWARP RNIC DRIVER (IW_CXGB3)

CXGB3 IWARP RNIC DRIVER (IW_CXGB3)

M:	Steve Wise <swise@chelsio.com>

M:	Steve Wise <swise@chelsio.com>

L:	general@lists.openfabrics.org

L:	linux-rdma@vger.kernel.org

W:	http://www.openfabrics.org

W:	http://www.openfabrics.org

S:	Supported

S:	Supported

F:	drivers/infiniband/hw/cxgb3/

F:	drivers/infiniband/hw/cxgb3/
@@ -1868,7 +1868,7 @@ F: fs/efs/ 
EHCA (IBM GX bus InfiniBand adapter) DRIVER

EHCA (IBM GX bus InfiniBand adapter) DRIVER

M:	Hoang-Nam Nguyen <hnguyen@de.ibm.com>

M:	Hoang-Nam Nguyen <hnguyen@de.ibm.com>

M:	Christoph Raisch <raisch@de.ibm.com>

M:	Christoph Raisch <raisch@de.ibm.com>

L:	general@lists.openfabrics.org

L:	linux-rdma@vger.kernel.org

S:	Supported

S:	Supported

F:	drivers/infiniband/hw/ehca/

F:	drivers/infiniband/hw/ehca/
@@ -2552,7 +2552,7 @@ INFINIBAND SUBSYSTEM 
M:	Roland Dreier <rolandd@cisco.com>

M:	Roland Dreier <rolandd@cisco.com>

M:	Sean Hefty <sean.hefty@intel.com>

M:	Sean Hefty <sean.hefty@intel.com>

M:	Hal Rosenstock <hal.rosenstock@gmail.com>

M:	Hal Rosenstock <hal.rosenstock@gmail.com>

L:	general@lists.openfabrics.org (moderated for non-subscribers)

L:	linux-rdma@vger.kernel.org

W:	http://www.openib.org/

W:	http://www.openib.org/

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband.git

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband.git

S:	Supported

S:	Supported
@@ -2729,7 +2729,7 @@ F: drivers/net/ipg.c 




IPATH DRIVER

IPATH DRIVER

M:	Ralph Campbell <infinipath@qlogic.com>

M:	Ralph Campbell <infinipath@qlogic.com>

L:	general@lists.openfabrics.org

L:	linux-rdma@vger.kernel.org

T:	git git://git.qlogic.com/ipath-linux-2.6

T:	git git://git.qlogic.com/ipath-linux-2.6

S:	Supported

S:	Supported

F:	drivers/infiniband/hw/ipath/

F:	drivers/infiniband/hw/ipath/
@@ -3485,7 +3485,7 @@ F: drivers/scsi/NCR_D700.* 
NETEFFECT IWARP RNIC DRIVER (IW_NES)

NETEFFECT IWARP RNIC DRIVER (IW_NES)

M:	Faisal Latif <faisal.latif@intel.com>

M:	Faisal Latif <faisal.latif@intel.com>

M:	Chien Tung <chien.tin.tung@intel.com>

M:	Chien Tung <chien.tin.tung@intel.com>

L:	general@lists.openfabrics.org

L:	linux-rdma@vger.kernel.org

W:	http://www.neteffect.com

W:	http://www.neteffect.com

S:	Supported

S:	Supported

F:	drivers/infiniband/hw/nes/

F:	drivers/infiniband/hw/nes/

drivers/infiniband/core/iwcm.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -362,6 +362,7 @@ static void destroy_cm_id(struct iw_cm_id *cm_id) 
		 * In either case, must tell the provider to reject.

		 * In either case, must tell the provider to reject.

		 */

		 */

		cm_id_priv->state = IW_CM_STATE_DESTROYING;

		cm_id_priv->state = IW_CM_STATE_DESTROYING;

		cm_id->device->iwcm->reject(cm_id, NULL, 0);

		break;

		break;

	case IW_CM_STATE_CONN_SENT:

	case IW_CM_STATE_CONN_SENT:

	case IW_CM_STATE_DESTROYING:

	case IW_CM_STATE_DESTROYING:

drivers/infiniband/core/mad.c

+23 −12
Original line number Original line Diff line number Diff line
@@ -2,6 +2,7 @@ 
 * Copyright (c) 2004-2007 Voltaire, Inc. All rights reserved.

 * Copyright (c) 2004-2007 Voltaire, Inc. All rights reserved.

 * Copyright (c) 2005 Intel Corporation.  All rights reserved.

 * Copyright (c) 2005 Intel Corporation.  All rights reserved.

 * Copyright (c) 2005 Mellanox Technologies Ltd.  All rights reserved.

 * Copyright (c) 2005 Mellanox Technologies Ltd.  All rights reserved.

 * Copyright (c) 2009 HNR Consulting. All rights reserved.

 *

 *

 * This software is available to you under a choice of one of two

 * This software is available to you under a choice of one of two

 * licenses.  You may choose to be licensed under the terms of the GNU

 * licenses.  You may choose to be licensed under the terms of the GNU
@@ -45,14 +46,21 @@ MODULE_DESCRIPTION("kernel IB MAD API"); 
MODULE_AUTHOR("Hal Rosenstock");

MODULE_AUTHOR("Hal Rosenstock");

MODULE_AUTHOR("Sean Hefty");

MODULE_AUTHOR("Sean Hefty");





int mad_sendq_size = IB_MAD_QP_SEND_SIZE;

int mad_recvq_size = IB_MAD_QP_RECV_SIZE;



module_param_named(send_queue_size, mad_sendq_size, int, 0444);

MODULE_PARM_DESC(send_queue_size, "Size of send queue in number of work requests");

module_param_named(recv_queue_size, mad_recvq_size, int, 0444);

MODULE_PARM_DESC(recv_queue_size, "Size of receive queue in number of work requests");



static struct kmem_cache *ib_mad_cache;

static struct kmem_cache *ib_mad_cache;





static struct list_head ib_mad_port_list;

static struct list_head ib_mad_port_list;

static u32 ib_mad_client_id = 0;

static u32 ib_mad_client_id = 0;





/* Port list lock */

/* Port list lock */

static spinlock_t ib_mad_port_list_lock;

static DEFINE_SPINLOCK(ib_mad_port_list_lock);







/* Forward declarations */

/* Forward declarations */

static int method_in_use(struct ib_mad_mgmt_method_table **method,

static int method_in_use(struct ib_mad_mgmt_method_table **method,
@@ -1974,7 +1982,7 @@ static void adjust_timeout(struct ib_mad_agent_private *mad_agent_priv) 
	unsigned long delay;

	unsigned long delay;





	if (list_empty(&mad_agent_priv->wait_list)) {

	if (list_empty(&mad_agent_priv->wait_list)) {

		cancel_delayed_work(&mad_agent_priv->timed_work);

		__cancel_delayed_work(&mad_agent_priv->timed_work);

	} else {

	} else {

		mad_send_wr = list_entry(mad_agent_priv->wait_list.next,

		mad_send_wr = list_entry(mad_agent_priv->wait_list.next,

					 struct ib_mad_send_wr_private,

					 struct ib_mad_send_wr_private,
@@ -1983,7 +1991,7 @@ static void adjust_timeout(struct ib_mad_agent_private *mad_agent_priv) 
		if (time_after(mad_agent_priv->timeout,

		if (time_after(mad_agent_priv->timeout,

			       mad_send_wr->timeout)) {

			       mad_send_wr->timeout)) {

			mad_agent_priv->timeout = mad_send_wr->timeout;

			mad_agent_priv->timeout = mad_send_wr->timeout;

			cancel_delayed_work(&mad_agent_priv->timed_work);

			__cancel_delayed_work(&mad_agent_priv->timed_work);

			delay = mad_send_wr->timeout - jiffies;

			delay = mad_send_wr->timeout - jiffies;

			if ((long)delay <= 0)

			if ((long)delay <= 0)

				delay = 1;

				delay = 1;
@@ -2023,7 +2031,7 @@ static void wait_for_response(struct ib_mad_send_wr_private *mad_send_wr) 




	/* Reschedule a work item if we have a shorter timeout */

	/* Reschedule a work item if we have a shorter timeout */

	if (mad_agent_priv->wait_list.next == &mad_send_wr->agent_list) {

	if (mad_agent_priv->wait_list.next == &mad_send_wr->agent_list) {

		cancel_delayed_work(&mad_agent_priv->timed_work);

		__cancel_delayed_work(&mad_agent_priv->timed_work);

		queue_delayed_work(mad_agent_priv->qp_info->port_priv->wq,

		queue_delayed_work(mad_agent_priv->qp_info->port_priv->wq,

				   &mad_agent_priv->timed_work, delay);

				   &mad_agent_priv->timed_work, delay);

	}

	}
@@ -2736,8 +2744,8 @@ static int create_mad_qp(struct ib_mad_qp_info *qp_info, 
	qp_init_attr.send_cq = qp_info->port_priv->cq;

	qp_init_attr.send_cq = qp_info->port_priv->cq;

	qp_init_attr.recv_cq = qp_info->port_priv->cq;

	qp_init_attr.recv_cq = qp_info->port_priv->cq;

	qp_init_attr.sq_sig_type = IB_SIGNAL_ALL_WR;

	qp_init_attr.sq_sig_type = IB_SIGNAL_ALL_WR;

	qp_init_attr.cap.max_send_wr = IB_MAD_QP_SEND_SIZE;

	qp_init_attr.cap.max_send_wr = mad_sendq_size;

	qp_init_attr.cap.max_recv_wr = IB_MAD_QP_RECV_SIZE;

	qp_init_attr.cap.max_recv_wr = mad_recvq_size;

	qp_init_attr.cap.max_send_sge = IB_MAD_SEND_REQ_MAX_SG;

	qp_init_attr.cap.max_send_sge = IB_MAD_SEND_REQ_MAX_SG;

	qp_init_attr.cap.max_recv_sge = IB_MAD_RECV_REQ_MAX_SG;

	qp_init_attr.cap.max_recv_sge = IB_MAD_RECV_REQ_MAX_SG;

	qp_init_attr.qp_type = qp_type;

	qp_init_attr.qp_type = qp_type;
@@ -2752,8 +2760,8 @@ static int create_mad_qp(struct ib_mad_qp_info *qp_info, 
		goto error;

		goto error;

	}

	}

	/* Use minimum queue sizes unless the CQ is resized */

	/* Use minimum queue sizes unless the CQ is resized */

	qp_info->send_queue.max_active = IB_MAD_QP_SEND_SIZE;

	qp_info->send_queue.max_active = mad_sendq_size;

	qp_info->recv_queue.max_active = IB_MAD_QP_RECV_SIZE;

	qp_info->recv_queue.max_active = mad_recvq_size;

	return 0;

	return 0;





error:

error:
@@ -2792,7 +2800,7 @@ static int ib_mad_port_open(struct ib_device *device, 
	init_mad_qp(port_priv, &port_priv->qp_info[0]);

	init_mad_qp(port_priv, &port_priv->qp_info[0]);

	init_mad_qp(port_priv, &port_priv->qp_info[1]);

	init_mad_qp(port_priv, &port_priv->qp_info[1]);





	cq_size = (IB_MAD_QP_SEND_SIZE + IB_MAD_QP_RECV_SIZE) * 2;

	cq_size = (mad_sendq_size + mad_recvq_size) * 2;

	port_priv->cq = ib_create_cq(port_priv->device,

	port_priv->cq = ib_create_cq(port_priv->device,

				     ib_mad_thread_completion_handler,

				     ib_mad_thread_completion_handler,

				     NULL, port_priv, cq_size, 0);

				     NULL, port_priv, cq_size, 0);
@@ -2984,7 +2992,11 @@ static int __init ib_mad_init_module(void) 
{

{

	int ret;

	int ret;





	spin_lock_init(&ib_mad_port_list_lock);

	mad_recvq_size = min(mad_recvq_size, IB_MAD_QP_MAX_SIZE);

	mad_recvq_size = max(mad_recvq_size, IB_MAD_QP_MIN_SIZE);



	mad_sendq_size = min(mad_sendq_size, IB_MAD_QP_MAX_SIZE);

	mad_sendq_size = max(mad_sendq_size, IB_MAD_QP_MIN_SIZE);





	ib_mad_cache = kmem_cache_create("ib_mad",

	ib_mad_cache = kmem_cache_create("ib_mad",

					 sizeof(struct ib_mad_private),

					 sizeof(struct ib_mad_private),
@@ -3021,4 +3033,3 @@ static void __exit ib_mad_cleanup_module(void) 




module_init(ib_mad_init_module);

module_init(ib_mad_init_module);

module_exit(ib_mad_cleanup_module);
 
module_exit(ib_mad_cleanup_module);

drivers/infiniband/core/mad_priv.h

+3 −0
Original line number Original line Diff line number Diff line
@@ -2,6 +2,7 @@ 
 * Copyright (c) 2004, 2005, Voltaire, Inc. All rights reserved.

 * Copyright (c) 2004, 2005, Voltaire, Inc. All rights reserved.

 * Copyright (c) 2005 Intel Corporation. All rights reserved.

 * Copyright (c) 2005 Intel Corporation. All rights reserved.

 * Copyright (c) 2005 Sun Microsystems, Inc. All rights reserved.

 * Copyright (c) 2005 Sun Microsystems, Inc. All rights reserved.

 * Copyright (c) 2009 HNR Consulting. All rights reserved.

 *

 *

 * This software is available to you under a choice of one of two

 * This software is available to you under a choice of one of two

 * licenses.  You may choose to be licensed under the terms of the GNU

 * licenses.  You may choose to be licensed under the terms of the GNU
@@ -49,6 +50,8 @@ 
/* QP and CQ parameters */

/* QP and CQ parameters */

#define IB_MAD_QP_SEND_SIZE	128

#define IB_MAD_QP_SEND_SIZE	128

#define IB_MAD_QP_RECV_SIZE	512

#define IB_MAD_QP_RECV_SIZE	512

#define IB_MAD_QP_MIN_SIZE	64

#define IB_MAD_QP_MAX_SIZE	8192

#define IB_MAD_SEND_REQ_MAX_SG	2

#define IB_MAD_SEND_REQ_MAX_SG	2

#define IB_MAD_RECV_REQ_MAX_SG	1

#define IB_MAD_RECV_REQ_MAX_SG	1

drivers/infiniband/core/multicast.c

+9 −1
Original line number Original line Diff line number Diff line
@@ -106,6 +106,8 @@ struct mcast_group { 
	struct ib_sa_query	*query;

	struct ib_sa_query	*query;

	int			query_id;

	int			query_id;

	u16			pkey_index;

	u16			pkey_index;

	u8			leave_state;

	int			retries;

};

};





struct mcast_member {

struct mcast_member {
@@ -350,6 +352,7 @@ static int send_leave(struct mcast_group *group, u8 leave_state) 




	rec = group->rec;

	rec = group->rec;

	rec.join_state = leave_state;

	rec.join_state = leave_state;

	group->leave_state = leave_state;





	ret = ib_sa_mcmember_rec_query(&sa_client, port->dev->device,

	ret = ib_sa_mcmember_rec_query(&sa_client, port->dev->device,

				       port->port_num, IB_SA_METHOD_DELETE, &rec,

				       port->port_num, IB_SA_METHOD_DELETE, &rec,
@@ -542,6 +545,10 @@ static void leave_handler(int status, struct ib_sa_mcmember_rec *rec, 
{

{

	struct mcast_group *group = context;

	struct mcast_group *group = context;





	if (status && group->retries > 0 &&

	    !send_leave(group, group->leave_state))

		group->retries--;

	else

		mcast_work_handler(&group->work);

		mcast_work_handler(&group->work);

}

}
@@ -565,6 +572,7 @@ static struct mcast_group *acquire_group(struct mcast_port *port, 
	if (!group)

	if (!group)

		return NULL;

		return NULL;





	group->retries = 3;

	group->port = port;

	group->port = port;

	group->rec.mgid = *mgid;

	group->rec.mgid = *mgid;

	group->pkey_index = MCAST_INVALID_PKEY_INDEX;

	group->pkey_index = MCAST_INVALID_PKEY_INDEX;

CRA Git | Maintained and supported by SUSTech CRA and CCSE