From patchwork Thu Aug 20 11:17:04 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 7043631 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 F2168C05AC for ; Thu, 20 Aug 2015 11:17:37 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E24CA205C2 for ; Thu, 20 Aug 2015 11:17:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BB8A1205D1 for ; Thu, 20 Aug 2015 11:17:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751741AbbHTLRc (ORCPT ); Thu, 20 Aug 2015 07:17:32 -0400 Received: from mail-yk0-f181.google.com ([209.85.160.181]:35747 "EHLO mail-yk0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751761AbbHTLRb (ORCPT ); Thu, 20 Aug 2015 07:17:31 -0400 Received: by ykbi184 with SMTP id i184so33652279ykb.2 for ; Thu, 20 Aug 2015 04:17:31 -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=ca/H3frdJJpy44/gulebEP0p9m4649RuN/1ARWfnehs=; b=kqirnNWVcQH5PWMKRJ5DcrteyUgPS7PSJiKGBnssGRTq8d5z1xkYcNFHx3gyovjwbQ QEoSBaVj3yaPenam0lvSqtto6AW2s1w1T8QEFJ0FuvgmC3zLcLnCPbEnZ9R2A7bZeZxC 3U5cqFwrhRev3hRsf0VQf0fFLjjjNj1fgjmyvT7w13tFGCxdqrIZQyHJM0d5WAsCd4T+ aIHSfDv48yaqZI+chskU82L1tjWwIqHu4G7EvImM3LpH+AQJQKTCLUYGbcGMn6RFIzWc 6IRMWBzZrCJdsADAZQKdfonbw0GlRwahARxR9oL2rqyJBZrGsxXID6XB3oypzHUGTDsG F2Xg== X-Gm-Message-State: ALoCoQks9JsC3C8HGx3G2tBBR4xmjKJ+33Do6zkfrOUIvKO+d7lEZa2SJECkqIL8+fAFcgLoumva X-Received: by 10.13.250.198 with SMTP id k189mr2575166ywf.46.1440069451063; Thu, 20 Aug 2015 04:17:31 -0700 (PDT) Received: from tlielax.poochiereds.net (cpe-45-37-211-243.nc.res.rr.com. [45.37.211.243]) by smtp.googlemail.com with ESMTPSA id k66sm3637319ywe.0.2015.08.20.04.17.30 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 20 Aug 2015 04:17:30 -0700 (PDT) From: Jeff Layton X-Google-Original-From: Jeff Layton To: bfields@fieldses.org Cc: linux-nfs@vger.kernel.org, hch@lst.de, kinglongmee@gmail.com Subject: [PATCH v3 04/20] nfsd: add a LRU list for nfsd_files Date: Thu, 20 Aug 2015 07:17:04 -0400 Message-Id: <1440069440-27454-5-git-send-email-jeff.layton@primarydata.com> X-Mailer: git-send-email 2.4.3 In-Reply-To: <1440069440-27454-1-git-send-email-jeff.layton@primarydata.com> References: <1440069440-27454-1-git-send-email-jeff.layton@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=-7.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, 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 Signed-off-by: Jeff Layton --- fs/nfsd/filecache.c | 41 +++++++++++++++++++++++++++++------------ fs/nfsd/filecache.h | 2 +- 2 files changed, 30 insertions(+), 13 deletions(-) diff --git a/fs/nfsd/filecache.c b/fs/nfsd/filecache.c index 5bb56fa9002f..63b24419c674 100644 --- a/fs/nfsd/filecache.c +++ b/fs/nfsd/filecache.c @@ -9,6 +9,7 @@ #include #include #include +#include #include "vfs.h" #include "nfsd.h" @@ -30,6 +31,7 @@ struct nfsd_fcache_bucket { }; static struct nfsd_fcache_bucket *nfsd_file_hashtbl; +static struct list_lru nfsd_file_lru; static struct nfsd_file * nfsd_file_alloc(struct inode *inode, unsigned int may, unsigned int hashval) @@ -40,7 +42,7 @@ nfsd_file_alloc(struct inode *inode, unsigned int may, unsigned int hashval) nf = kzalloc(sizeof(*nf), GFP_KERNEL); if (nf) { INIT_HLIST_NODE(&nf->nf_node); - INIT_LIST_HEAD(&nf->nf_dispose); + INIT_LIST_HEAD(&nf->nf_lru); nf->nf_inode = inode; nf->nf_hashval = hashval; atomic_set(&nf->nf_ref, 1); @@ -65,6 +67,7 @@ nfsd_file_unhash(struct nfsd_file *nf) if (test_bit(NFSD_FILE_HASHED, &nf->nf_flags)) { clear_bit(NFSD_FILE_HASHED, &nf->nf_flags); hlist_del_rcu(&nf->nf_node); + list_lru_del(&nfsd_file_lru, &nf->nf_lru); return true; } return false; @@ -80,12 +83,14 @@ nfsd_file_unhash_and_release_locked(struct nfsd_file *nf, struct list_head *disp if (!atomic_dec_and_test(&nf->nf_ref)) return; - list_add(&nf->nf_dispose, dispose); + list_add(&nf->nf_lru, dispose); } void nfsd_file_put(struct nfsd_file *nf) { + list_lru_rotate(&nfsd_file_lru, &nf->nf_lru); + if (!atomic_dec_and_test(&nf->nf_ref)) return; @@ -107,8 +112,8 @@ nfsd_file_dispose_list(struct list_head *dispose) struct nfsd_file *nf; while(!list_empty(dispose)) { - nf = list_first_entry(dispose, struct nfsd_file, nf_dispose); - list_del(&nf->nf_dispose); + nf = list_first_entry(dispose, struct nfsd_file, nf_lru); + list_del(&nf->nf_lru); nfsd_file_put_final(nf); } } @@ -116,25 +121,35 @@ nfsd_file_dispose_list(struct list_head *dispose) int nfsd_file_cache_init(void) { - unsigned int i; + int ret = -ENOMEM; + unsigned int i; if (nfsd_file_hashtbl) return 0; nfsd_file_hashtbl = kcalloc(NFSD_FILE_HASH_SIZE, sizeof(*nfsd_file_hashtbl), GFP_KERNEL); - if (!nfsd_file_hashtbl) - goto out_nomem; + if (!nfsd_file_hashtbl) { + pr_err("nfsd: unable to allocate nfsd_file_hashtbl\n"); + goto out_err; + } + + ret = list_lru_init(&nfsd_file_lru); + if (ret) { + pr_err("nfsd: failed to init nfsd_file_lru: %d\n", ret); + goto out_err; + } for (i = 0; i < NFSD_FILE_HASH_SIZE; i++) { INIT_HLIST_HEAD(&nfsd_file_hashtbl[i].nfb_head); spin_lock_init(&nfsd_file_hashtbl[i].nfb_lock); } - - return 0; -out_nomem: - printk(KERN_ERR "nfsd: failed to init nfsd file cache\n"); - return -ENOMEM; +out: + return ret; +out_err: + kfree(nfsd_file_hashtbl); + nfsd_file_hashtbl = NULL; + goto out; } void @@ -154,6 +169,7 @@ nfsd_file_cache_shutdown(void) spin_unlock(&nfsd_file_hashtbl[i].nfb_lock); nfsd_file_dispose_list(&dispose); } + list_lru_destroy(&nfsd_file_lru); kfree(nfsd_file_hashtbl); nfsd_file_hashtbl = NULL; } @@ -219,6 +235,7 @@ retry: atomic_inc(&new->nf_ref); __set_bit(NFSD_FILE_HASHED, &new->nf_flags); __set_bit(NFSD_FILE_PENDING, &new->nf_flags); + list_lru_add(&nfsd_file_lru, &new->nf_lru); hlist_add_head_rcu(&new->nf_node, &nfsd_file_hashtbl[hashval].nfb_head); spin_unlock(&nfsd_file_hashtbl[hashval].nfb_lock); diff --git a/fs/nfsd/filecache.h b/fs/nfsd/filecache.h index b0f500353ed4..e7da463446dd 100644 --- a/fs/nfsd/filecache.h +++ b/fs/nfsd/filecache.h @@ -8,7 +8,7 @@ */ struct nfsd_file { struct hlist_node nf_node; - struct list_head nf_dispose; + struct list_head nf_lru; struct rcu_head nf_rcu; struct file *nf_file; #define NFSD_FILE_HASHED (0)