aboutsummaryrefslogtreecommitdiffstats
path: root/fs/nfs
diff options
context:
space:
mode:
authorDavid Howells <dhowells@redhat.com>2009-04-03 11:42:43 -0400
committerDavid Howells <dhowells@redhat.com>2009-04-03 11:42:43 -0400
commit6a51091d0775cdc4a923f2172c61925ad416aa32 (patch)
tree288fafe724eee5a0c67ff4c9bd437d35d3bbb9ab /fs/nfs
parentd599064a1bca7bcbaabe54b94fa73ea86952cae3 (diff)
NFS: Add some new I/O counters for FS-Cache doing things for NFS
Add some new NFS I/O counters for FS-Cache doing things for NFS. A new line is emitted into /proc/pid/mountstats if caching is enabled that looks like: fsc: <rok> <rfl> <wok> <wfl> <unc> Where <rok> is the number of pages read successfully from the cache, <rfl> is the number of failed page reads against the cache, <wok> is the number of successful page writes to the cache, <wfl> is the number of failed page writes to the cache, and <unc> is the number of NFS pages that have been disconnected from the cache. Signed-off-by: David Howells <dhowells@redhat.com> Acked-by: Steve Dickson <steved@redhat.com> Acked-by: Trond Myklebust <Trond.Myklebust@netapp.com> Acked-by: Al Viro <viro@zeniv.linux.org.uk> Tested-by: Daire Byrne <Daire.Byrne@framestore.com>
Diffstat (limited to 'fs/nfs')
-rw-r--r--fs/nfs/iostat.h18
-rw-r--r--fs/nfs/super.c11
2 files changed, 29 insertions, 0 deletions
diff --git a/fs/nfs/iostat.h b/fs/nfs/iostat.h
index a36952810032..a2ab2529b5ca 100644
--- a/fs/nfs/iostat.h
+++ b/fs/nfs/iostat.h
@@ -16,6 +16,9 @@
16 16
17struct nfs_iostats { 17struct nfs_iostats {
18 unsigned long long bytes[__NFSIOS_BYTESMAX]; 18 unsigned long long bytes[__NFSIOS_BYTESMAX];
19#ifdef CONFIG_NFS_FSCACHE
20 unsigned long long fscache[__NFSIOS_FSCACHEMAX];
21#endif
19 unsigned long events[__NFSIOS_COUNTSMAX]; 22 unsigned long events[__NFSIOS_COUNTSMAX];
20} ____cacheline_aligned; 23} ____cacheline_aligned;
21 24
@@ -57,6 +60,21 @@ static inline void nfs_add_stats(const struct inode *inode,
57 nfs_add_server_stats(NFS_SERVER(inode), stat, addend); 60 nfs_add_server_stats(NFS_SERVER(inode), stat, addend);
58} 61}
59 62
63#ifdef CONFIG_NFS_FSCACHE
64static inline void nfs_add_fscache_stats(struct inode *inode,
65 enum nfs_stat_fscachecounters stat,
66 unsigned long addend)
67{
68 struct nfs_iostats *iostats;
69 int cpu;
70
71 cpu = get_cpu();
72 iostats = per_cpu_ptr(NFS_SERVER(inode)->io_stats, cpu);
73 iostats->fscache[stat] += addend;
74 put_cpu_no_resched();
75}
76#endif
77
60static inline struct nfs_iostats *nfs_alloc_iostats(void) 78static inline struct nfs_iostats *nfs_alloc_iostats(void)
61{ 79{
62 return alloc_percpu(struct nfs_iostats); 80 return alloc_percpu(struct nfs_iostats);
diff --git a/fs/nfs/super.c b/fs/nfs/super.c
index 87f65ae07f32..b5fea776a0dc 100644
--- a/fs/nfs/super.c
+++ b/fs/nfs/super.c
@@ -642,6 +642,10 @@ static int nfs_show_stats(struct seq_file *m, struct vfsmount *mnt)
642 totals.events[i] += stats->events[i]; 642 totals.events[i] += stats->events[i];
643 for (i = 0; i < __NFSIOS_BYTESMAX; i++) 643 for (i = 0; i < __NFSIOS_BYTESMAX; i++)
644 totals.bytes[i] += stats->bytes[i]; 644 totals.bytes[i] += stats->bytes[i];
645#ifdef CONFIG_NFS_FSCACHE
646 for (i = 0; i < __NFSIOS_FSCACHEMAX; i++)
647 totals.fscache[i] += stats->fscache[i];
648#endif
645 649
646 preempt_enable(); 650 preempt_enable();
647 } 651 }
@@ -652,6 +656,13 @@ static int nfs_show_stats(struct seq_file *m, struct vfsmount *mnt)
652 seq_printf(m, "\n\tbytes:\t"); 656 seq_printf(m, "\n\tbytes:\t");
653 for (i = 0; i < __NFSIOS_BYTESMAX; i++) 657 for (i = 0; i < __NFSIOS_BYTESMAX; i++)
654 seq_printf(m, "%Lu ", totals.bytes[i]); 658 seq_printf(m, "%Lu ", totals.bytes[i]);
659#ifdef CONFIG_NFS_FSCACHE
660 if (nfss->options & NFS_OPTION_FSCACHE) {
661 seq_printf(m, "\n\tfsc:\t");
662 for (i = 0; i < __NFSIOS_FSCACHEMAX; i++)
663 seq_printf(m, "%Lu ", totals.bytes[i]);
664 }
665#endif
655 seq_printf(m, "\n"); 666 seq_printf(m, "\n");
656 667
657 rpc_print_iostats(m, nfss->client); 668 rpc_print_iostats(m, nfss->client);