projects / thirdparty / kernel / stable-queue.git / blame
| Commit | Line | Data |
|---|---|---|
| d1cf1a50 GKH |
1 | From a8f688ec437dc2045cc8f0c89fe877d5803850da Mon Sep 17 00:00:00 2001 |
| 2 | From: Chuck Lever <chuck.lever@oracle.com> | |
| 3 | Date: Fri, 4 May 2018 15:35:46 -0400 | |
| 4 | Subject: xprtrdma: Return -ENOBUFS when no pages are available | |
| 5 | ||
| 6 | From: Chuck Lever <chuck.lever@oracle.com> | |
| 7 | ||
| 8 | commit a8f688ec437dc2045cc8f0c89fe877d5803850da upstream. | |
| 9 | ||
| 10 | The use of -EAGAIN in rpcrdma_convert_iovs() is a latent bug: the | |
| 11 | transport never calls xprt_write_space() when more pages become | |
| 12 | available. -ENOBUFS will trigger the correct "delay briefly and call | |
| 13 | again" logic. | |
| 14 | ||
| 15 | Fixes: 7a89f9c626e3 ("xprtrdma: Honor ->send_request API contract") | |
| 16 | Signed-off-by: Chuck Lever <chuck.lever@oracle.com> | |
| 17 | Cc: stable@vger.kernel.org # 4.8+ | |
| 18 | Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com> | |
| 19 | Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> | |
| 20 | ||
| 21 | --- | |
| 22 | net/sunrpc/xprtrdma/rpc_rdma.c | 2 +- | |
| 23 | 1 file changed, 1 insertion(+), 1 deletion(-) | |
| 24 | ||
| 25 | --- a/net/sunrpc/xprtrdma/rpc_rdma.c | |
| 26 | +++ b/net/sunrpc/xprtrdma/rpc_rdma.c | |
| 27 | @@ -229,7 +229,7 @@ rpcrdma_convert_iovs(struct rpcrdma_xprt | |
| 28 | */ | |
| 29 | *ppages = alloc_page(GFP_ATOMIC); | |
| 30 | if (!*ppages) | |
| 31 | - return -EAGAIN; | |
| 32 | + return -ENOBUFS; | |
| 33 | } | |
| 34 | seg->mr_page = *ppages; | |
| 35 | seg->mr_offset = (char *)page_base; |