From patchwork Mon Dec 28 17:03:44 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amir Goldstein X-Patchwork-Id: 11991585 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 50B82C433DB for ; Mon, 28 Dec 2020 17:04:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 203882245C for ; Mon, 28 Dec 2020 17:04:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727998AbgL1REf (ORCPT ); Mon, 28 Dec 2020 12:04:35 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58584 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727912AbgL1REf (ORCPT ); Mon, 28 Dec 2020 12:04:35 -0500 Received: from mail-ej1-x62a.google.com (mail-ej1-x62a.google.com [IPv6:2a00:1450:4864:20::62a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A5E38C061796 for ; Mon, 28 Dec 2020 09:03:54 -0800 (PST) Received: by mail-ej1-x62a.google.com with SMTP id g20so15015280ejb.1 for ; Mon, 28 Dec 2020 09:03:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=l4WoZOmiQTvXSP0L9i8ssXRdVpEMLGW8m4uprfI+vxQ=; b=NRKc644TWd8w1tFHY7sJzYmIAoizjODbuaMEA0i8Sc+lKwnUhFrNeHicxd/5+lhUNv lS5YzNMVBitkhnCOh8uB6MiEUv2pGYCimLFw8xSbkf1rlZO8WJ30GrR/MMlRioiI38K2 8bq87CoXLVSdzvVs7lFNEB0KMAjZvZPdeHUdFocQ1NYeEkd2fASeIWv9qHa2iV4mRFfd lakvvwn6J8VuzPG63HvX7k+hDtaoldHS0p71/BO9EC1JzARnDhAkj1brgf15SbP8I2jH XtmOT560//4LIcQOLn03iUJo6wf1E4hlc/AYFcJhMu9execB9Wq4zatv6/mbpdeDAAtY qNCQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=l4WoZOmiQTvXSP0L9i8ssXRdVpEMLGW8m4uprfI+vxQ=; b=bA9PaG0Jp3/pRD2ptyrWpKhcEhQmteDXSV2th5GbOX1GcA7jaVZ2uYOpYTsiYjWUBr x+cKgkr3jH2f/nt38x4YSDSHPUe8/NYNZnYDnhXAS9pmaaRfVRTLm60aEuXZqiscYvJv CzJIl4Yoj6aTnl7GKRKrGKPGY+AkCh1P4EwPFDodSkm63VJXvAt6+Bk/DMzN4Kee0zJk vU+x6bZ7eqns5nRWBNc/4HbnjoYDnbyCTbxqWH2x4iQFowVWZvwh9cluRauW5KyEg6wB SOZYVf/L7L6++KrBCAu9i8r4L+QGvwFjY1UTpNhhzA4aWT+xZlGEDpTXgFRnMLm08M9Q hAJQ== X-Gm-Message-State: AOAM5302UjIGqzhvgDly1Q4qo3jEf6VSdjawrKMn6hVUTk++JA//Ygzn PM0Ka0Gk0wVev5VBxfy2QMY= X-Google-Smtp-Source: ABdhPJy0GfNKSTE4rfw61vdgtQOQgfvNn1EHLoLS09mX2aewZ/lioA9I31pEziSKnJfqdX64FCQ0ug== X-Received: by 2002:a17:906:447:: with SMTP id e7mr41891857eja.172.1609175033393; Mon, 28 Dec 2020 09:03:53 -0800 (PST) Received: from localhost.localdomain ([31.210.181.203]) by smtp.gmail.com with ESMTPSA id i15sm17417082ejj.28.2020.12.28.09.03.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Dec 2020 09:03:52 -0800 (PST) From: Amir Goldstein To: "J . Bruce Fields" , Jeff Layton Cc: linux-nfs@vger.kernel.org Subject: [PATCH 2/2] nfsd: report per-export stats Date: Mon, 28 Dec 2020 19:03:44 +0200 Message-Id: <20201228170344.22867-3-amir73il@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201228170344.22867-1-amir73il@gmail.com> References: <20201228170344.22867-1-amir73il@gmail.com> Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org Collect some nfsd stats per export in addition to the global stats. A new nfsdfs export_stats file is created. It uses the same ops as the exports file to iterate the export entries and we use the file's name to determine the reported info per export. For example: $ cat /proc/fs/nfsd/export_stats # Version 1.1 # Path Client Start-time # Stats /test localhost 92 fh_stale: 0 io_read: 9 io_write: 1 Every export entry reports the start time when stats collection started, so stats collecting scripts can know if stats where reset between samples. Signed-off-by: Amir Goldstein --- fs/nfsd/export.c | 68 ++++++++++++++++++++++++++++++++++++++++++------ fs/nfsd/export.h | 17 ++++++++++++ fs/nfsd/nfsctl.c | 3 +++ fs/nfsd/nfsfh.c | 7 +++-- fs/nfsd/vfs.c | 2 ++ 5 files changed, 87 insertions(+), 10 deletions(-) diff --git a/fs/nfsd/export.c b/fs/nfsd/export.c index 21e404e7cb68..e6f4ccdcdf82 100644 --- a/fs/nfsd/export.c +++ b/fs/nfsd/export.c @@ -331,12 +331,29 @@ static void nfsd4_fslocs_free(struct nfsd4_fs_locations *fsloc) fsloc->locations = NULL; } +static int export_stats_init(struct export_stats *stats) +{ + stats->start_time = ktime_get_seconds(); + return nfsd_percpu_counters_init(stats->counters, EXP_STATS_COUNTERS_NUM); +} + +static void export_stats_reset(struct export_stats *stats) +{ + nfsd_percpu_counters_reset(stats->counters, EXP_STATS_COUNTERS_NUM); +} + +static void export_stats_destroy(struct export_stats *stats) +{ + nfsd_percpu_counters_destroy(stats->counters, EXP_STATS_COUNTERS_NUM); +} + static void svc_export_put(struct kref *ref) { struct svc_export *exp = container_of(ref, struct svc_export, h.ref); path_put(&exp->ex_path); auth_domain_put(exp->ex_client); nfsd4_fslocs_free(&exp->ex_fslocs); + export_stats_destroy(&exp->ex_stats); kfree(exp->ex_uuid); kfree_rcu(exp, ex_rcu); } @@ -686,22 +703,47 @@ static void exp_flags(struct seq_file *m, int flag, int fsid, kuid_t anonu, kgid_t anong, struct nfsd4_fs_locations *fslocs); static void show_secinfo(struct seq_file *m, struct svc_export *exp); +static int is_export_stats_file(struct seq_file *m) +{ + /* + * The export_stats file uses the same ops as the exports file. + * We use the file's name to determine the reported info per export. + * There is no rename in nsfdfs, so d_name.name is stable. + */ + return !strcmp(m->file->f_path.dentry->d_name.name, "export_stats"); +} + static int svc_export_show(struct seq_file *m, struct cache_detail *cd, struct cache_head *h) { - struct svc_export *exp ; + struct svc_export *exp; + bool export_stats = is_export_stats_file(m); - if (h ==NULL) { - seq_puts(m, "#path domain(flags)\n"); + if (h == NULL) { + if (export_stats) + seq_puts(m, "#path domain start-time\n#\tstats\n"); + else + seq_puts(m, "#path domain(flags)\n"); return 0; } exp = container_of(h, struct svc_export, h); seq_path(m, &exp->ex_path, " \t\n\\"); seq_putc(m, '\t'); seq_escape(m, exp->ex_client->name, " \t\n\\"); + if (export_stats) { + seq_printf(m, "\t%lld\n", exp->ex_stats.start_time); + seq_printf(m, "\tfh_stale: %lld\n", + percpu_counter_sum_positive(&exp->ex_stats.fh_stale)); + seq_printf(m, "\tio_read: %lld\n", + percpu_counter_sum_positive(&exp->ex_stats.io_read)); + seq_printf(m, "\tio_write: %lld\n", + percpu_counter_sum_positive(&exp->ex_stats.io_write)); + seq_putc(m, '\n'); + return 0; + } seq_putc(m, '('); - if (test_bit(CACHE_VALID, &h->flags) && + if (test_bit(CACHE_VALID, &h->flags) && !test_bit(CACHE_NEGATIVE, &h->flags)) { exp_flags(m, exp->ex_flags, exp->ex_fsid, exp->ex_anon_uid, exp->ex_anon_gid, &exp->ex_fslocs); @@ -742,6 +784,7 @@ static void svc_export_init(struct cache_head *cnew, struct cache_head *citem) new->ex_layout_types = 0; new->ex_uuid = NULL; new->cd = item->cd; + export_stats_reset(&new->ex_stats); } static void export_update(struct cache_head *cnew, struct cache_head *citem) @@ -774,10 +817,15 @@ static void export_update(struct cache_head *cnew, struct cache_head *citem) static struct cache_head *svc_export_alloc(void) { struct svc_export *i = kmalloc(sizeof(*i), GFP_KERNEL); - if (i) - return &i->h; - else + if (!i) + return NULL; + + if (export_stats_init(&i->ex_stats)) { + kfree(i); return NULL; + } + + return &i->h; } static const struct cache_detail svc_export_cache_template = { @@ -1239,10 +1287,14 @@ static int e_show(struct seq_file *m, void *p) struct cache_head *cp = p; struct svc_export *exp = container_of(cp, struct svc_export, h); struct cache_detail *cd = m->private; + bool export_stats = is_export_stats_file(m); if (p == SEQ_START_TOKEN) { seq_puts(m, "# Version 1.1\n"); - seq_puts(m, "# Path Client(Flags) # IPs\n"); + if (export_stats) + seq_puts(m, "# Path Client Start-time\n#\tStats\n"); + else + seq_puts(m, "# Path Client(Flags) # IPs\n"); return 0; } diff --git a/fs/nfsd/export.h b/fs/nfsd/export.h index e7daa1f246f0..bbd419fa1fc8 100644 --- a/fs/nfsd/export.h +++ b/fs/nfsd/export.h @@ -6,6 +6,7 @@ #define NFSD_EXPORT_H #include +#include #include #include @@ -46,6 +47,21 @@ struct exp_flavor_info { u32 flags; }; +/* Per-export stats */ +struct export_stats { + time64_t start_time; + /* Reference to below counters as array for init/destroy */ + struct percpu_counter counters[0]; + struct percpu_counter fh_stale; /* FH stale error */ + struct percpu_counter io_read; /* bytes returned to read requests */ + struct percpu_counter io_write; /* bytes passed in write requests */ + /* End of array of couters */ + struct percpu_counter counters_end[0]; +#define EXP_STATS_COUNTERS_NUM \ + ((offsetof(struct export_stats, counters_end) - \ + offsetof(struct export_stats, counters)) / sizeof(struct percpu_counter)) +}; + struct svc_export { struct cache_head h; struct auth_domain * ex_client; @@ -62,6 +78,7 @@ struct svc_export { struct nfsd4_deviceid_map *ex_devid_map; struct cache_detail *cd; struct rcu_head ex_rcu; + struct export_stats ex_stats; }; /* an "export key" (expkey) maps a filehandlefragement to an diff --git a/fs/nfsd/nfsctl.c b/fs/nfsd/nfsctl.c index 258605ee49b8..4f6e514192bd 100644 --- a/fs/nfsd/nfsctl.c +++ b/fs/nfsd/nfsctl.c @@ -32,6 +32,7 @@ enum { NFSD_Root = 1, NFSD_List, + NFSD_Export_Stats, NFSD_Export_features, NFSD_Fh, NFSD_FO_UnlockIP, @@ -1348,6 +1349,8 @@ static int nfsd_fill_super(struct super_block *sb, struct fs_context *fc) static const struct tree_descr nfsd_files[] = { [NFSD_List] = {"exports", &exports_nfsd_operations, S_IRUGO}, + /* Per-export io stats use same ops as exports file */ + [NFSD_Export_Stats] = {"export_stats", &exports_nfsd_operations, S_IRUGO}, [NFSD_Export_features] = {"export_features", &export_features_operations, S_IRUGO}, [NFSD_FO_UnlockIP] = {"unlock_ip", diff --git a/fs/nfsd/nfsfh.c b/fs/nfsd/nfsfh.c index 1879758bbaa5..4b49e8f630b6 100644 --- a/fs/nfsd/nfsfh.c +++ b/fs/nfsd/nfsfh.c @@ -327,7 +327,7 @@ static __be32 nfsd_set_fh_dentry(struct svc_rqst *rqstp, struct svc_fh *fhp) __be32 fh_verify(struct svc_rqst *rqstp, struct svc_fh *fhp, umode_t type, int access) { - struct svc_export *exp; + struct svc_export *exp = NULL; struct dentry *dentry; __be32 error; @@ -399,8 +399,11 @@ fh_verify(struct svc_rqst *rqstp, struct svc_fh *fhp, umode_t type, int access) access, ntohl(error)); } out: - if (error == nfserr_stale) + if (error == nfserr_stale) { percpu_counter_inc(&nfsdstats.fh_stale); + if (exp) + percpu_counter_inc(&exp->ex_stats.fh_stale); + } return error; } diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c index 6adb7aba2575..456874060e78 100644 --- a/fs/nfsd/vfs.c +++ b/fs/nfsd/vfs.c @@ -890,6 +890,7 @@ static __be32 nfsd_finish_read(struct svc_rqst *rqstp, struct svc_fh *fhp, { if (host_err >= 0) { percpu_counter_add(&nfsdstats.io_read, host_err); + percpu_counter_add(&fhp->fh_export->ex_stats.io_read, host_err); *eof = nfsd_eof_on_read(file, offset, host_err, *count); *count = host_err; fsnotify_access(file); @@ -1032,6 +1033,7 @@ nfsd_vfs_write(struct svc_rqst *rqstp, struct svc_fh *fhp, struct nfsd_file *nf, } *cnt = host_err; percpu_counter_add(&nfsdstats.io_write, *cnt); + percpu_counter_add(&exp->ex_stats.io_write, *cnt); fsnotify_modify(file); if (stable && use_wgather) {