From patchwork Mon Mar 9 20:05:03 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 5970831 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 7E745BF440 for ; Mon, 9 Mar 2015 20:05:16 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9D0562044B for ; Mon, 9 Mar 2015 20:05:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 80CF02044C for ; Mon, 9 Mar 2015 20:05:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752199AbbCIUFN (ORCPT ); Mon, 9 Mar 2015 16:05:13 -0400 Received: from mail-qc0-f174.google.com ([209.85.216.174]:39738 "EHLO mail-qc0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752449AbbCIUFL (ORCPT ); Mon, 9 Mar 2015 16:05:11 -0400 Received: by qcvs11 with SMTP id s11so35743331qcv.6 for ; Mon, 09 Mar 2015 13:05:10 -0700 (PDT) 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:in-reply-to :references; bh=Tl87UbvdH5f1WaO6slcPQKPH302bvSxH2VRaHBuWwik=; b=YPNl1Zc/rsicuGaGfW7gyiKUel8R8FO61ES/Hx2lHaCyn/FuzQIUaa/4mzP9j0NA4p s28E44zF6W6s9axju+nq1w6pdOMY2G+Ozr4ghBmE3VNZNpxLoz5Q4Bo8EPiRLl+2uyIi fTTpF36l+yZn0+2cdpFpNmabUwfUelOywD7HfFnZ75hZDpWQJFicDq/zwpTW8ZlVQQ1t +GrYurDTHDfajiOBW1Kfwf2IJXVcjL83UDxVNzeIRlNpUwemWs+4nViX/sjl18phPeXL MyDVUx4DjK5OD15Ih8oqyclC/6f3ZrCcV9u3b4oTmxTRIfhH93ICHgzTvCiXqFOD+kud kCeQ== X-Gm-Message-State: ALoCoQnpJgQzjgJohh2TUanW6EC44H994x01SC9Ls3VZW/wVYsswcYP58c8XykmSIVr2rwgHge6q X-Received: by 10.140.151.72 with SMTP id 69mr13180862qhx.68.1425931510862; Mon, 09 Mar 2015 13:05:10 -0700 (PDT) Received: from leira.trondhjem.org.localdomain (50-124-49-252.drr02.mskg.mi.frontiernet.net. [50.124.49.252]) by mx.google.com with ESMTPSA id z78sm318065qkg.44.2015.03.09.13.05.09 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 09 Mar 2015 13:05:10 -0700 (PDT) From: Trond Myklebust To: Tigran Mkrtchyan Cc: linux-nfs@vger.kernel.org Subject: [PATCH 4/4] NFSv4.1: Don't cache deviceids that have no notifications Date: Mon, 9 Mar 2015 16:05:03 -0400 Message-Id: <1425931503-37261-5-git-send-email-trond.myklebust@primarydata.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1425931503-37261-4-git-send-email-trond.myklebust@primarydata.com> References: <1425931503-37261-1-git-send-email-trond.myklebust@primarydata.com> <1425931503-37261-2-git-send-email-trond.myklebust@primarydata.com> <1425931503-37261-3-git-send-email-trond.myklebust@primarydata.com> <1425931503-37261-4-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-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, 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 The spec says that once all layouts that reference a given deviceid have been returned, then we are only allowed to continue to cache the deviceid if the metadata server supports notifications. Signed-off-by: Trond Myklebust --- fs/nfs/nfs4proc.c | 2 ++ fs/nfs/pnfs.h | 2 ++ fs/nfs/pnfs_dev.c | 9 +++++++++ 3 files changed, 13 insertions(+) diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index ba8b2b5e98a1..9ff8c63c9cac 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -7962,6 +7962,8 @@ _nfs4_proc_getdeviceinfo(struct nfs_server *server, status = nfs4_call_sync(server->client, server, &msg, &args.seq_args, &res.seq_res, 0); if (res.notification & ~args.notify_types) dprintk("%s: unsupported notification\n", __func__); + if (res.notification != args.notify_types) + pdev->nocache = 1; dprintk("<-- %s status=%d\n", __func__, status); diff --git a/fs/nfs/pnfs.h b/fs/nfs/pnfs.h index a1fc16c971a7..b5654e8da936 100644 --- a/fs/nfs/pnfs.h +++ b/fs/nfs/pnfs.h @@ -203,6 +203,7 @@ struct pnfs_device { struct page **pages; unsigned int pgbase; unsigned int pglen; /* reply buffer length */ + unsigned char nocache : 1;/* May not be cached */ }; #define NFS4_PNFS_GETDEVLIST_MAXNUM 16 @@ -291,6 +292,7 @@ void pnfs_error_mark_layout_for_return(struct inode *inode, enum { NFS_DEVICEID_INVALID = 0, /* set when MDS clientid recalled */ NFS_DEVICEID_UNAVAILABLE, /* device temporarily unavailable */ + NFS_DEVICEID_NOCACHE, /* device may not be cached */ }; /* pnfs_dev.c */ diff --git a/fs/nfs/pnfs_dev.c b/fs/nfs/pnfs_dev.c index 7e07f4ba4822..2961fcd7a2df 100644 --- a/fs/nfs/pnfs_dev.c +++ b/fs/nfs/pnfs_dev.c @@ -149,6 +149,8 @@ nfs4_get_device_info(struct nfs_server *server, */ d = server->pnfs_curr_ld->alloc_deviceid_node(server, pdev, gfp_flags); + if (d && pdev->nocache) + set_bit(NFS_DEVICEID_NOCACHE, &d->flags); out_free_pages: for (i = 0; i < max_pages; i++) @@ -235,6 +237,7 @@ nfs4_delete_deviceid(const struct pnfs_layoutdriver_type *ld, return; } hlist_del_init_rcu(&d->node); + clear_bit(NFS_DEVICEID_NOCACHE, &d->flags); spin_unlock(&nfs4_deviceid_lock); /* balance the initial ref set in pnfs_insert_deviceid */ @@ -269,6 +272,11 @@ EXPORT_SYMBOL_GPL(nfs4_init_deviceid_node); bool nfs4_put_deviceid_node(struct nfs4_deviceid_node *d) { + if (test_bit(NFS_DEVICEID_NOCACHE, &d->flags)) { + if (atomic_add_unless(&d->ref, -1, 2)) + return false; + nfs4_delete_deviceid(d->ld, d->nfs_client, &d->deviceid); + } if (!atomic_dec_and_test(&d->ref)) return false; d->ld->free_deviceid_node(d); @@ -312,6 +320,7 @@ _deviceid_purge_client(const struct nfs_client *clp, long hash) if (d->nfs_client == clp && atomic_read(&d->ref)) { hlist_del_init_rcu(&d->node); hlist_add_head(&d->tmpnode, &tmp); + clear_bit(NFS_DEVICEID_NOCACHE, &d->flags); } rcu_read_unlock(); spin_unlock(&nfs4_deviceid_lock);