Commit 4d5b57e0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma 

Pull rdma updates from Doug Ledford:
 "This is the complete update for the rdma stack for this release cycle.

  Most of it is typical driver and core updates, but there is the
  entirely new VMWare pvrdma driver. You may have noticed that there
  were changes in DaveM's pull request to the bnxt Ethernet driver to
  support a RoCE RDMA driver. The bnxt_re driver was tentatively set to
  be pulled in this release cycle, but it simply wasn't ready in time
  and was dropped (a few review comments still to address, and some
  multi-arch build issues like prefetch() not working across all
  arches).

  Summary:

   - shared mlx5 updates with net stack (will drop out on merge if
     Dave's tree has already been merged)

   - driver updates: cxgb4, hfi1, hns-roce, i40iw, mlx4, mlx5, qedr, rxe

   - debug cleanups

   - new connection rejection helpers

   - SRP updates

   - various misc fixes

   - new paravirt driver from vmware"

* tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma: (210 commits)
  IB: Add vmw_pvrdma driver
  IB/mlx4: fix improper return value
  IB/ocrdma: fix bad initialization
  infiniband: nes: return value of skb_linearize should be handled
  MAINTAINERS: Update Intel RDMA RNIC driver maintainers
  MAINTAINERS: Remove Mitesh Ahuja from emulex maintainers
  IB/core: fix unmap_sg argument
  qede: fix general protection fault may occur on probe
  IB/mthca: Replace pci_pool_alloc by pci_pool_zalloc
  mlx5, calc_sq_size(): Make a debug message more informative
  mlx5: Remove a set-but-not-used variable
  mlx5: Use { } instead of { 0 } to init struct
  IB/srp: Make writing the add_target sysfs attr interruptible
  IB/srp: Make mapping failures easier to debug
  IB/srp: Make login failures easier to debug
  IB/srp: Introduce a local variable in srp_add_one()
  IB/srp: Fix CONFIG_DYNAMIC_DEBUG=n build
  IB/multicast: Check ib_find_pkey() return value
  IPoIB: Avoid reading an uninitialized member variable
  IB/mad: Fix an array index check
  ...
parents 6df8b74b 6f94ba20

MAINTAINERS

+8 −5
Original line number Diff line number Diff line
@@ -6515,10 +6515,7 @@ F: drivers/net/ethernet/intel/*/ 


INTEL RDMA RNIC DRIVER

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

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

R:     Mustafa Ismail <mustafa.ismail@intel.com>

R:     Shiraz Saleem <shiraz.saleem@intel.com>

R:     Tatyana Nikolova <tatyana.e.nikolova@intel.com>

M:     Shiraz Saleem <shiraz.saleem@intel.com>

L:     linux-rdma@vger.kernel.org

S:     Supported

F:     drivers/infiniband/hw/i40iw/
@@ -11078,7 +11075,6 @@ F: drivers/net/ethernet/emulex/benet/ 
EMULEX ONECONNECT ROCE DRIVER

M:	Selvin Xavier <selvin.xavier@avagotech.com>

M:	Devesh Sharma <devesh.sharma@avagotech.com>

M:	Mitesh Ahuja <mitesh.ahuja@avagotech.com>

L:	linux-rdma@vger.kernel.org

W:	http://www.emulex.com

S:	Supported
@@ -13129,6 +13125,13 @@ S: Maintained 
F:	drivers/scsi/vmw_pvscsi.c

F:	drivers/scsi/vmw_pvscsi.h



VMWARE PVRDMA DRIVER

M:	Adit Ranadive <aditr@vmware.com>

M:	VMware PV-Drivers <pv-drivers@vmware.com>

L:	linux-rdma@vger.kernel.org

S:	Maintained

F:	drivers/infiniband/hw/vmw_pvrdma/



VOLTAGE AND CURRENT REGULATOR FRAMEWORK

M:	Liam Girdwood <lgirdwood@gmail.com>

M:	Mark Brown <broonie@kernel.org>

drivers/infiniband/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -73,6 +73,7 @@ source "drivers/infiniband/hw/mlx4/Kconfig" 
source "drivers/infiniband/hw/mlx5/Kconfig"

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

source "drivers/infiniband/hw/ocrdma/Kconfig"

source "drivers/infiniband/hw/vmw_pvrdma/Kconfig"

source "drivers/infiniband/hw/usnic/Kconfig"

source "drivers/infiniband/hw/hns/Kconfig"

drivers/infiniband/core/agent.c

+0 −1
Original line number Diff line number Diff line
@@ -156,7 +156,6 @@ int ib_agent_port_open(struct ib_device *device, int port_num) 
	/* Create new device info */

	port_priv = kzalloc(sizeof *port_priv, GFP_KERNEL);

	if (!port_priv) {

		dev_err(&device->dev, "No memory for ib_agent_port_private\n");

		ret = -ENOMEM;

		goto error1;

	}

drivers/infiniband/core/cache.c

+7 −9
Original line number Diff line number Diff line
@@ -770,12 +770,8 @@ static int _gid_table_setup_one(struct ib_device *ib_dev) 
	int err = 0;



	table = kcalloc(ib_dev->phys_port_cnt, sizeof(*table), GFP_KERNEL);



	if (!table) {

		pr_warn("failed to allocate ib gid cache for %s\n",

			ib_dev->name);

	if (!table)

		return -ENOMEM;

	}



	for (port = 0; port < ib_dev->phys_port_cnt; port++) {

		u8 rdma_port = port + rdma_start_port(ib_dev);
@@ -1170,14 +1166,13 @@ int ib_cache_setup_one(struct ib_device *device) 
					  GFP_KERNEL);

	if (!device->cache.pkey_cache ||

	    !device->cache.lmc_cache) {

		pr_warn("Couldn't allocate cache for %s\n", device->name);

		return -ENOMEM;

		err = -ENOMEM;

		goto free;

	}



	err = gid_table_setup_one(device);

	if (err)

		/* Allocated memory will be cleaned in the release function */

		return err;

		goto free;



	for (p = 0; p <= rdma_end_port(device) - rdma_start_port(device); ++p)

		ib_cache_update(device, p + rdma_start_port(device));
@@ -1192,6 +1187,9 @@ int ib_cache_setup_one(struct ib_device *device) 


err:

	gid_table_cleanup_one(device);

free:

	kfree(device->cache.pkey_cache);

	kfree(device->cache.lmc_cache);

	return err;

}

