From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr1-f68.google.com ([209.85.221.68]:46989 "EHLO mail-wr1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728236AbeGVADr (ORCPT ); Sat, 21 Jul 2018 20:03:47 -0400 Received: by mail-wr1-f68.google.com with SMTP id s11-v6so14375770wra.13 for ; Sat, 21 Jul 2018 16:09:21 -0700 (PDT) Date: Sun, 22 Jul 2018 00:09:01 +0100 From: Sudip Mukherjee To: gregkh@linuxfoundation.org Cc: chuck.lever@oracle.com, Anna.Schumaker@Netapp.com, stable@vger.kernel.org Subject: Re: FAILED: patch "[PATCH] xprtrdma: Return -ENOBUFS when no pages are available" failed to apply to 4.9-stable tree Message-ID: <20180721230901.ovrnjpbwsbhtoboy@debian> References: <1530438755162181@kroah.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="abtkssem4bcc3cyd" Content-Disposition: inline In-Reply-To: <1530438755162181@kroah.com> Sender: stable-owner@vger.kernel.org List-ID: --abtkssem4bcc3cyd Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Hi Greg, On Sun, Jul 01, 2018 at 11:52:35AM +0200, gregkh@linuxfoundation.org wrote: > > The patch below does not apply to the 4.9-stable tree. > If someone wants it applied there, or to any other stable or longterm > tree, then please email the backport, including the original git commit > id to . The attached backported patch should apply to 4.9-stable. -- Regards Sudip --abtkssem4bcc3cyd Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="0001-xprtrdma-Return-ENOBUFS-when-no-pages-are-available.patch" >>From 9562dcbaa81ad0853f0971e050cc9972c7af3d40 Mon Sep 17 00:00:00 2001 From: Chuck Lever Date: Fri, 4 May 2018 15:35:46 -0400 Subject: [PATCH] xprtrdma: Return -ENOBUFS when no pages are available commit a8f688ec437dc2045cc8f0c89fe877d5803850da upstream The use of -EAGAIN in rpcrdma_convert_iovs() is a latent bug: the transport never calls xprt_write_space() when more pages become available. -ENOBUFS will trigger the correct "delay briefly and call again" logic. Fixes: 7a89f9c626e3 ("xprtrdma: Honor ->send_request API contract") Signed-off-by: Chuck Lever Cc: stable@vger.kernel.org # 4.8+ Signed-off-by: Anna Schumaker Signed-off-by: Sudip Mukherjee --- net/sunrpc/xprtrdma/rpc_rdma.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/sunrpc/xprtrdma/rpc_rdma.c b/net/sunrpc/xprtrdma/rpc_rdma.c index f57c9f0ab8f9..0287734f126f 100644 --- a/net/sunrpc/xprtrdma/rpc_rdma.c +++ b/net/sunrpc/xprtrdma/rpc_rdma.c @@ -229,7 +229,7 @@ rpcrdma_convert_iovs(struct rpcrdma_xprt *r_xprt, struct xdr_buf *xdrbuf, /* alloc the pagelist for receiving buffer */ ppages[p] = alloc_page(GFP_ATOMIC); if (!ppages[p]) - return -EAGAIN; + return -ENOBUFS; } seg[n].mr_page = ppages[p]; seg[n].mr_offset = (void *)(unsigned long) page_base; -- 2.11.0 --abtkssem4bcc3cyd--