From patchwork Tue Nov 3 20:43:31 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 7547091 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 75822BEEA4 for ; Tue, 3 Nov 2015 20:43:43 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 92C59206FE for ; Tue, 3 Nov 2015 20:43:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 04D7C2058E for ; Tue, 3 Nov 2015 20:43:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932197AbbKCUni (ORCPT ); Tue, 3 Nov 2015 15:43:38 -0500 Received: from mail-qg0-f41.google.com ([209.85.192.41]:36041 "EHLO mail-qg0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755375AbbKCUnh (ORCPT ); Tue, 3 Nov 2015 15:43:37 -0500 Received: by qgad10 with SMTP id d10so24006946qga.3 for ; Tue, 03 Nov 2015 12:43:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=poochiereds_net.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=GyqbCgz5BEVjPI5VQyDN/S5N3G8t7k8TOAoxSDTRe/I=; b=EzvPyX8pmSPHCHAJ1eCtZxqTpf9i72rWJjT9hLt/wxAM/mxB6O9owneBobDsI+/uR6 Fl1g7LsC2XNFDDr9jLZdZ838h16j1Hh2LK1bnZl9ZJVm81oTnYh5GYx8S+hShPVK5daK 8qulz431Gwk+G9nORNXzUpGHbRgBW92cEaGD2BUJNG56vLlyD82GTGBFeJDYhDGO0Hmc M6K5MOhxYJfpZ/9gE9gJppl1xynj8m5hG8C575wWXDkZVCjGXpggPyz8T3VetGZV2AOl VpgEAkVewchziOTfuqo7Fs0Oi9j+d63qNoA9o1b2rjYYvz/LgsVnPr47Zl0Yz/rDYM4u JPEQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=GyqbCgz5BEVjPI5VQyDN/S5N3G8t7k8TOAoxSDTRe/I=; b=J2BdbY0yHc5z20kcxgN9hVrOPvy7SO1mus2X0XuNa0LN1zwQnSEdopWYw5ThihAYWX gxO7GcNy4oJlN37P3SBpBv9xGMY849Fl8KG4xxKRYsqof0YBEUtyJi3Uw+pgfleSFhu2 jp2OHo6gThQx32vKwJBGEYt2nJBHaaBo+Mjs/eDX6vzLrafHg1xxihGCYin/Z27DedO0 WE+dX4IfJcpAVVyJ5vpl2oEY9whh/M0Gf+YyqW6p5Z92RonUU1SNgGpjnQ5vMy3PScyf iHWd6qnF4tz6e37n0yaG3lELHs6KTTFzQRv9gQ5UoXqMT4CkojJG+a2XaIJfKBTPzOhn HW8A== X-Gm-Message-State: ALoCoQmgHgT/NLq0ZvcLUC2N6oFVxSX3dN2AxRgT5DdPPlngqvY8EtTRGzA36/RNfPeJjjkddc2M X-Received: by 10.140.33.247 with SMTP id j110mr39806926qgj.52.1446583416251; Tue, 03 Nov 2015 12:43:36 -0800 (PST) Received: from tlielax.poochiereds.net ([2606:a000:1125:6079::d5a]) by smtp.googlemail.com with ESMTPSA id k201sm10288645qhc.34.2015.11.03.12.43.34 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 03 Nov 2015 12:43:35 -0800 (PST) From: Jeff Layton X-Google-Original-From: Jeff Layton To: trond.myklebust@primarydata.com, Anna Schumaker Cc: linux-nfs@vger.kernel.org Subject: [PATCH RFC] nfs4: use adaptive backoff when we get NFS4ERR_DELAY on LAYOUTGET Date: Tue, 3 Nov 2015 15:43:31 -0500 Message-Id: <1446583411-9901-1-git-send-email-jeff.layton@primarydata.com> X-Mailer: git-send-email 2.4.3 Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID,T_RP_MATCHES_RCVD,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Currently, we end up waiting a full 15s before reissuing the call because we're passing in NULL for the timeout. Signed-off-by: Jeff Layton --- fs/nfs/nfs4proc.c | 3 ++- include/linux/nfs_xdr.h | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index 5133bb18830e..b4098319b021 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -7872,7 +7872,7 @@ static void nfs4_layoutget_done(struct rpc_task *task, void *calldata) spin_unlock(&inode->i_lock); goto out_restart; } - if (nfs4_async_handle_error(task, server, state, NULL) == -EAGAIN) + if (nfs4_async_handle_error(task, server, state, &lgp->timeout) == -EAGAIN) goto out_restart; out: dprintk("<-- %s\n", __func__); @@ -7990,6 +7990,7 @@ nfs4_proc_layoutget(struct nfs4_layoutget *lgp, gfp_t gfp_flags) lgp->res.layoutp = &lgp->args.layout; lgp->res.seq_res.sr_slot = NULL; nfs4_init_sequence(&lgp->args.seq_args, &lgp->res.seq_res, 0); + lgp->timeout = 0; task = rpc_run_task(&task_setup_data); if (IS_ERR(task)) diff --git a/include/linux/nfs_xdr.h b/include/linux/nfs_xdr.h index 52faf7e96c65..0ab65cb7d15b 100644 --- a/include/linux/nfs_xdr.h +++ b/include/linux/nfs_xdr.h @@ -250,6 +250,7 @@ struct nfs4_layoutget { struct nfs4_layoutget_res res; struct rpc_cred *cred; gfp_t gfp_flags; + long timeout; }; struct nfs4_getdeviceinfo_args {