Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7a9a2970 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull infiniband updates from Roland Dreier:
 "First batch of InfiniBand/RDMA changes for the 3.7 merge window:
   - mlx4 IB support for SR-IOV
   - A couple of SRP initiator fixes
   - Batch of nes hardware driver fixes
   - Fix for long-standing use-after-free crash in IPoIB
   - Other miscellaneous fixes"

This merge also removes a new use of __cancel_delayed_work(), and
replaces it with the regular cancel_delayed_work() that is now irq-safe
thanks to the workqueue updates.

That said, I suspect the sequence in question should probably use
"mod_delayed_work()".  I just did the minimal "don't use deprecated
functions" fixup, though.

* tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband: (45 commits)
  IB/qib: Fix local access validation for user MRs
  mlx4_core: Disable SENSE_PORT for multifunction devices
  mlx4_core: Clean up enabling of SENSE_PORT for older (ConnectX-1/-2) HCAs
  mlx4_core: Stash PCI ID driver_data in mlx4_priv structure
  IB/srp: Avoid having aborted requests hang
  IB/srp: Fix use-after-free in srp_reset_req()
  IB/qib: Add a qib driver version
  RDMA/nes: Fix compilation error when nes_debug is enabled
  RDMA/nes: Print hardware resource type
  RDMA/nes: Fix for crash when TX checksum offload is off
  RDMA/nes: Cosmetic changes
  RDMA/nes: Fix for incorrect MSS when TSO is on
  RDMA/nes: Fix incorrect resolving of the loopback MAC address
  mlx4_core: Fix crash on uninitialized priv->cmd.slave_sem
  mlx4_core: Trivial cleanups to driver log messages
  mlx4_core: Trivial readability fix: "0X30" -> "0x30"
  IB/mlx4: Create paravirt contexts for VFs when master IB driver initializes
  mlx4: Modify proxy/tunnel QP mechanism so that guests do no calculations
  mlx4: Paravirtualize Node Guids for slaves
  mlx4: Activate SR-IOV mode for IB
  ...
parents fc47912d d172f5a4

drivers/infiniband/core/cache.c

+42 −1
Original line number Diff line number Diff line
@@ -167,6 +167,7 @@ int ib_find_cached_pkey(struct ib_device *device, 
	unsigned long flags;

	int i;

	int ret = -ENOENT;

	int partial_ix = -1;



	if (port_num < start_port(device) || port_num > end_port(device))

		return -EINVAL;
@@ -179,9 +180,17 @@ int ib_find_cached_pkey(struct ib_device *device, 


	for (i = 0; i < cache->table_len; ++i)

		if ((cache->table[i] & 0x7fff) == (pkey & 0x7fff)) {

			if (cache->table[i] & 0x8000) {

				*index = i;

				ret = 0;

				break;

			} else

				partial_ix = i;

		}



	if (ret && partial_ix >= 0) {

		*index = partial_ix;

		ret = 0;

	}



	read_unlock_irqrestore(&device->cache.lock, flags);
@@ -190,6 +199,38 @@ int ib_find_cached_pkey(struct ib_device *device, 
}

EXPORT_SYMBOL(ib_find_cached_pkey);



int ib_find_exact_cached_pkey(struct ib_device *device,

			      u8                port_num,

			      u16               pkey,

			      u16              *index)

{

	struct ib_pkey_cache *cache;

	unsigned long flags;

	int i;

	int ret = -ENOENT;



	if (port_num < start_port(device) || port_num > end_port(device))

		return -EINVAL;



	read_lock_irqsave(&device->cache.lock, flags);



	cache = device->cache.pkey_cache[port_num - start_port(device)];



	*index = -1;



	for (i = 0; i < cache->table_len; ++i)

		if (cache->table[i] == pkey) {

			*index = i;

			ret = 0;

			break;

		}



	read_unlock_irqrestore(&device->cache.lock, flags);



	return ret;

}

EXPORT_SYMBOL(ib_find_exact_cached_pkey);



int ib_get_cached_lmc(struct ib_device *device,

		      u8                port_num,

		      u8                *lmc)

drivers/infiniband/core/cma.c

+4 −1
Original line number Diff line number Diff line
@@ -3058,7 +3058,10 @@ static int cma_join_ib_multicast(struct rdma_id_private *id_priv, 


	if (id_priv->id.ps == RDMA_PS_IPOIB)

		comp_mask |= IB_SA_MCMEMBER_REC_RATE |

			     IB_SA_MCMEMBER_REC_RATE_SELECTOR;

			     IB_SA_MCMEMBER_REC_RATE_SELECTOR |

			     IB_SA_MCMEMBER_REC_MTU_SELECTOR |

			     IB_SA_MCMEMBER_REC_MTU |

			     IB_SA_MCMEMBER_REC_HOP_LIMIT;



	mc->multicast.ib = ib_sa_join_multicast(&sa_client, id_priv->id.device,

						id_priv->id.port_num, &rec,

drivers/infiniband/core/device.c

+13 −3
Original line number Diff line number Diff line
@@ -707,18 +707,28 @@ int ib_find_pkey(struct ib_device *device, 
{

	int ret, i;

	u16 tmp_pkey;

	int partial_ix = -1;



	for (i = 0; i < device->pkey_tbl_len[port_num - start_port(device)]; ++i) {

		ret = ib_query_pkey(device, port_num, i, &tmp_pkey);

		if (ret)

			return ret;



		if ((pkey & 0x7fff) == (tmp_pkey & 0x7fff)) {

			/* if there is full-member pkey take it.*/

			if (tmp_pkey & 0x8000) {

				*index = i;

				return 0;

			}

			if (partial_ix < 0)

				partial_ix = i;

		}

	}



	/*no full-member, if exists take the limited*/

	if (partial_ix >= 0) {

		*index = partial_ix;

		return 0;

	}

	return -ENOENT;

}

EXPORT_SYMBOL(ib_find_pkey);

drivers/infiniband/core/ucm.c

+0 −1
Original line number Diff line number Diff line
@@ -397,7 +397,6 @@ static ssize_t ib_ucm_event(struct ib_ucm_file *file, 
	struct ib_ucm_event_get cmd;

	struct ib_ucm_event *uevent;

	int result = 0;

	DEFINE_WAIT(wait);



	if (out_len < sizeof(struct ib_ucm_event_resp))

		return -ENOSPC;

drivers/infiniband/core/ucma.c

+0 −1
Original line number Diff line number Diff line
@@ -310,7 +310,6 @@ static ssize_t ucma_get_event(struct ucma_file *file, const char __user *inbuf, 
	struct rdma_ucm_get_event cmd;

	struct ucma_event *uevent;

	int ret = 0;

	DEFINE_WAIT(wait);



	if (out_len < sizeof uevent->resp)

		return -ENOSPC;