Version 3.1-1.0.4

Author: leeopop

Diff for: backports-2.6.16/0001-BACKPORT-IB_core-support-for-SLES10-SP3.patch

@@ -3,16 +3,14 @@ Subject: [PATCH] BACKPORT: NFSRDMA
 
 Signed-off-by: Vladimir Sokolovsky <[email protected]>
 ---
- net/sunrpc/xprtrdma/rpc_rdma.c           |   20 ++++++++-
- net/sunrpc/xprtrdma/svc_rdma_recvfrom.c  |   70 +++++++++++++++++++++++++++++-
- net/sunrpc/xprtrdma/svc_rdma_sendto.c    |    8 +++
- net/sunrpc/xprtrdma/svc_rdma_transport.c |   18 ++++++++
- net/sunrpc/xprtrdma/transport.c          |   36 ++++++++++++++--
- net/sunrpc/xprtrdma/verbs.c              |    8 ++--
- 6 files changed, 148 insertions(+), 12 deletions(-)
+ net/sunrpc/xprtrdma/rpc_rdma.c           | 20 ++++++++-
+ net/sunrpc/xprtrdma/svc_rdma_recvfrom.c  | 70 +++++++++++++++++++++++++++++++-
+ net/sunrpc/xprtrdma/svc_rdma_sendto.c    | 12 ++++++
+ net/sunrpc/xprtrdma/svc_rdma_transport.c | 18 ++++++++
+ net/sunrpc/xprtrdma/transport.c          | 36 ++++++++++++++--
+ net/sunrpc/xprtrdma/verbs.c              |  8 ++--
+ 6 files changed, 152 insertions(+), 12 deletions(-)
 
-diff --git a/net/sunrpc/xprtrdma/rpc_rdma.c b/net/sunrpc/xprtrdma/rpc_rdma.c
-index xxxxxxx..xxxxxxx xxxxxx
 --- a/net/sunrpc/xprtrdma/rpc_rdma.c
 +++ b/net/sunrpc/xprtrdma/rpc_rdma.c
 @@ -49,11 +49,11 @@
