From patchwork Thu Aug 3 13:45:23 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 9879169 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id E8ADE60360 for ; Thu, 3 Aug 2017 13:46:16 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DE0D425F31 for ; Thu, 3 Aug 2017 13:46:16 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D3011287B9; Thu, 3 Aug 2017 13:46:16 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.3 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F040A2886B for ; Thu, 3 Aug 2017 13:46:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751916AbdHCNqO (ORCPT ); Thu, 3 Aug 2017 09:46:14 -0400 Received: from mail-it0-f66.google.com ([209.85.214.66]:33297 "EHLO mail-it0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751944AbdHCNqK (ORCPT ); Thu, 3 Aug 2017 09:46:10 -0400 Received: by mail-it0-f66.google.com with SMTP id m34so1323700iti.0 for ; Thu, 03 Aug 2017 06:46:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references; bh=sh0HjcWVGb0/W4vmw9Ere2sp58MAC1aeCzGJG0ObWaE=; b=OmQA4GmZeROhQKfqDdKNYXhiziXylTBSgM2RzlItpaxeLKKsAh3glbTXlWU9VcZj4s Dwpeh3JGz8qvG+bINo++E1qaMfpTZwENe6obPs9lTWJulFgs2NzvvmrgYIOngSD+7t6s o7TQpH3e2LsNuWYKabfzZrf46RHfl748kTR+M4+1KkAJwx7USspekDS/a0KyoAGJuGug bzO1sG5C2qbkEEfTemigJekyyXg4xM+sr1mYrWbiCut/CiClwTbG0MJfFz4G385pIPXi qdqLSXZW/odZkcB4aMfJ6U3BAIuaNgpSyGKl+eUCprFrwG1mT4LEpIauPcVqBbYsmzQR MIkQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references; bh=sh0HjcWVGb0/W4vmw9Ere2sp58MAC1aeCzGJG0ObWaE=; b=JBKumrrD3q96uzbIO8FR20A54yODKlwiNs568cTemg4iXwEFIsBeail2vDqPsHtBqz EZYcIws5UGvk012HAqOFgAxkR2eGd/mGq4uOKX4qM6rW7jYxaXMlw97x1v3NLNnpzXxA ZvhatDO/f/ZtIYiSQ7ZSJ1xR7mHwMkxjwIcmThzVB3AYNtn7DAzjO6QK/Mw69K9o+BiE aK3BIPRWkcJ5sfoeerEp0ypTGVRwNFXlaz1kibjfwbOmG8t5d1stjfDps04gqf4LWrnV TFLGfaW0StZ/m7f9HAgOPlPgM9ED0078BDNzZrvMCTewlY70+EJevG5PIaCiTSihv4I1 voow== X-Gm-Message-State: AIVw111bQM7rNwvK77g9TofK5f/TCOdAd8+wVGWwOSXWP4OItbMoyCxz gGlWAR8/g5Nx0xvl8kU= X-Received: by 10.36.237.12 with SMTP id r12mr1765858ith.45.1501767968810; Thu, 03 Aug 2017 06:46:08 -0700 (PDT) Received: from localhost.localdomain (50-108-95-251.adr01.mskg.mi.frontiernet.net. [50.108.95.251]) by smtp.gmail.com with ESMTPSA id q90sm5759547ioi.41.2017.08.03.06.46.07 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 03 Aug 2017 06:46:07 -0700 (PDT) From: Trond Myklebust To: Chuck Lever , linux-nfs@vger.kernel.org Subject: [PATCH v2 28/28] NFS: Throttle I/O to the NFS server Date: Thu, 3 Aug 2017 09:45:23 -0400 Message-Id: <20170803134523.4922-29-trond.myklebust@primarydata.com> X-Mailer: git-send-email 2.13.3 In-Reply-To: <20170803134523.4922-28-trond.myklebust@primarydata.com> References: <20170803134523.4922-1-trond.myklebust@primarydata.com> <20170803134523.4922-2-trond.myklebust@primarydata.com> <20170803134523.4922-3-trond.myklebust@primarydata.com> <20170803134523.4922-4-trond.myklebust@primarydata.com> <20170803134523.4922-5-trond.myklebust@primarydata.com> <20170803134523.4922-6-trond.myklebust@primarydata.com> <20170803134523.4922-7-trond.myklebust@primarydata.com> <20170803134523.4922-8-trond.myklebust@primarydata.com> <20170803134523.4922-9-trond.myklebust@primarydata.com> <20170803134523.4922-10-trond.myklebust@primarydata.com> <20170803134523.4922-11-trond.myklebust@primarydata.com> <20170803134523.4922-12-trond.myklebust@primarydata.com> <20170803134523.4922-13-trond.myklebust@primarydata.com> <20170803134523.4922-14-trond.myklebust@primarydata.com> <20170803134523.4922-15-trond.myklebust@primarydata.com> <20170803134523.4922-16-trond.myklebust@primarydata.com> <20170803134523.4922-17-trond.myklebust@primarydata.com> <20170803134523.4922-18-trond.myklebust@primarydata.com> <20170803134523.4922-19-trond.myklebust@primarydata.com> <20170803134523.4922-20-trond.myklebust@primarydata.com> <20170803134523.4922-21-trond.myklebust@primarydata.com> <20170803134523.4922-22-trond.myklebust@primarydata.com> <20170803134523.4922-23-trond.myklebust@primarydata.com> <20170803134523.4922-24-trond.myklebust@primarydata.com> <20170803134523.4922-25-trond.myklebust@primarydata.com> <20170803134523.4922-26-trond.myklebust@primarydata.com> <20170803134523.4922-27-trond.myklebust@primarydata.com> <20170803134523.4922-28-trond.myklebust@primarydata.com> Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Ensure that we do not build up large queues of asynchronous I/O work in the RPC layer that are not being handled by the socket. Signed-off-by: Trond Myklebust --- fs/nfs/pagelist.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/fs/nfs/pagelist.c b/fs/nfs/pagelist.c index 548ebc7256ff..c9a664730e94 100644 --- a/fs/nfs/pagelist.c +++ b/fs/nfs/pagelist.c @@ -625,7 +625,8 @@ int nfs_initiate_pgio(struct rpc_clnt *clnt, struct nfs_pgio_header *hdr, ret = rpc_wait_for_completion_task(task); if (ret == 0) ret = task->tk_status; - } + } else + rpc_wait_for_msg_send(task); rpc_put_task(task); out: return ret;