From patchwork Thu Feb 21 18:28:38 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 2172671 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 7FB77DF215 for ; Thu, 21 Feb 2013 18:28:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756966Ab3BUS2v (ORCPT ); Thu, 21 Feb 2013 13:28:51 -0500 Received: from mail-qc0-f170.google.com ([209.85.216.170]:55717 "EHLO mail-qc0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756211Ab3BUS2u (ORCPT ); Thu, 21 Feb 2013 13:28:50 -0500 Received: by mail-qc0-f170.google.com with SMTP id d42so3762883qca.15 for ; Thu, 21 Feb 2013 10:28:49 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:sender:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references:x-gm-message-state; bh=KTZq+/zZZK/xmpgNg0SedNpCZLizPhorj3zmZmQ9TvM=; b=gRbSjaBAZqCFcYV3urIdgntOAoorJ+eBww8e+wyLhNkIaL/b1LWSFxOB0nicakkWXF jbyWWmonMOvX0uc58vG/NxwNKNy+8L6iSYvySomcrmetIaPVlB636zpePFRAOlZG6ZFs uMGDtiE+Ppj2bg0dho2LaPLXeZTZJVklgOINNjJeOKHr+nCXAWNN5iRL0lFReX0ynaZ8 RSPTsZIJZEzORvACzhwKKcvMi9lgxOohI5E3wUjFhQES8pCh+gK+PNbvNxNBO+fzh5Cm xYIP1dkK8yfTcE6aM9Nhx9YKTlN7Cu/XhLXpFyMIOZkprnSLZx2GruV9DQczOkqLwh69 oHjg== X-Received: by 10.49.71.178 with SMTP id w18mr12954149qeu.11.1361471329664; Thu, 21 Feb 2013 10:28:49 -0800 (PST) Received: from salusa.poochiereds.net (cpe-107-015-113-143.nc.res.rr.com. [107.15.113.143]) by mx.google.com with ESMTPS id dt10sm34058791qab.0.2013.02.21.10.28.48 (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 21 Feb 2013 10:28:48 -0800 (PST) From: Jeff Layton To: bfields@fieldses.org Cc: linux-nfs@vger.kernel.org Subject: [PATCH v2 5/5] nfsd: keep track of the max and average time to search the cache Date: Thu, 21 Feb 2013 13:28:38 -0500 Message-Id: <1361471318-17971-6-git-send-email-jlayton@redhat.com> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: <1361471318-17971-1-git-send-email-jlayton@redhat.com> References: <1361471318-17971-1-git-send-email-jlayton@redhat.com> X-Gm-Message-State: ALoCoQm1eyzoVdvGsy77rJtnzJtjVCXmGubi/XNbnk2w7mLLz1Xj9WNheH410h9YN0EVl1k0y6hc Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org Since we're moderately concerned about the potential increase in hash chain lengths, keep a running average of the time and the max time to search. Signed-off-by: Jeff Layton --- fs/nfsd/nfscache.c | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/fs/nfsd/nfscache.c b/fs/nfsd/nfscache.c index 52493cb..ae6575d 100644 --- a/fs/nfsd/nfscache.c +++ b/fs/nfsd/nfscache.c @@ -33,6 +33,9 @@ static unsigned int max_drc_entries; /* max number of entries */ static unsigned int drc_mem_usage; /* memory used by cache */ static unsigned int csum_misses; /* cache misses due only to csum comparison failures */ +static unsigned int max_search_time; /* max time to search */ +static unsigned int avg_search_time; /* avg time to search */ + /* * Calculate the hash index from an XID. */ @@ -310,16 +313,28 @@ nfsd_cache_match(struct svc_rqst *rqstp, __wsum csum, struct svc_cacherep *rp) static struct svc_cacherep * nfsd_cache_search(struct svc_rqst *rqstp, __wsum csum) { - struct svc_cacherep *rp; + struct svc_cacherep *rp, *ret = NULL; struct hlist_node *hn; struct hlist_head *rh; + ktime_t start; + unsigned int delta; + static unsigned int nsearches = 0; + unsigned int osearches; + start = ktime_get(); rh = &cache_hash[request_hash(rqstp->rq_xid)]; hlist_for_each_entry(rp, hn, rh, c_hash) { - if (nfsd_cache_match(rqstp, csum, rp)) - return rp; + if (nfsd_cache_match(rqstp, csum, rp)) { + ret = rp; + break; + } } - return NULL; + delta = (unsigned int)ktime_to_ns(ktime_sub(ktime_get(), start)); + osearches = nsearches++; + avg_search_time = (avg_search_time * osearches + delta) / nsearches; + max_search_time = max(max_search_time, delta); + + return ret; } /* @@ -589,6 +604,8 @@ static int nfsd_reply_cache_stats_show(struct seq_file *m, void *v) seq_printf(m, "not cached: %u\n", nfsdstats.rcnocache); seq_printf(m, "checksum misses: %u\n", csum_misses); seq_printf(m, "max chain len: %u\n", nfsd_repcache_max_chain_len()); + seq_printf(m, "avg search time: %uns\n", avg_search_time); + seq_printf(m, "max search time: %uns\n", max_search_time); spin_unlock(&cache_lock); return 0; }