Signed-off-by: Vladimir Sokolovsky <vlad@mellanox.com>
---
- net/sunrpc/xprtrdma/svc_rdma_transport.c | 2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
+ net/sunrpc/xprtrdma/rpc_rdma.c | 16 ++++++++
+ 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 | 17 ++++++++
+ net/sunrpc/xprtrdma/xprt_rdma.h | 4 ++
+ 6 files changed, 133 insertions(+)
+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
+@@ -357,9 +357,17 @@ rpcrdma_inline_pullup(struct rpc_rqst *rqst, int pad)
+ curlen = copy_len;
+ dprintk("RPC: %s: page %d destp 0x%p len %d curlen %d\n",
+ __func__, i, destp, copy_len, curlen);
++#ifdef HAVE_KMAP_ATOMIC_1_PARAM
+ srcp = kmap_atomic(ppages[i]);
++#else
++ srcp = kmap_atomic(ppages[i], KM_SKB_SUNRPC_DATA);
++#endif
+ memcpy(destp, srcp+page_base, curlen);
++#ifdef HAVE_KMAP_ATOMIC_1_PARAM
+ kunmap_atomic(srcp);
++#else
++ kunmap_atomic(srcp, KM_SKB_SUNRPC_DATA);
++#endif
+ rqst->rq_svec[0].iov_len += curlen;
+ destp += curlen;
+ copy_len -= curlen;
+@@ -645,10 +653,18 @@ rpcrdma_inline_fixup(struct rpc_rqst *rqst, char *srcp, int copy_len, int pad)
+ dprintk("RPC: %s: page %d"
+ " srcp 0x%p len %d curlen %d\n",
+ __func__, i, srcp, copy_len, curlen);
++#ifdef HAVE_KMAP_ATOMIC_1_PARAM
+ destp = kmap_atomic(ppages[i]);
++#else
++ destp = kmap_atomic(ppages[i], KM_SKB_SUNRPC_DATA);
++#endif
+ memcpy(destp + page_base, srcp, curlen);
+ flush_dcache_page(ppages[i]);
++#ifdef HAVE_KMAP_ATOMIC_1_PARAM
+ kunmap_atomic(destp);
++#else
++ kunmap_atomic(destp, KM_SKB_SUNRPC_DATA);
++#endif
+ 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,
+ sge_no++;
+ }
+ rqstp->rq_respages = &rqstp->rq_pages[sge_no];
++#ifdef HAVE_RQ_NEXT_PAGE
+ rqstp->rq_next_page = rqstp->rq_respages + 1;
++#else
++ rqstp->rq_resused = 0;
++#endif
+
+ /* We should never run out of SGE because the limit is defined to
+ * support the max allowed RPC data length
+@@ -136,7 +140,11 @@ typedef int (*rdma_reader_fn)(struct svcxprt_rdma *xprt,
+ int last);
+
+ /* Issue an RDMA_READ using the local lkey to map the data sink */
++#ifndef HAVE_SVCXPRT_RDMA_SC_READER
+ static int rdma_read_chunk_lcl(struct svcxprt_rdma *xprt,
++#else
++int rdma_read_chunk_lcl(struct svcxprt_rdma *xprt,
++#endif
+ struct svc_rqst *rqstp,
+ struct svc_rdma_op_ctxt *head,
+ int *page_no,
+@@ -144,7 +152,11 @@ static int rdma_read_chunk_lcl(struct svcxprt_rdma *xprt,
+ u32 rs_handle,
+ u32 rs_length,
+ u64 rs_offset,
++#ifndef HAVE_SVCXPRT_RDMA_SC_READER
+ int last)
++#else
++ bool last)
++#endif
+ {
+ struct ib_send_wr read_wr;
+ int pages_needed = PAGE_ALIGN(*page_offset + rs_length) >> PAGE_SHIFT;
+@@ -168,7 +180,9 @@ static int rdma_read_chunk_lcl(struct svcxprt_rdma *xprt,
+ if (!pg_off)
+ head->count++;
+ rqstp->rq_respages = &rqstp->rq_arg.pages[pg_no+1];
++#ifdef HAVE_RQ_NEXT_PAGE
+ rqstp->rq_next_page = rqstp->rq_respages + 1;
++#endif
+ ctxt->sge[pno].addr =
+ ib_dma_map_page(xprt->sc_cm_id->device,
+ head->arg.pages[pg_no], pg_off,
+@@ -229,7 +243,11 @@ static int rdma_read_chunk_lcl(struct svcxprt_rdma *xprt,
+ }
+
+ /* Issue an RDMA_READ using an FRMR to map the data sink */
++#ifndef HAVE_SVCXPRT_RDMA_SC_READER
+ static int rdma_read_chunk_frmr(struct svcxprt_rdma *xprt,
++#else
++int rdma_read_chunk_frmr(struct svcxprt_rdma *xprt,
++#endif
+ struct svc_rqst *rqstp,
+ struct svc_rdma_op_ctxt *head,
+ int *page_no,
+@@ -237,7 +255,11 @@ static int rdma_read_chunk_frmr(struct svcxprt_rdma *xprt,
+ u32 rs_handle,
+ u32 rs_length,
+ u64 rs_offset,
++#ifndef HAVE_SVCXPRT_RDMA_SC_READER
+ int last)
++#else
++ bool last)
++#endif
+ {
+ struct ib_send_wr read_wr;
+ struct ib_send_wr inv_wr;
+@@ -273,7 +295,9 @@ static int rdma_read_chunk_frmr(struct svcxprt_rdma *xprt,
+ if (!pg_off)
+ head->count++;
+ rqstp->rq_respages = &rqstp->rq_arg.pages[pg_no+1];
++#ifdef HAVE_RQ_NEXT_PAGE
+ rqstp->rq_next_page = rqstp->rq_respages + 1;
++#endif
+ frmr->page_list->page_list[pno] =
+ ib_dma_map_page(xprt->sc_cm_id->device,
+ head->arg.pages[pg_no], 0,
+@@ -365,24 +389,50 @@ static int rdma_read_chunk_frmr(struct svcxprt_rdma *xprt,
+ return ret;
+ }
+
++#ifndef HAVE_SVC_RDMA_RCL_CHUNK_COUNTS
++static unsigned int
++rdma_rcl_chunk_count(struct rpcrdma_read_chunk *ch)
++{
++ unsigned int count;
++
++ for (count = 0; ch->rc_discrim != xdr_zero; ch++)
++ count++;
++ return count;
++}
++#endif
++
+ static int rdma_read_chunks(struct svcxprt_rdma *xprt,
+ struct rpcrdma_msg *rmsgp,
+ struct svc_rqst *rqstp,
+ struct svc_rdma_op_ctxt *head)
+ {
++#ifdef HAVE_SVC_RDMA_RCL_CHUNK_COUNTS
+ int page_no, ch_count, ret;
++#else
++ int page_no, ret;
++#endif
+ struct rpcrdma_read_chunk *ch;
++#ifndef HAVE_SVCXPRT_RDMA_SC_READER
+ u32 page_offset, byte_count;
+ u64 rs_offset;
+ rdma_reader_fn reader;
++#else
++ u32 handle, page_offset, byte_count;
++ u64 rs_offset;
++ bool last;
++#endif
+
+ /* If no read list is present, return 0 */
+ ch = svc_rdma_get_read_chunk(rmsgp);
+ if (!ch)
+ return 0;
+
++#ifdef HAVE_SVC_RDMA_RCL_CHUNK_COUNTS
+ svc_rdma_rcl_chunk_counts(ch, &ch_count, &byte_count);
+ if (ch_count > RPCSVC_MAXPAGES)
++#else
++ if (rdma_rcl_chunk_count(ch) > RPCSVC_MAXPAGES)
++#endif
+ return -EINVAL;
+
+ /* The request is completed when the RDMA_READs complete. The
+@@ -398,27 +448,43 @@ static int rdma_read_chunks(struct svcxprt_rdma *xprt,
+ head->arg.len = rqstp->rq_arg.len;
+ head->arg.buflen = rqstp->rq_arg.buflen;
+
++#ifndef HAVE_SVCXPRT_RDMA_SC_READER
+ /* Use FRMR if supported */
+ if (xprt->sc_dev_caps & SVCRDMA_DEVCAP_FAST_REG)
+ reader = rdma_read_chunk_frmr;
+ else
+ reader = rdma_read_chunk_lcl;
++#endif
+
+ page_no = 0; page_offset = 0;
+ for (ch = (struct rpcrdma_read_chunk *)&rmsgp->rm_body.rm_chunks[0];
+ ch->rc_discrim != 0; ch++) {
+
++#ifdef HAVE_SVCXPRT_RDMA_SC_READER
++ handle = be32_to_cpu(ch->rc_target.rs_handle);
++ byte_count = be32_to_cpu(ch->rc_target.rs_length);
++#endif
+ xdr_decode_hyper((__be32 *)&ch->rc_target.rs_offset,
+ &rs_offset);
++#ifndef HAVE_SVCXPRT_RDMA_SC_READER
+ byte_count = ntohl(ch->rc_target.rs_length);
++#endif
+
+ while (byte_count > 0) {
++#ifndef HAVE_SVCXPRT_RDMA_SC_READER
+ ret = reader(xprt, rqstp, head,
+ &page_no, &page_offset,
+ ntohl(ch->rc_target.rs_handle),
+ byte_count, rs_offset,
+ ((ch+1)->rc_discrim == 0) /* last */
+ );
++#else
++ last = (ch + 1)->rc_discrim == xdr_zero;
++ ret = xprt->sc_reader(xprt, rqstp, head,
++ &page_no, &page_offset,
++ handle, byte_count,
++ rs_offset, last);
++#endif
+ if (ret < 0)
+ goto err;
+ byte_count -= ret;
+@@ -483,7 +549,11 @@ static int rdma_read_complete(struct svc_rqst *rqstp,
+
+ /* rq_respages starts after the last arg page */
+ rqstp->rq_respages = &rqstp->rq_arg.pages[page_no];
++#ifdef HAVE_RQ_NEXT_PAGE
+ rqstp->rq_next_page = rqstp->rq_respages + 1;
++#else
++ rqstp->rq_resused = 0;
++#endif
+
+ /* 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,
+ int sge_no;
+ int sge_bytes;
+ int page_no;
++#ifdef HAVE_RQ_NEXT_PAGE
+ int pages;
++#endif
+ int ret;
+
+ /* Post a recv buffer to handle another request. */
+@@ -427,8 +429,12 @@ static int send_reply(struct svcxprt_rdma *rdma,
+ * respages array. They are our pages until the I/O
+ * completes.
+ */
++#ifdef HAVE_RQ_NEXT_PAGE
+ pages = rqstp->rq_next_page - rqstp->rq_respages;
+ for (page_no = 0; page_no < pages; page_no++) {
++#else
++ for (page_no = 0; page_no < rqstp->rq_resused; page_no++) {
++#endif
+ 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,
+ if (page_no+1 >= sge_no)
+ ctxt->sge[page_no+1].length = 0;
+ }
++#ifdef HAVE_RQ_NEXT_PAGE
+ rqstp->rq_next_page = rqstp->rq_respages + 1;
++#endif
+
+ 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
--- a/net/sunrpc/xprtrdma/svc_rdma_transport.c
+++ b/net/sunrpc/xprtrdma/svc_rdma_transport.c
-@@ -92,7 +92,9 @@ struct svc_xprt_class svc_rdma_class = {
+@@ -66,7 +66,9 @@ static void dto_tasklet_func(unsigned long data);
+ 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);
++#ifdef HAVE_XPO_SECURE_PORT
+ static int svc_rdma_secure_port(struct svc_rqst *);
++#endif
+ 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 = {
+ .xpo_prep_reply_hdr = svc_rdma_prep_reply_hdr,
+ .xpo_has_wspace = svc_rdma_has_wspace,
+ .xpo_accept = svc_rdma_accept,
++#ifdef HAVE_XPO_SECURE_PORT
+ .xpo_secure_port = svc_rdma_secure_port,
++#endif
+ };
+
+ struct svc_xprt_class svc_rdma_class = {
+@@ -92,7 +96,9 @@ struct svc_xprt_class svc_rdma_class = {
.xcl_owner = THIS_MODULE,
.xcl_ops = &svc_rdma_ops,
.xcl_max_payload = RPCSVC_MAXPAYLOAD_RDMA,
};
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,
+
+ if (!cma_xprt)
+ return NULL;
++#ifdef HAVE_SVC_XPRT_INIT_4_PARAMS
+ svc_xprt_init(&init_net, &svc_rdma_class, &cma_xprt->sc_xprt, serv);
++#else
++ svc_xprt_init(&svc_rdma_class, &cma_xprt->sc_xprt, serv);
++#endif
+ 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)
+ * NB: iWARP requires remote write access for the data sink
+ * of an RDMA_READ. IB does not.
+ */
++#ifdef HAVE_SVCXPRT_RDMA_SC_READER
++ newxprt->sc_reader = rdma_read_chunk_lcl;
++#endif
+ if (devattr.device_cap_flags & IB_DEVICE_MEM_MGT_EXTENSIONS) {
+ newxprt->sc_frmr_pg_list_len =
+ devattr.max_fast_reg_page_list_len;
+ newxprt->sc_dev_caps |= SVCRDMA_DEVCAP_FAST_REG;
++#ifdef HAVE_SVCXPRT_RDMA_SC_READER
++ newxprt->sc_reader = rdma_read_chunk_frmr;
++#endif
+ }
+
+ /*
+@@ -1205,10 +1221,12 @@ static int svc_rdma_has_wspace(struct svc_xprt *xprt)
+ return 1;
+ }
+
++#ifdef HAVE_XPO_SECURE_PORT
+ static int svc_rdma_secure_port(struct svc_rqst *rqstp)
+ {
+ return 1;
+ }
++#endif
+
+ /*
+ * 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,7 +51,9 @@
+ #include <linux/init.h>
+ #include <linux/slab.h>
+ #include <linux/seq_file.h>
++#ifdef HAVE_SUNRPC_ADDR_H
+ #include <linux/sunrpc/addr.h>
++#endif
+
+ #include "xprt_rdma.h"
+
+@@ -277,8 +279,14 @@ xprt_setup_rdma(struct xprt_create *args)
+ return ERR_PTR(-EBADF);
+ }
+
++#if defined(HAVE_XPRT_ALLOC_HAS_3_PARAMS) || defined(HAVE_XPRT_ALLOC_HAS_4_PARAMS)
+ xprt = xprt_alloc(args->net, sizeof(struct rpcrdma_xprt),
++#else
++ xprt = xprt_alloc(sizeof(struct rpcrdma_xprt),
++#endif
++#ifdef HAVE_XPRT_ALLOC_HAS_4_PARAMS
+ xprt_rdma_slot_table_entries,
++#endif
+ xprt_rdma_slot_table_entries);
+ if (xprt == NULL) {
+ dprintk("RPC: %s: couldn't allocate rpcrdma_xprt\n",
+@@ -428,8 +436,15 @@ xprt_rdma_set_port(struct rpc_xprt *xprt, u16 port)
+ }
+
+ static void
++#ifdef HAVE_RPC_XPRT_OPS_CONNECT_2_PARAMS
+ xprt_rdma_connect(struct rpc_xprt *xprt, struct rpc_task *task)
++#else
++xprt_rdma_connect(struct rpc_task *task)
++#endif
+ {
++#ifndef HAVE_RPC_XPRT_OPS_CONNECT_2_PARAMS
++ struct rpc_xprt *xprt = task->tk_xprt;
++#endif
+ struct rpcrdma_xprt *r_xprt = rpcx_to_rdmax(xprt);
+
+ if (r_xprt->rx_ep.rep_connected != 0) {
+@@ -678,7 +693,9 @@ static void xprt_rdma_print_stats(struct rpc_xprt *xprt, struct seq_file *seq)
+ static struct rpc_xprt_ops xprt_rdma_procs = {
+ .reserve_xprt = xprt_reserve_xprt_cong,
+ .release_xprt = xprt_release_xprt_cong, /* sunrpc/xprt.c */
++#ifdef HAVE_XPRT_ALLOC_SLOT
+ .alloc_slot = xprt_alloc_slot,
++#endif
+ .release_request = xprt_release_rqst_cong, /* ditto */
+ .set_retrans_timeout = xprt_set_retrans_timeout_def, /* ditto */
+ .rpcbind = rpcb_getport_async, /* sunrpc/rpcb_clnt.c */
+diff --git a/net/sunrpc/xprtrdma/xprt_rdma.h b/net/sunrpc/xprtrdma/xprt_rdma.h
+index xxxxxxx..xxxxxxx xxxxxx
+--- a/net/sunrpc/xprtrdma/xprt_rdma.h
++++ b/net/sunrpc/xprtrdma/xprt_rdma.h
+@@ -56,6 +56,10 @@
+ #define RDMA_RESOLVE_TIMEOUT (5000) /* 5 seconds */
+ #define RDMA_CONNECT_RETRY_MAX (2) /* retries if no listener backlog */
+
++#if defined(CONFIG_COMPAT_SUNRPC_DEBUG) && defined(CONFIG_SUNRPC_DEBUG)
++#define RPC_DEBUG
++#endif
++
+ /*
+ * Interface Adapter -- one per transport instance
+ */
+++ /dev/null
-From fee8373dd67c7bfc7a255906a341ec328463b185 Mon Sep 17 00:00:00 2001
-From: Jeff Becker <Jeffrey.C.Becker@nasa.gov>
-Date: Wed, 1 Apr 2015 15:43:27 -0700
-Subject: [PATCH] BACKPORT: nfsrdma SLES11SP3
-
-Signed-off-by: Jeff Becker <Jeffrey.C.Becker@nasa.gov>
-
----
-diff -Naur a/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c b/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c
---- a/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c 2015-03-11 14:44:18.354200417 -0700
-+++ b/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c 2015-03-11 15:35:33.113138831 -0700
-@@ -93,7 +93,9 @@
- sge_no++;
- }
- rqstp->rq_respages = &rqstp->rq_pages[sge_no];
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0))
- rqstp->rq_next_page = rqstp->rq_respages + 1;
-+#endif
-
- /* We should never run out of SGE because the limit is defined to
- * support the max allowed RPC data length
-@@ -168,7 +170,9 @@
- if (!pg_off)
- head->count++;
- rqstp->rq_respages = &rqstp->rq_arg.pages[pg_no+1];
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0))
- rqstp->rq_next_page = rqstp->rq_respages + 1;
-+#endif
- ctxt->sge[pno].addr =
- ib_dma_map_page(xprt->sc_cm_id->device,
- head->arg.pages[pg_no], pg_off,
-@@ -273,7 +277,9 @@
- if (!pg_off)
- head->count++;
- rqstp->rq_respages = &rqstp->rq_arg.pages[pg_no+1];
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0))
- rqstp->rq_next_page = rqstp->rq_respages + 1;
-+#endif
- frmr->page_list->page_list[pno] =
- ib_dma_map_page(xprt->sc_cm_id->device,
- head->arg.pages[pg_no], 0,
-@@ -483,7 +489,11 @@
-
- /* rq_respages starts after the last arg page */
- rqstp->rq_respages = &rqstp->rq_arg.pages[page_no];
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0))
- rqstp->rq_next_page = rqstp->rq_respages + 1;
-+#else
-+ rqstp->rq_resused = 0;
-+#endif
-
- /* Rebuild rq_arg head and tail. */
- rqstp->rq_arg.head[0] = head->arg.head[0];
-diff -Naur a/net/sunrpc/xprtrdma/svc_rdma_sendto.c b/net/sunrpc/xprtrdma/svc_rdma_sendto.c
---- a/net/sunrpc/xprtrdma/svc_rdma_sendto.c 2015-03-11 14:44:18.354200417 -0700
-+++ b/net/sunrpc/xprtrdma/svc_rdma_sendto.c 2015-03-11 14:59:44.831166432 -0700
-@@ -375,7 +375,9 @@
- int sge_no;
- int sge_bytes;
- int page_no;
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0))
- int pages;
-+#endif
- int ret;
-
- /* Post a recv buffer to handle another request. */
-@@ -427,8 +429,12 @@
- * respages array. They are our pages until the I/O
- * completes.
- */
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0))
- pages = rqstp->rq_next_page - rqstp->rq_respages;
- for (page_no = 0; page_no < pages; page_no++) {
-+#else
-+ for (page_no = 0; page_no < rqstp->rq_resused; page_no++) {
-+#endif
- ctxt->pages[page_no+1] = rqstp->rq_respages[page_no];
- ctxt->count++;
- rqstp->rq_respages[page_no] = NULL;
-@@ -440,8 +446,9 @@
- if (page_no+1 >= sge_no)
- ctxt->sge[page_no+1].length = 0;
- }
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0))
- rqstp->rq_next_page = rqstp->rq_respages + 1;
--
-+#endif
- BUG_ON(sge_no > rdma->sc_max_sge);
- memset(&send_wr, 0, sizeof send_wr);
- ctxt->wr_op = IB_WR_SEND;
-diff -Naur a/net/sunrpc/xprtrdma/svc_rdma_transport.c b/net/sunrpc/xprtrdma/svc_rdma_transport.c
---- a/net/sunrpc/xprtrdma/svc_rdma_transport.c 2015-03-11 14:44:18.358200523 -0700
-+++ b/net/sunrpc/xprtrdma/svc_rdma_transport.c 2015-03-11 14:49:30.614613278 -0700
-@@ -467,7 +467,11 @@
-
- if (!cma_xprt)
- return NULL;
-+#if LINUX_VERSION_CODE > KERNEL_VERSION(3, 1, 0)
- svc_xprt_init(&init_net, &svc_rdma_class, &cma_xprt->sc_xprt, serv);
-+#else
-+ svc_xprt_init(&svc_rdma_class, &cma_xprt->sc_xprt, serv);
-+#endif
- 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);
-diff -Naur a/net/sunrpc/xprtrdma/transport.c b/net/sunrpc/xprtrdma/transport.c
---- a/net/sunrpc/xprtrdma/transport.c 2015-03-11 14:44:18.358200523 -0700
-+++ b/net/sunrpc/xprtrdma/transport.c 2015-03-11 16:18:31.130698882 -0700
-@@ -51,7 +51,9 @@
- #include <linux/init.h>
- #include <linux/slab.h>
- #include <linux/seq_file.h>
-+#if (LINUX_VERSION_CODE > KERNEL_VERSION(3,8,0))
- #include <linux/sunrpc/addr.h>
-+#endif
-
- #include "xprt_rdma.h"
-
-@@ -278,7 +280,9 @@
- }
-
- xprt = xprt_alloc(args->net, sizeof(struct rpcrdma_xprt),
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,1,0) || CONFIG_COMPAT_XPRT_ALLOC_4PARAMS)
- xprt_rdma_slot_table_entries,
-+#endif
- xprt_rdma_slot_table_entries);
- if (xprt == NULL) {
- dprintk("RPC: %s: couldn't allocate rpcrdma_xprt\n",
-@@ -428,8 +432,15 @@
- }
-
- static void
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,1,0))
-+xprt_rdma_connect(struct rpc_task *task)
-+#else
- xprt_rdma_connect(struct rpc_xprt *xprt, struct rpc_task *task)
-+#endif
- {
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,1,0))
-+ struct rpc_xprt *xprt = task->tk_xprt;
-+#endif
- struct rpcrdma_xprt *r_xprt = rpcx_to_rdmax(xprt);
-
- if (r_xprt->rx_ep.rep_connected != 0) {
-@@ -678,7 +689,9 @@
- static struct rpc_xprt_ops xprt_rdma_procs = {
- .reserve_xprt = xprt_reserve_xprt_cong,
- .release_xprt = xprt_release_xprt_cong, /* sunrpc/xprt.c */
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,6,0) || CONFIG_COMPAT_RPC_XPRT_OPS_HAS_ALLOC_SLOT)
- .alloc_slot = xprt_alloc_slot,
-+#endif
- .release_request = xprt_release_rqst_cong, /* ditto */
- .set_retrans_timeout = xprt_set_retrans_timeout_def, /* ditto */
- .rpcbind = rpcb_getport_async, /* sunrpc/rpcb_clnt.c */
projects / ~aditr / compat-rdma.git / commitdiff