@@ -29,7 +27,7 @@ index xxxxxxx..xxxxxxx xxxxxx
  static const char transfertypes[][12] = {
  	"pure inline",	/* no chunks */
  	" read chunk",	/* some argument via rdma read */
-@@ -361,9 +361,17 @@ rpcrdma_inline_pullup(struct rpc_rqst *rqst, int pad)
+@@ -361,9 +361,17 @@ rpcrdma_inline_pullup(struct rpc_rqst *r
  			curlen = copy_len;
  		dprintk("RPC:       %s: page %d destp 0x%p len %d curlen %d\n",
  			__func__, i, destp, copy_len, curlen);
@@ -47,7 +45,7 @@ index xxxxxxx..xxxxxxx xxxxxx
  		rqst->rq_svec[0].iov_len += curlen;
  		destp += curlen;
  		copy_len -= curlen;
-@@ -649,10 +657,18 @@ rpcrdma_inline_fixup(struct rpc_rqst *rqst, char *srcp, int copy_len, int pad)
+@@ -649,10 +657,18 @@ rpcrdma_inline_fixup(struct rpc_rqst *rq
  			dprintk("RPC:       %s: page %d"
  				" srcp 0x%p len %d curlen %d\n",
  				__func__, i, srcp, copy_len, curlen);
@@ -66,11 +64,9 @@ index xxxxxxx..xxxxxxx xxxxxx
  			srcp += curlen;
  			copy_len -= curlen;
  			if (copy_len == 0)
-diff --git a/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c b/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c
-index xxxxxxx..xxxxxxx xxxxxx
 --- a/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c
 +++ b/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c
-@@ -93,7 +93,11 @@ static void rdma_build_arg_xdr(struct svc_rqst *rqstp,
+@@ -93,7 +93,11 @@ static void rdma_build_arg_xdr(struct sv
  		sge_no++;
  	}
  	rqstp->rq_respages = &rqstp->rq_pages[sge_no];
@@ -82,7 +78,7 @@ index xxxxxxx..xxxxxxx xxxxxx
 
  	/* We should never run out of SGE because the limit is defined to
  	 * support the max allowed RPC data length
-@@ -136,7 +140,10 @@ typedef int (*rdma_reader_fn)(struct svcxprt_rdma *xprt,
+@@ -136,7 +140,10 @@ typedef int (*rdma_reader_fn)(struct svc
  			      int last);
 
  /* Issue an RDMA_READ using the local lkey to map the data sink */
@@ -94,7 +90,7 @@ index xxxxxxx..xxxxxxx xxxxxx
  			       struct svc_rqst *rqstp,
  			       struct svc_rdma_op_ctxt *head,
  			       int *page_no,
-@@ -144,7 +151,11 @@ static int rdma_read_chunk_lcl(struct svcxprt_rdma *xprt,
+@@ -144,7 +151,11 @@ static int rdma_read_chunk_lcl(struct sv
  			       u32 rs_handle,
  			       u32 rs_length,
  			       u64 rs_offset,
@@ -106,7 +102,7 @@ index xxxxxxx..xxxxxxx xxxxxx
  {
  	struct ib_send_wr read_wr;
  	int pages_needed = PAGE_ALIGN(*page_offset + rs_length) >> PAGE_SHIFT;
-@@ -168,7 +179,9 @@ static int rdma_read_chunk_lcl(struct svcxprt_rdma *xprt,
+@@ -168,7 +179,9 @@ static int rdma_read_chunk_lcl(struct sv
  		if (!pg_off)
  			head->count++;
  		rqstp->rq_respages = &rqstp->rq_arg.pages[pg_no+1];
@@ -116,7 +112,7 @@ index xxxxxxx..xxxxxxx xxxxxx
  		ctxt->sge[pno].addr =
  			ib_dma_map_page(xprt->sc_cm_id->device,
  					head->arg.pages[pg_no], pg_off,
-@@ -229,7 +242,10 @@ static int rdma_read_chunk_lcl(struct svcxprt_rdma *xprt,
+@@ -229,7 +242,10 @@ static int rdma_read_chunk_lcl(struct sv
  }
 
  /* Issue an RDMA_READ using an FRMR to map the data sink */
@@ -128,7 +124,7 @@ index xxxxxxx..xxxxxxx xxxxxx
  				struct svc_rqst *rqstp,
  				struct svc_rdma_op_ctxt *head,
  				int *page_no,
-@@ -237,7 +253,11 @@ static int rdma_read_chunk_frmr(struct svcxprt_rdma *xprt,
+@@ -237,7 +253,11 @@ static int rdma_read_chunk_frmr(struct s
  				u32 rs_handle,
  				u32 rs_length,
  				u64 rs_offset,
@@ -140,7 +136,7 @@ index xxxxxxx..xxxxxxx xxxxxx
  {
  	struct ib_send_wr read_wr;
  	struct ib_send_wr inv_wr;
-@@ -273,7 +293,9 @@ static int rdma_read_chunk_frmr(struct svcxprt_rdma *xprt,
+@@ -273,7 +293,9 @@ static int rdma_read_chunk_frmr(struct s
  		if (!pg_off)
  			head->count++;
  		rqstp->rq_respages = &rqstp->rq_arg.pages[pg_no+1];
@@ -150,7 +146,7 @@ index xxxxxxx..xxxxxxx xxxxxx
  		frmr->page_list->page_list[pno] =
  			ib_dma_map_page(xprt->sc_cm_id->device,
  					head->arg.pages[pg_no], 0,
-@@ -365,24 +387,50 @@ static int rdma_read_chunk_frmr(struct svcxprt_rdma *xprt,
+@@ -365,24 +387,50 @@ static int rdma_read_chunk_frmr(struct s
  	return ret;
  }
 
@@ -201,7 +197,7 @@ index xxxxxxx..xxxxxxx xxxxxx
  		return -EINVAL;
 
  	/* The request is completed when the RDMA_READs complete. The
-@@ -398,27 +446,43 @@ static int rdma_read_chunks(struct svcxprt_rdma *xprt,
+@@ -398,27 +446,43 @@ static int rdma_read_chunks(struct svcxp
  	head->arg.len = rqstp->rq_arg.len;
  	head->arg.buflen = rqstp->rq_arg.buflen;
 
@@ -245,7 +241,7 @@ index xxxxxxx..xxxxxxx xxxxxx
  			if (ret < 0)
  				goto err;
  			byte_count -= ret;
-@@ -483,7 +547,9 @@ static int rdma_read_complete(struct svc_rqst *rqstp,
+@@ -483,7 +547,9 @@ static int rdma_read_complete(struct svc
 
  	/* rq_respages starts after the last arg page */
  	rqstp->rq_respages = &rqstp->rq_arg.pages[page_no];
@@ -255,11 +251,9 @@ index xxxxxxx..xxxxxxx xxxxxx
 
  	/* Rebuild rq_arg head and tail. */
  	rqstp->rq_arg.head[0] = head->arg.head[0];
-diff --git a/net/sunrpc/xprtrdma/svc_rdma_sendto.c b/net/sunrpc/xprtrdma/svc_rdma_sendto.c
-index xxxxxxx..xxxxxxx xxxxxx
 --- a/net/sunrpc/xprtrdma/svc_rdma_sendto.c
 +++ b/net/sunrpc/xprtrdma/svc_rdma_sendto.c
-@@ -375,7 +375,9 @@ static int send_reply(struct svcxprt_rdma *rdma,
+@@ -375,7 +375,9 @@ static int send_reply(struct svcxprt_rdm
  	int sge_no;
  	int sge_bytes;
  	int page_no;
@@ -269,7 +263,7 @@ index xxxxxxx..xxxxxxx xxxxxx
  	int ret;
 
  	/* Post a recv buffer to handle another request. */
-@@ -427,8 +429,12 @@ static int send_reply(struct svcxprt_rdma *rdma,
+@@ -427,8 +429,12 @@ static int send_reply(struct svcxprt_rdm
  	 * respages array. They are our pages until the I/O
  	 * completes.
  	 */
@@ -282,7 +276,7 @@ index xxxxxxx..xxxxxxx xxxxxx
  		ctxt->pages[page_no+1] = rqstp->rq_respages[page_no];
  		ctxt->count++;
  		rqstp->rq_respages[page_no] = NULL;
-@@ -440,7 +446,9 @@ static int send_reply(struct svcxprt_rdma *rdma,
+@@ -440,7 +446,9 @@ static int send_reply(struct svcxprt_rdm
  		if (page_no+1 >= sge_no)
  			ctxt->sge[page_no+1].length = 0;
  	}
@@ -292,11 +286,21 @@ index xxxxxxx..xxxxxxx xxxxxx
 
  	BUG_ON(sge_no > rdma->sc_max_sge);
  	memset(&send_wr, 0, sizeof send_wr);
-diff --git a/net/sunrpc/xprtrdma/svc_rdma_transport.c b/net/sunrpc/xprtrdma/svc_rdma_transport.c
-index xxxxxxx..xxxxxxx xxxxxx
+@@ -509,7 +517,11 @@ int svc_rdma_sendto(struct svc_rqst *rqs
+ 	inline_bytes = rqstp->rq_res.len;
+ 
+ 	/* Create the RDMA response header */
++#ifdef HAVE_SVC_RDMA_GET_PAGE
+ 	res_page = svc_rdma_get_page();
++#else
++	res_page = alloc_page(GFP_KERNEL | __GFP_NOFAIL);
++#endif
+ 	rdma_resp = page_address(res_page);
+ 	reply_ary = svc_rdma_get_reply_array(rdma_argp);
+ 	if (reply_ary)
 --- a/net/sunrpc/xprtrdma/svc_rdma_transport.c
 +++ b/net/sunrpc/xprtrdma/svc_rdma_transport.c
-@@ -66,7 +66,9 @@ static void dto_tasklet_func(unsigned long data);
+@@ -66,7 +66,9 @@ static void dto_tasklet_func(unsigned lo
  static void svc_rdma_detach(struct svc_xprt *xprt);
  static void svc_rdma_free(struct svc_xprt *xprt);
  static int svc_rdma_has_wspace(struct svc_xprt *xprt);
@@ -306,7 +310,7 @@ index xxxxxxx..xxxxxxx xxxxxx
  static void rq_cq_reap(struct svcxprt_rdma *xprt);
  static void sq_cq_reap(struct svcxprt_rdma *xprt);
 
-@@ -84,7 +86,9 @@ static struct svc_xprt_ops svc_rdma_ops = {
+@@ -84,7 +86,9 @@ static struct svc_xprt_ops svc_rdma_ops
  	.xpo_prep_reply_hdr = svc_rdma_prep_reply_hdr,
  	.xpo_has_wspace = svc_rdma_has_wspace,
  	.xpo_accept = svc_rdma_accept,
@@ -326,7 +330,7 @@ index xxxxxxx..xxxxxxx xxxxxx
  };
 
  struct svc_rdma_op_ctxt *svc_rdma_get_context(struct svcxprt_rdma *xprt)
-@@ -461,7 +467,11 @@ static struct svcxprt_rdma *rdma_create_xprt(struct svc_serv *serv,
+@@ -461,7 +467,11 @@ static struct svcxprt_rdma *rdma_create_
 
  	if (!cma_xprt)
  		return NULL;
@@ -338,7 +342,7 @@ index xxxxxxx..xxxxxxx xxxxxx
  	INIT_LIST_HEAD(&cma_xprt->sc_accept_q);
  	INIT_LIST_HEAD(&cma_xprt->sc_dto_q);
  	INIT_LIST_HEAD(&cma_xprt->sc_rq_dto_q);
-@@ -970,10 +980,16 @@ static struct svc_xprt *svc_rdma_accept(struct svc_xprt *xprt)
+@@ -970,10 +980,16 @@ static struct svc_xprt *svc_rdma_accept(
  	 * NB:	iWARP requires remote write access for the data sink
  	 *	of an RDMA_READ. IB does not.
  	 */
@@ -355,7 +359,7 @@ index xxxxxxx..xxxxxxx xxxxxx
  	}
 
  	/*
-@@ -1205,10 +1221,12 @@ static int svc_rdma_has_wspace(struct svc_xprt *xprt)
+@@ -1205,10 +1221,12 @@ static int svc_rdma_has_wspace(struct sv
  	return 1;
  }
 
@@ -368,8 +372,6 @@ index xxxxxxx..xxxxxxx xxxxxx
 
  /*
   * Attempt to register the kvec representing the RPC memory with the
-diff --git a/net/sunrpc/xprtrdma/transport.c b/net/sunrpc/xprtrdma/transport.c
-index xxxxxxx..xxxxxxx xxxxxx
 --- a/net/sunrpc/xprtrdma/transport.c
 +++ b/net/sunrpc/xprtrdma/transport.c
 @@ -51,11 +51,13 @@
@@ -387,7 +389,7 @@ index xxxxxxx..xxxxxxx xxxxxx
  # define RPCDBG_FACILITY	RPCDBG_TRANS
  #endif
 
-@@ -75,7 +77,7 @@ static unsigned int xprt_rdma_inline_write_padding;
+@@ -75,7 +77,7 @@ static unsigned int xprt_rdma_inline_wri
  static unsigned int xprt_rdma_memreg_strategy = RPCRDMA_FRMR;
  		int xprt_rdma_pad_optimize = 1;
 
@@ -396,7 +398,7 @@ index xxxxxxx..xxxxxxx xxxxxx
 
  static unsigned int min_slot_table_size = RPCRDMA_MIN_SLOT_TABLE;
  static unsigned int max_slot_table_size = RPCRDMA_MAX_SLOT_TABLE;
-@@ -277,8 +279,14 @@ xprt_setup_rdma(struct xprt_create *args)
+@@ -277,8 +279,14 @@ xprt_setup_rdma(struct xprt_create *args
  		return ERR_PTR(-EBADF);
  	}
 
@@ -411,7 +413,7 @@ index xxxxxxx..xxxxxxx xxxxxx
  			xprt_rdma_slot_table_entries);
  	if (xprt == NULL) {
  		dprintk("RPC:       %s: couldn't allocate rpcrdma_xprt\n",
-@@ -426,8 +434,15 @@ xprt_rdma_set_port(struct rpc_xprt *xprt, u16 port)
+@@ -426,8 +434,15 @@ xprt_rdma_set_port(struct rpc_xprt *xprt
  }
 
  static void
@@ -427,7 +429,7 @@ index xxxxxxx..xxxxxxx xxxxxx
  	struct rpcrdma_xprt *r_xprt = rpcx_to_rdmax(xprt);
 
  	if (r_xprt->rx_ep.rep_connected != 0) {
-@@ -463,15 +478,22 @@ xprt_rdma_allocate(struct rpc_task *task, size_t size)
+@@ -463,15 +478,22 @@ xprt_rdma_allocate(struct rpc_task *task
  	struct rpcrdma_regbuf *rb;
  	struct rpcrdma_req *req;
  	size_t min_size;
@@ -450,7 +452,7 @@ index xxxxxxx..xxxxxxx xxxxxx
 
  	if (req->rl_rdmabuf == NULL)
  		goto out_rdmabuf;
-@@ -603,7 +625,11 @@ xprt_rdma_send_request(struct rpc_task *task)
+@@ -603,7 +625,11 @@ xprt_rdma_send_request(struct rpc_task *
  	if (rpcrdma_ep_post(&r_xprt->rx_ia, &r_xprt->rx_ep, req))
  		goto drop_connection;
 
@@ -462,7 +464,7 @@ index xxxxxxx..xxxxxxx xxxxxx
  	rqst->rq_bytes_sent = 0;
  	return 0;
 
-@@ -660,7 +686,9 @@ static void xprt_rdma_print_stats(struct rpc_xprt *xprt, struct seq_file *seq)
+@@ -660,7 +686,9 @@ static void xprt_rdma_print_stats(struct
  static struct rpc_xprt_ops xprt_rdma_procs = {
  	.reserve_xprt		= xprt_reserve_xprt_cong,
  	.release_xprt		= xprt_release_xprt_cong, /* sunrpc/xprt.c */
@@ -472,7 +474,7 @@ index xxxxxxx..xxxxxxx xxxxxx
  	.release_request	= xprt_release_rqst_cong,       /* ditto */
  	.set_retrans_timeout	= xprt_set_retrans_timeout_def, /* ditto */
  	.rpcbind		= rpcb_getport_async,	/* sunrpc/rpcb_clnt.c */
-@@ -687,7 +715,7 @@ static void __exit xprt_rdma_cleanup(void)
+@@ -687,7 +715,7 @@ static void __exit xprt_rdma_cleanup(voi
  	int rc;
 
  	dprintk("RPCRDMA Module Removed, deregister RPC RDMA transport\n");
@@ -490,8 +492,6 @@ index xxxxxxx..xxxxxxx xxxxxx
  	if (!sunrpc_table_header)
  		sunrpc_table_header = register_sysctl_table(sunrpc_table);
  #endif
-diff --git a/net/sunrpc/xprtrdma/verbs.c b/net/sunrpc/xprtrdma/verbs.c
-index xxxxxxx..xxxxxxx xxxxxx
 --- a/net/sunrpc/xprtrdma/verbs.c
 +++ b/net/sunrpc/xprtrdma/verbs.c
 @@ -58,7 +58,7 @@
@@ -512,7 +512,7 @@ index xxxxxxx..xxxxxxx xxxxxx
  static const char * const conn[] = {
  	"address resolved",
  	"address error",
-@@ -423,7 +423,7 @@ rpcrdma_conn_upcall(struct rdma_cm_id *id, struct rdma_cm_event *event)
+@@ -423,7 +423,7 @@ rpcrdma_conn_upcall(struct rdma_cm_id *i
  	struct rpcrdma_xprt *xprt = id->context;
  	struct rpcrdma_ia *ia = &xprt->rx_ia;
  	struct rpcrdma_ep *ep = &xprt->rx_ep;