linux-next: manual merge of the rdma tree with the nfs tree

linux-next: manual merge of the rdma tree with the nfs tree

[Michael Ellerman]

Hi Doug,

Today's linux-next merge of the rdma tree got a conflict in:

  net/sunrpc/xprtrdma/frwr_ops.c

between commit:

  951e721ca0d6 "xprtrdma: Introduce an FRMR recovery workqueue"

from the nfs tree and commit:

  76357c715f32 "xprtrdma, svcrdma: Switch to generic logging helpers"

from the rdma tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

cheers

diff --cc net/sunrpc/xprtrdma/frwr_ops.c
index 661fbc1784ab,d234521320a4..000000000000
--- a/net/sunrpc/xprtrdma/frwr_ops.c
+++ b/net/sunrpc/xprtrdma/frwr_ops.c
@@@ -252,8 -128,8 +252,8 @@@ frwr_sendcompletion(struct ib_wc *wc
  
  	/* WARNING: Only wr_id and status are reliable at this point */
  	r = (struct rpcrdma_mw *)(unsigned long)wc->wr_id;
- 	pr_warn("RPC:       %s: frmr %p flushed, status %d\n",
- 		__func__, r, wc->status);
 -	dprintk("RPC:       %s: frmr %p (stale), status %s (%d)\n",
++	pr_warn("RPC:       %s: frmr %p flushed, status %s (%d)\n",
+ 		__func__, r, ib_wc_status_msg(wc->status), wc->status);
  	r->r.frmr.fr_state = FRMR_IS_STALE;
  }
  

linux-next: manual merge of the rdma tree with the nfs tree

[Michael Ellerman]

Hi Doug,

Today's linux-next merge of the rdma tree got a conflict in:

  net/sunrpc/xprtrdma/frwr_ops.c

between commit:

  951e721ca0d6 "xprtrdma: Introduce an FRMR recovery workqueue"

from the nfs tree and commit:

  76357c715f32 "xprtrdma, svcrdma: Switch to generic logging helpers"

from the rdma tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

cheers

diff --cc net/sunrpc/xprtrdma/frwr_ops.c
index 661fbc1784ab,d234521320a4..000000000000
--- a/net/sunrpc/xprtrdma/frwr_ops.c
+++ b/net/sunrpc/xprtrdma/frwr_ops.c
@@@ -252,8 -128,8 +252,8 @@@ frwr_sendcompletion(struct ib_wc *wc
  
  	/* WARNING: Only wr_id and status are reliable at this point */
  	r = (struct rpcrdma_mw *)(unsigned long)wc->wr_id;
- 	pr_warn("RPC:       %s: frmr %p flushed, status %d\n",
- 		__func__, r, wc->status);
 -	dprintk("RPC:       %s: frmr %p (stale), status %s (%d)\n",
++	pr_warn("RPC:       %s: frmr %p flushed, status %s (%d)\n",
+ 		__func__, r, ib_wc_status_msg(wc->status), wc->status);
  	r->r.frmr.fr_state = FRMR_IS_STALE;
  }
  

linux-next: manual merge of the rdma tree with the nfs tree

[Stephen Rothwell]

Hi Doug,

Today's linux-next merge of the rdma tree got a conflict in:

  net/sunrpc/xprtrdma/frwr_ops.c

between commit:

  55fdfce101a0 ("xprtrdma: Rename rpcrdma_frwr::sg and sg_nents")

from the nfs tree and commits:

  ff2ba9936591 ("IB/core: Add passing an offset into the SG to ib_map_mr_sg")
  9aa8b3217ed3 ("IB/core: Enhance ib_map_mr_sg()")

from the rdma tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc net/sunrpc/xprtrdma/frwr_ops.c
index a192b91ad67e,94c3fa910b85..000000000000
--- a/net/sunrpc/xprtrdma/frwr_ops.c
+++ b/net/sunrpc/xprtrdma/frwr_ops.c
@@@ -450,10 -421,10 +450,10 @@@ frwr_op_map(struct rpcrdma_xprt *r_xprt
  		return -ENOMEM;
  	}
  
- 	n = ib_map_mr_sg(mr, frmr->fr_sg, frmr->fr_nents, PAGE_SIZE);
 -	n = ib_map_mr_sg(mr, frmr->sg, frmr->sg_nents, NULL, PAGE_SIZE);
 -	if (unlikely(n != frmr->sg_nents)) {
++	n = ib_map_mr_sg(mr, frmr->fr_sg, frmr->fr_nents, NULL, PAGE_SIZE);
 +	if (unlikely(n != frmr->fr_nents)) {
  		pr_err("RPC:       %s: failed to map mr %p (%u/%u)\n",
 -		       __func__, frmr->fr_mr, n, frmr->sg_nents);
 +		       __func__, frmr->fr_mr, n, frmr->fr_nents);
  		rc = n < 0 ? n : -EINVAL;
  		goto out_senderr;
  	}

linux-next: manual merge of the rdma tree with the nfs tree

[Michael Ellerman]

Hi Doug,

Today's linux-next merge of the rdma tree got a conflict in:

  net/sunrpc/xprtrdma/verbs.c

between commit:

  89e0d11258e9 "xprtrdma: Use ib_device pointer safely"

from the nfs tree and commit:

  8e37210b38fb "IB/core: Change ib_create_cq to use struct ib_cq_init_attr"

from the rdma tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

cheers


diff --cc net/sunrpc/xprtrdma/verbs.c
index 234083560d0e,52df265b472a..000000000000
--- a/net/sunrpc/xprtrdma/verbs.c
+++ b/net/sunrpc/xprtrdma/verbs.c
@@@ -763,9 -692,9 +684,9 @@@ rpcrdma_ep_create(struct rpcrdma_ep *ep
  	init_waitqueue_head(&ep->rep_connect_wait);
  	INIT_DELAYED_WORK(&ep->rep_connect_worker, rpcrdma_connect_worker);
  
+ 	cq_attr.cqe = ep->rep_attr.cap.max_send_wr + 1;
 -	sendcq = ib_create_cq(ia->ri_id->device, rpcrdma_sendcq_upcall,
 -				  rpcrdma_cq_async_error_upcall, ep, &cq_attr);
 +	sendcq = ib_create_cq(ia->ri_device, rpcrdma_sendcq_upcall,
- 			      rpcrdma_cq_async_error_upcall, ep,
- 			      ep->rep_attr.cap.max_send_wr + 1, 0);
++			      rpcrdma_cq_async_error_upcall, ep, &cq_attr);
  	if (IS_ERR(sendcq)) {
  		rc = PTR_ERR(sendcq);
  		dprintk("RPC:       %s: failed to create send CQ: %i\n",
@@@ -780,9 -709,9 +701,9 @@@
  		goto out2;
  	}
  
+ 	cq_attr.cqe = ep->rep_attr.cap.max_recv_wr + 1;
 -	recvcq = ib_create_cq(ia->ri_id->device, rpcrdma_recvcq_upcall,
 -				  rpcrdma_cq_async_error_upcall, ep, &cq_attr);
 +	recvcq = ib_create_cq(ia->ri_device, rpcrdma_recvcq_upcall,
- 			      rpcrdma_cq_async_error_upcall, ep,
- 			      ep->rep_attr.cap.max_recv_wr + 1, 0);
++			      rpcrdma_cq_async_error_upcall, ep, &cq_attr);
  	if (IS_ERR(recvcq)) {
  		rc = PTR_ERR(recvcq);
  		dprintk("RPC:       %s: failed to create recv CQ: %i\n",