drivers/infiniband/core/cm.c

+71 −1
Original line number Diff line number Diff line
@@ -57,6 +57,54 @@ MODULE_AUTHOR("Sean Hefty"); 
MODULE_DESCRIPTION("InfiniBand CM");

MODULE_LICENSE("Dual BSD/GPL");



static const char * const ibcm_rej_reason_strs[] = {

	[IB_CM_REJ_NO_QP]			= "no QP",

	[IB_CM_REJ_NO_EEC]			= "no EEC",

	[IB_CM_REJ_NO_RESOURCES]		= "no resources",

	[IB_CM_REJ_TIMEOUT]			= "timeout",

	[IB_CM_REJ_UNSUPPORTED]			= "unsupported",

	[IB_CM_REJ_INVALID_COMM_ID]		= "invalid comm ID",

	[IB_CM_REJ_INVALID_COMM_INSTANCE]	= "invalid comm instance",

	[IB_CM_REJ_INVALID_SERVICE_ID]		= "invalid service ID",

	[IB_CM_REJ_INVALID_TRANSPORT_TYPE]	= "invalid transport type",

	[IB_CM_REJ_STALE_CONN]			= "stale conn",

	[IB_CM_REJ_RDC_NOT_EXIST]		= "RDC not exist",

	[IB_CM_REJ_INVALID_GID]			= "invalid GID",

	[IB_CM_REJ_INVALID_LID]			= "invalid LID",

	[IB_CM_REJ_INVALID_SL]			= "invalid SL",

	[IB_CM_REJ_INVALID_TRAFFIC_CLASS]	= "invalid traffic class",

	[IB_CM_REJ_INVALID_HOP_LIMIT]		= "invalid hop limit",

	[IB_CM_REJ_INVALID_PACKET_RATE]		= "invalid packet rate",

	[IB_CM_REJ_INVALID_ALT_GID]		= "invalid alt GID",

	[IB_CM_REJ_INVALID_ALT_LID]		= "invalid alt LID",

	[IB_CM_REJ_INVALID_ALT_SL]		= "invalid alt SL",

	[IB_CM_REJ_INVALID_ALT_TRAFFIC_CLASS]	= "invalid alt traffic class",

	[IB_CM_REJ_INVALID_ALT_HOP_LIMIT]	= "invalid alt hop limit",

	[IB_CM_REJ_INVALID_ALT_PACKET_RATE]	= "invalid alt packet rate",

	[IB_CM_REJ_PORT_CM_REDIRECT]		= "port CM redirect",

	[IB_CM_REJ_PORT_REDIRECT]		= "port redirect",

	[IB_CM_REJ_INVALID_MTU]			= "invalid MTU",

	[IB_CM_REJ_INSUFFICIENT_RESP_RESOURCES]	= "insufficient resp resources",

	[IB_CM_REJ_CONSUMER_DEFINED]		= "consumer defined",

	[IB_CM_REJ_INVALID_RNR_RETRY]		= "invalid RNR retry",

	[IB_CM_REJ_DUPLICATE_LOCAL_COMM_ID]	= "duplicate local comm ID",

	[IB_CM_REJ_INVALID_CLASS_VERSION]	= "invalid class version",

	[IB_CM_REJ_INVALID_FLOW_LABEL]		= "invalid flow label",

	[IB_CM_REJ_INVALID_ALT_FLOW_LABEL]	= "invalid alt flow label",

};



