From patchwork Tue Dec 14 13:53:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bixuan Cui X-Patchwork-Id: 12676031 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2D053C4332F for ; Tue, 14 Dec 2021 13:53:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234570AbhLNNxr (ORCPT ); Tue, 14 Dec 2021 08:53:47 -0500 Received: from out30-43.freemail.mail.aliyun.com ([115.124.30.43]:36311 "EHLO out30-43.freemail.mail.aliyun.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230146AbhLNNxq (ORCPT ); Tue, 14 Dec 2021 08:53:46 -0500 X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R951e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=e01e04357;MF=cuibixuan@linux.alibaba.com;NM=1;PH=DS;RN=14;SR=0;TI=SMTPD_---0V-dK6r3_1639490018; Received: from VM20210331-25.tbsite.net(mailfrom:cuibixuan@linux.alibaba.com fp:SMTPD_---0V-dK6r3_1639490018) by smtp.aliyun-inc.com(127.0.0.1); Tue, 14 Dec 2021 21:53:44 +0800 From: Bixuan Cui To: linux-kernel@vger.kernel.org, netdev@vger.kernel.org, linux-nfs@vger.kernel.org Cc: cuibixuan@linux.alibaba.com, bfields@fieldses.org, chuck.lever@oracle.com, trond.myklebust@hammerspace.com, anna.schumaker@netapp.com, davem@davemloft.net, kuba@kernel.org, pete.wl@alibaba-inc.com, wenan.mwa@alibaba-inc.com, xiaoh.peixh@alibaba-inc.com, weipu.zy@alibaba-inc.com Subject: [PATCH -next] SUNRPC: Clean XPRT_CONGESTED of xprt->state when rpc task is killed Date: Tue, 14 Dec 2021 21:53:38 +0800 Message-Id: <1639490018-128451-2-git-send-email-cuibixuan@linux.alibaba.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1639490018-128451-1-git-send-email-cuibixuan@linux.alibaba.com> References: <1639490018-128451-1-git-send-email-cuibixuan@linux.alibaba.com> Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org When the values of tcp_max_slot_table_entries and sunrpc.tcp_slot_table_entries are lower than the number of rpc tasks, xprt_dynamic_alloc_slot() in xprt_alloc_slot() will return -EAGAIN, and then set xprt->state to XPRT_CONGESTED: xprt_retry_reserve ->xprt_do_reserve ->xprt_alloc_slot ->xprt_dynamic_alloc_slot // return -EAGAIN and task->tk_rqstp is NULL ->xprt_add_backlog // set_bit(XPRT_CONGESTED, &xprt->state); When rpc task is killed, XPRT_CONGESTED bit of xprt->state will not be cleaned up and nfs hangs: rpc_exit_task ->xprt_release // if (req == NULL) is true, then XPRT_CONGESTED // bit not clean Add xprt_wake_up_backlog(xprt) to clean XPRT_CONGESTED bit in xprt_release(). Signed-off-by: Bixuan Cui Signed-off-by: Xiaohui Pei --- net/sunrpc/xprt.c | 1 + 1 file changed, 1 insertion(+) diff --git a/net/sunrpc/xprt.c b/net/sunrpc/xprt.c index a02de2b..70d11ae 100644 --- a/net/sunrpc/xprt.c +++ b/net/sunrpc/xprt.c @@ -1952,6 +1952,7 @@ void xprt_release(struct rpc_task *task) if (req == NULL) { if (task->tk_client) { xprt = task->tk_xprt; + xprt_wake_up_backlog(xprt); xprt_release_write(xprt, task); } return;