Message ID | 20170719220955.58210-21-trond.myklebust@primarydata.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show
Return-Path: <linux-nfs-owner@kernel.org> 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 0681E602BD for <patchwork-linux-nfs@patchwork.kernel.org>; Wed, 19 Jul 2017 22:10:28 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id ECB41285EA for <patchwork-linux-nfs@patchwork.kernel.org>; Wed, 19 Jul 2017 22:10:27 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E1A7828706; Wed, 19 Jul 2017 22:10:27 +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.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,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 83412285EA for <patchwork-linux-nfs@patchwork.kernel.org>; Wed, 19 Jul 2017 22:10:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755529AbdGSWKZ (ORCPT <rfc822;patchwork-linux-nfs@patchwork.kernel.org>); Wed, 19 Jul 2017 18:10:25 -0400 Received: from mail-io0-f194.google.com ([209.85.223.194]:38408 "EHLO mail-io0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932144AbdGSWKW (ORCPT <rfc822; linux-nfs@vger.kernel.org>); Wed, 19 Jul 2017 18:10:22 -0400 Received: by mail-io0-f194.google.com with SMTP id l7so808510iof.5 for <linux-nfs@vger.kernel.org>; Wed, 19 Jul 2017 15:10:21 -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=6DdcMVzP95t/TQi/q/ARLjRkQQK9oO+Nhdp0TOUEH44=; b=r8QvjFlEEQZ5gGksAUEtvpGNGQkqXUuRFmnPDN//x1k868IOxBzykMFxMTKDnBakCZ E54Iq33b5zf6UfbJtTAdI0rNig8FuEO1W/N3XV/+uPp1lWyvkRwW2NR+guQ2AT/vaPgn H2DRcm2K+n/OxXuIg3k6OFybad92wC+0Ja5yoj5jUfWHqUaafpRjfihd6r3mMwE9Xvd3 fC2492rK591ug+7DC8kQYE4sONalwUzW4qspjw+ny6H7v9tdALz+a3gistpH2xvqK6Zw E6r48dAXono/7XSTQ0R76+/WWLWiThym+U+69T2/T9gvyD1Q75AEH89eUKHlLKgZgz0t oINw== 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=6DdcMVzP95t/TQi/q/ARLjRkQQK9oO+Nhdp0TOUEH44=; b=tasbuNXslAueVG2bN61mPkxN0z2YOVEFtVRJXqKj+tRuzfc+dgae+GR91EviWjuy9U YXxRzuVfQ5+GhxTZCz1o+uPpy0CjgmemJJZ1PgibYp2QW6sVDtS2ZBfksdm4gQZZhr6h gFkTtbEOLcFPoJFsAwOBAGOqHwrwyouzTMKN9mg6gXMg9TtH9ajv/3WB4WVvzSSpRbSP AyxpzKHnvK3/rJ8tly3/gm+NSOEL0oGS+i+uwXMpMgwqQncFHD+ta87M52Gzm/DwifKF w/qyxrbRPGNvWPK86xmymWac9l0w8Phj1uOdRM9pUB98D28PBHYVV8AfL6nLgne62wV2 osNw== X-Gm-Message-State: AIVw111iIOqfvNeSD3/+gsRWuZnFtB+nUHUIU1fwd0Zk4HIUxrn85jI3 3cbsgQmXlmDfupZZsKE= X-Received: by 10.107.19.225 with SMTP id 94mr1663385iot.316.1500502221530; Wed, 19 Jul 2017 15:10:21 -0700 (PDT) Received: from leira.trondhjem.org (c-68-49-162-121.hsd1.mi.comcast.net. [68.49.162.121]) by smtp.gmail.com with ESMTPSA id 9sm518333iop.9.2017.07.19.15.10.20 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 19 Jul 2017 15:10:21 -0700 (PDT) From: Trond Myklebust <trond.myklebust@primarydata.com> To: Chuck Lever <chuck.lever@oracle.com>, linux-nfs@vger.kernel.org Subject: [PATCH 20/20] NFS: Throttle I/O to the NFS server Date: Wed, 19 Jul 2017 18:09:55 -0400 Message-Id: <20170719220955.58210-21-trond.myklebust@primarydata.com> X-Mailer: git-send-email 2.13.3 In-Reply-To: <20170719220955.58210-20-trond.myklebust@primarydata.com> References: <20170719220955.58210-1-trond.myklebust@primarydata.com> <20170719220955.58210-2-trond.myklebust@primarydata.com> <20170719220955.58210-3-trond.myklebust@primarydata.com> <20170719220955.58210-4-trond.myklebust@primarydata.com> <20170719220955.58210-5-trond.myklebust@primarydata.com> <20170719220955.58210-6-trond.myklebust@primarydata.com> <20170719220955.58210-7-trond.myklebust@primarydata.com> <20170719220955.58210-8-trond.myklebust@primarydata.com> <20170719220955.58210-9-trond.myklebust@primarydata.com> <20170719220955.58210-10-trond.myklebust@primarydata.com> <20170719220955.58210-11-trond.myklebust@primarydata.com> <20170719220955.58210-12-trond.myklebust@primarydata.com> <20170719220955.58210-13-trond.myklebust@primarydata.com> <20170719220955.58210-14-trond.myklebust@primarydata.com> <20170719220955.58210-15-trond.myklebust@primarydata.com> <20170719220955.58210-16-trond.myklebust@primarydata.com> <20170719220955.58210-17-trond.myklebust@primarydata.com> <20170719220955.58210-18-trond.myklebust@primarydata.com> <20170719220955.58210-19-trond.myklebust@primarydata.com> <20170719220955.58210-20-trond.myklebust@primarydata.com> Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: <linux-nfs.vger.kernel.org> X-Mailing-List: linux-nfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP |
diff --git a/fs/nfs/pagelist.c b/fs/nfs/pagelist.c index af6731dd4324..a5db892c272b 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;
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 <trond.myklebust@primarydata.com> --- fs/nfs/pagelist.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)