const char *__attribute_const__ ibcm_reject_msg(int reason)

{

	size_t index = reason;



	if (index < ARRAY_SIZE(ibcm_rej_reason_strs) &&

	    ibcm_rej_reason_strs[index])

		return ibcm_rej_reason_strs[index];

	else

		return "unrecognized reason";

}

EXPORT_SYMBOL(ibcm_reject_msg);



static void cm_add_one(struct ib_device *device);

static void cm_remove_one(struct ib_device *device, void *client_data);
@@ -1582,6 +1630,7 @@ static struct cm_id_private * cm_match_req(struct cm_work *work, 
	struct cm_id_private *listen_cm_id_priv, *cur_cm_id_priv;

	struct cm_timewait_info *timewait_info;

	struct cm_req_msg *req_msg;

	struct ib_cm_id *cm_id;



	req_msg = (struct cm_req_msg *)work->mad_recv_wc->recv_buf.mad;
@@ -1603,10 +1652,18 @@ static struct cm_id_private * cm_match_req(struct cm_work *work, 
	timewait_info = cm_insert_remote_qpn(cm_id_priv->timewait_info);

	if (timewait_info) {

		cm_cleanup_timewait(cm_id_priv->timewait_info);

		cur_cm_id_priv = cm_get_id(timewait_info->work.local_id,

					   timewait_info->work.remote_id);



		spin_unlock_irq(&cm.lock);

		cm_issue_rej(work->port, work->mad_recv_wc,

			     IB_CM_REJ_STALE_CONN, CM_MSG_RESPONSE_REQ,

			     NULL, 0);

		if (cur_cm_id_priv) {

			cm_id = &cur_cm_id_priv->id;

			ib_send_cm_dreq(cm_id, NULL, 0);

			cm_deref_id(cur_cm_id_priv);

		}

		return NULL;

	}
@@ -1984,6 +2041,9 @@ static int cm_rep_handler(struct cm_work *work) 
	struct cm_id_private *cm_id_priv;

	struct cm_rep_msg *rep_msg;

	int ret;

	struct cm_id_private *cur_cm_id_priv;

	struct ib_cm_id *cm_id;

	struct cm_timewait_info *timewait_info;



	rep_msg = (struct cm_rep_msg *)work->mad_recv_wc->recv_buf.mad;

	cm_id_priv = cm_acquire_id(rep_msg->remote_comm_id, 0);
@@ -2018,16 +2078,26 @@ static int cm_rep_handler(struct cm_work *work) 
		goto error;

	}

	/* Check for a stale connection. */

	if (cm_insert_remote_qpn(cm_id_priv->timewait_info)) {

	timewait_info = cm_insert_remote_qpn(cm_id_priv->timewait_info);

	if (timewait_info) {

		rb_erase(&cm_id_priv->timewait_info->remote_id_node,

			 &cm.remote_id_table);

		cm_id_priv->timewait_info->inserted_remote_id = 0;

		cur_cm_id_priv = cm_get_id(timewait_info->work.local_id,

					   timewait_info->work.remote_id);



		spin_unlock(&cm.lock);

		spin_unlock_irq(&cm_id_priv->lock);

		cm_issue_rej(work->port, work->mad_recv_wc,

			     IB_CM_REJ_STALE_CONN, CM_MSG_RESPONSE_REP,

			     NULL, 0);

		ret = -EINVAL;

		if (cur_cm_id_priv) {

			cm_id = &cur_cm_id_priv->id;

			ib_send_cm_dreq(cm_id, NULL, 0);

			cm_deref_id(cur_cm_id_priv);

		}



		goto error;

	}

	spin_unlock(&cm.lock);

CRA Git | Maintained and supported by SUSTech CRA and CCSE