From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 15 Oct 2015 20:44:35 +0000 (-0700)
Subject: Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma
X-Git-Tag: v4.3-rc6~14
X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-linux.git;a=commitdiff_plain;h=58bd6e060260d938650687cdd8f02dfafcb51f91;hp=-c

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

Pull rdma updates from Doug Ledford:
 "We have four batched up patches for the current rc kernel.

  Two of them are small fixes that are obvious.

  One of them is larger than I would like for a late stage rc pull, but
  we found an issue in the namespace lookup code related to RoCE and
  this works around the issue for now (we allow a lookup with a
  namespace to succeed on RoCE since RoCE namespaces aren't implemented
  yet).  This will go away in 4.4 when we put in support for namespaces
  in RoCE devices.

  The last one is large in terms of lines, but is all legal and no
  functional changes.  Cisco needed to update their files to be more
  specific about their license.  They had intended the files to be dual
  licensed as GPL/BSD all along, and specified that in their module
  license tag, but their file headers were not up to par.  They
  contacted all of the contributors to get agreement and then submitted
  a patch to update the license headers in the files.

  Summary:

   - Work around connection namespace lookup bug related to RoCE

   - Change usnic license to Dual GPL/BSD (was intended to be that way
     all along, but wasn't clear, permission from contributors was
     chased down)

   - Fix an issue between NFSoRDMA and mlx5 that could cause an oops

   - Fix leak of sendonly multicast groups"

* tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma:
  IB/ipoib: For sendonly join free the multicast group on leave
  IB/cma: Accept connection without a valid netdev on RoCE
  xprtrdma: Don't require LOCAL_DMA_LKEY support for fastreg
  usnic: add missing clauses to BSD license
---

58bd6e060260d938650687cdd8f02dfafcb51f91
diff --combined net/sunrpc/xprtrdma/verbs.c
index 8a477e27bad7,81e8d31f3abc..5502d4dade74
--- a/net/sunrpc/xprtrdma/verbs.c
+++ b/net/sunrpc/xprtrdma/verbs.c
@@@ -543,11 -543,8 +543,8 @@@ rpcrdma_ia_open(struct rpcrdma_xprt *xp
  	}
  
  	if (memreg == RPCRDMA_FRMR) {
- 		/* Requires both frmr reg and local dma lkey */
- 		if (((devattr->device_cap_flags &
- 		     (IB_DEVICE_MEM_MGT_EXTENSIONS|IB_DEVICE_LOCAL_DMA_LKEY)) !=
- 		    (IB_DEVICE_MEM_MGT_EXTENSIONS|IB_DEVICE_LOCAL_DMA_LKEY)) ||
- 		      (devattr->max_fast_reg_page_list_len == 0)) {
+ 		if (!(devattr->device_cap_flags & IB_DEVICE_MEM_MGT_EXTENSIONS) ||
+ 		    (devattr->max_fast_reg_page_list_len == 0)) {
  			dprintk("RPC:       %s: FRMR registration "
  				"not supported by HCA\n", __func__);
  			memreg = RPCRDMA_MTHCAFMR;
@@@ -557,6 -554,7 +554,7 @@@
  		if (!ia->ri_device->alloc_fmr) {
  			dprintk("RPC:       %s: MTHCAFMR registration "
  				"not supported by HCA\n", __func__);
+ 			rc = -EINVAL;
  			goto out3;
  		}
  	}
@@@ -755,22 -753,19 +753,22 @@@ rpcrdma_ep_destroy(struct rpcrdma_ep *e
  
  	cancel_delayed_work_sync(&ep->rep_connect_worker);
  
 -	if (ia->ri_id->qp) {
 +	if (ia->ri_id->qp)
  		rpcrdma_ep_disconnect(ep, ia);
 +
 +	rpcrdma_clean_cq(ep->rep_attr.recv_cq);
 +	rpcrdma_clean_cq(ep->rep_attr.send_cq);
 +
 +	if (ia->ri_id->qp) {
  		rdma_destroy_qp(ia->ri_id);
  		ia->ri_id->qp = NULL;
  	}
  
 -	rpcrdma_clean_cq(ep->rep_attr.recv_cq);
  	rc = ib_destroy_cq(ep->rep_attr.recv_cq);
  	if (rc)
  		dprintk("RPC:       %s: ib_destroy_cq returned %i\n",
  			__func__, rc);
  
 -	rpcrdma_clean_cq(ep->rep_attr.send_cq);
  	rc = ib_destroy_cq(ep->rep_attr.send_cq);
  	if (rc)
  		dprintk("RPC:       %s: ib_destroy_cq returned %i\n",