diff options
author | Chuck Lever <chuck.lever@oracle.com> | 2014-07-29 17:23:34 -0400 |
---|---|---|
committer | Anna Schumaker <Anna.Schumaker@Netapp.com> | 2014-07-31 16:22:52 -0400 |
commit | 43e95988178ed70a878a5be6be9ad248342dbf7d (patch) | |
tree | 03944907357c8eebeea55f5c0dcba2339c2feea1 /net/sunrpc/xprtrdma/verbs.c | |
parent | 73806c8832b3438ef0439603dab1f3cfc61cb6cd (diff) |
xprtrdma: Limit data payload size for ALLPHYSICAL
When the client uses physical memory registration, each page in the
payload gets its own array entry in the RPC/RDMA header's chunk list.
Therefore, don't advertise a maximum payload size that would require
more array entries than can fit in the RPC buffer where RPC/RDMA
headers are built.
BugLink: https://bugzilla.linux-nfs.org/show_bug.cgi?id=248
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Tested-by: Steve Wise <swise@opengridcomputing.com>
Tested-by: Shirley Ma <shirley.ma@oracle.com>
Tested-by: Devesh Sharma <devesh.sharma@emulex.com>
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
Diffstat (limited to 'net/sunrpc/xprtrdma/verbs.c')
-rw-r--r-- | net/sunrpc/xprtrdma/verbs.c | 41 |
1 files changed, 41 insertions, 0 deletions
diff --git a/net/sunrpc/xprtrdma/verbs.c b/net/sunrpc/xprtrdma/verbs.c index aa08de89de42..13ff87400203 100644 --- a/net/sunrpc/xprtrdma/verbs.c +++ b/net/sunrpc/xprtrdma/verbs.c | |||
@@ -1825,3 +1825,44 @@ rpcrdma_ep_post_recv(struct rpcrdma_ia *ia, | |||
1825 | rc); | 1825 | rc); |
1826 | return rc; | 1826 | return rc; |
1827 | } | 1827 | } |
1828 | |||
1829 | /* Physical mapping means one Read/Write list entry per-page. | ||
1830 | * All list entries must fit within an inline buffer | ||
1831 | * | ||
1832 | * NB: The server must return a Write list for NFS READ, | ||
1833 | * which has the same constraint. Factor in the inline | ||
1834 | * rsize as well. | ||
1835 | */ | ||
1836 | static size_t | ||
1837 | rpcrdma_physical_max_payload(struct rpcrdma_xprt *r_xprt) | ||
1838 | { | ||
1839 | struct rpcrdma_create_data_internal *cdata = &r_xprt->rx_data; | ||
1840 | unsigned int inline_size, pages; | ||
1841 | |||
1842 | inline_size = min_t(unsigned int, | ||
1843 | cdata->inline_wsize, cdata->inline_rsize); | ||
1844 | inline_size -= RPCRDMA_HDRLEN_MIN; | ||
1845 | pages = inline_size / sizeof(struct rpcrdma_segment); | ||
1846 | return pages << PAGE_SHIFT; | ||
1847 | } | ||
1848 | |||
1849 | static size_t | ||
1850 | rpcrdma_mr_max_payload(struct rpcrdma_xprt *r_xprt) | ||
1851 | { | ||
1852 | return RPCRDMA_MAX_DATA_SEGS << PAGE_SHIFT; | ||
1853 | } | ||
1854 | |||
1855 | size_t | ||
1856 | rpcrdma_max_payload(struct rpcrdma_xprt *r_xprt) | ||
1857 | { | ||
1858 | size_t result; | ||
1859 | |||
1860 | switch (r_xprt->rx_ia.ri_memreg_strategy) { | ||
1861 | case RPCRDMA_ALLPHYSICAL: | ||
1862 | result = rpcrdma_physical_max_payload(r_xprt); | ||
1863 | break; | ||
1864 | default: | ||
1865 | result = rpcrdma_mr_max_payload(r_xprt); | ||
1866 | } | ||
1867 | return result; | ||
1868 | } | ||