From patchwork Thu Nov 10 21:41:10 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 9422101 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 EE57E60720 for ; Thu, 10 Nov 2016 21:41:21 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CF4282978A for ; Thu, 10 Nov 2016 21:41:21 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C422E28CA3; Thu, 10 Nov 2016 21:41:21 +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 75F942978A for ; Thu, 10 Nov 2016 21:41:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S936288AbcKJVlU (ORCPT ); Thu, 10 Nov 2016 16:41:20 -0500 Received: from mail-it0-f68.google.com ([209.85.214.68]:35471 "EHLO mail-it0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S936271AbcKJVlT (ORCPT ); Thu, 10 Nov 2016 16:41:19 -0500 Received: by mail-it0-f68.google.com with SMTP id b123so6252973itb.2 for ; Thu, 10 Nov 2016 13:41:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:subject:date:message-id:in-reply-to:references; bh=dBka4oA3+VwymRyiIc6gNst2QAi8ubqFxsY3NOWPQaM=; b=IZg3oZ9TY3bwJXwdupyk11jWtVKSmv847OJrsa7yguLno+u6Onl55Df1B+07bX3O8R pfYIxKY+xeCJlxMEyelXJd/BIlUDco5pMl29qBe4/9srQFs/jVqco/KZ8T9dW5pPI2l9 8MmWXSfbDmzQaizdkUSNqfL0WidhuopS/MOd3Zvc+/b+evspPMUuw/L+p1roUrT9b1ri 306Y0fQJZ8pLKtXqr5CT9Ide5YagRmVOGI9Ryj4ekjGEcryCvYv/VRcjo/Vc6vNMKvrs WC6oI5X+byUSqmMQX91qPKuGo+jP8O+dO536XSbsIF0fe/Kz7ROIa6DBoXA+kT09Ipf/ jnRw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references; bh=dBka4oA3+VwymRyiIc6gNst2QAi8ubqFxsY3NOWPQaM=; b=gtmVUu70bouNzJAxQ+cm5ed7silR8lmagGEEUdLlnZMeAeeuvK+CUID7SFTXCdh1O5 zgNft65hnWY/You2G2EslH+56QfpHVZ75nL2ioMeknrnSB9Iy05/eeD9SIH1i/raus64 EVFhdVEe2SbglHWlo/Is/aq2WzFXakCCgl7VRdoiUF+tiKU0qO73EuRltfwRi5Kwt1mQ ITbIvGToNyI5VxnNW/V+dC5YzCVO7q8wgqhXBp8t/8c9R99RYN3Jwn7XwwqUAFzqo4HP VmCVh8Tp9TXP24jN5L0QCLVzN1KsqekMATpTxlniybhBe6CDzn71eovFgIJzDTiDbk+d 15fw== X-Gm-Message-State: ABUngvfv6hd/H8wtNwx1KEE8SMusOnNI5bUpOzCU6Y1nrt7TKPV4VHCj7vFFXt5wFmNkIA== X-Received: by 10.107.144.134 with SMTP id s128mr8218610iod.146.1478814078265; Thu, 10 Nov 2016 13:41:18 -0800 (PST) Received: from leira.trondhjem.org.localdomain (c-68-49-162-121.hsd1.mi.comcast.net. [68.49.162.121]) by smtp.gmail.com with ESMTPSA id g185sm2714645ith.14.2016.11.10.13.41.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 10 Nov 2016 13:41:17 -0800 (PST) From: Trond Myklebust To: linux-nfs@vger.kernel.org Subject: [PATCH 5/5] NFSv4: Optimise away forced revalidation when we know the attributes are OK Date: Thu, 10 Nov 2016 16:41:10 -0500 Message-Id: <1478814070-17140-6-git-send-email-trond.myklebust@primarydata.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1478814070-17140-5-git-send-email-trond.myklebust@primarydata.com> References: <1478814070-17140-1-git-send-email-trond.myklebust@primarydata.com> <1478814070-17140-2-git-send-email-trond.myklebust@primarydata.com> <1478814070-17140-3-git-send-email-trond.myklebust@primarydata.com> <1478814070-17140-4-git-send-email-trond.myklebust@primarydata.com> <1478814070-17140-5-git-send-email-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 The NFS_INO_REVAL_FORCED flag needs to be set if we just got a delegation, and we see that there might still be some ambiguity as to whether or not our attribute or data cache are valid. In practice, this means that a call to nfs_check_inode_attributes() will have noticed a discrepancy between cached attributes and measured ones, so let's move the setting of NFS_INO_REVAL_FORCED to there. Signed-off-by: Trond Myklebust --- fs/nfs/delegation.c | 4 ---- fs/nfs/inode.c | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/fs/nfs/delegation.c b/fs/nfs/delegation.c index dff600ae0d74..d7df5e67b0c1 100644 --- a/fs/nfs/delegation.c +++ b/fs/nfs/delegation.c @@ -391,10 +391,6 @@ int nfs_inode_set_delegation(struct inode *inode, struct rpc_cred *cred, struct rcu_assign_pointer(nfsi->delegation, delegation); delegation = NULL; - /* Ensure we revalidate the attributes and page cache! */ - spin_lock(&inode->i_lock); - nfsi->cache_validity |= NFS_INO_REVAL_FORCED; - spin_unlock(&inode->i_lock); trace_nfs4_set_delegation(inode, res->delegation_type); out: diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c index bf4ec5ecc97e..3575e3408bd7 100644 --- a/fs/nfs/inode.c +++ b/fs/nfs/inode.c @@ -1317,7 +1317,7 @@ static int nfs_check_inode_attributes(struct inode *inode, struct nfs_fattr *fat invalid |= NFS_INO_INVALID_ATIME; if (invalid != 0) - nfs_set_cache_invalid(inode, invalid); + nfs_set_cache_invalid(inode, invalid | NFS_INO_REVAL_FORCED); nfsi->read_cache_jiffies = fattr->time_start; return 0;