| Message ID | 20221028185712.79863-2-jlayton@kernel.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | nfsd: clean up refcounting in the filecache | expand |
> On Oct 28, 2022, at 2:57 PM, Jeff Layton <jlayton@kernel.org> wrote: > > We're counting mapping->nrpages, but not all of those are necessarily > dirty. We don't really have a simple way to count just the dirty pages, > so just remove this stat since it's not accurate. OK. I'll apply this one when the others are ready, so just leave it in this series when you re-post. > Signed-off-by: Jeff Layton <jlayton@kernel.org> > --- > fs/nfsd/filecache.c | 7 +------ > 1 file changed, 1 insertion(+), 6 deletions(-) > > diff --git a/fs/nfsd/filecache.c b/fs/nfsd/filecache.c > index 98c6b5f51bc8..f8ebbf7daa18 100644 > --- a/fs/nfsd/filecache.c > +++ b/fs/nfsd/filecache.c > @@ -32,7 +32,6 @@ static DEFINE_PER_CPU(unsigned long, nfsd_file_cache_hits); > static DEFINE_PER_CPU(unsigned long, nfsd_file_acquisitions); > static DEFINE_PER_CPU(unsigned long, nfsd_file_releases); > static DEFINE_PER_CPU(unsigned long, nfsd_file_total_age); > -static DEFINE_PER_CPU(unsigned long, nfsd_file_pages_flushed); > static DEFINE_PER_CPU(unsigned long, nfsd_file_evictions); > > struct nfsd_fcache_disposal { > @@ -370,7 +369,6 @@ nfsd_file_flush(struct nfsd_file *nf) > > if (!file || !(file->f_mode & FMODE_WRITE)) > return; > - this_cpu_add(nfsd_file_pages_flushed, file->f_mapping->nrpages); > if (vfs_fsync(file, 1) != 0) > nfsd_reset_write_verifier(net_generic(nf->nf_net, nfsd_net_id)); > } > @@ -998,7 +996,6 @@ nfsd_file_cache_shutdown(void) > per_cpu(nfsd_file_acquisitions, i) = 0; > per_cpu(nfsd_file_releases, i) = 0; > per_cpu(nfsd_file_total_age, i) = 0; > - per_cpu(nfsd_file_pages_flushed, i) = 0; > per_cpu(nfsd_file_evictions, i) = 0; > } > } > @@ -1212,7 +1209,7 @@ nfsd_file_create(struct svc_rqst *rqstp, struct svc_fh *fhp, > */ > int nfsd_file_cache_stats_show(struct seq_file *m, void *v) > { > - unsigned long releases = 0, pages_flushed = 0, evictions = 0; > + unsigned long releases = 0, evictions = 0; > unsigned long hits = 0, acquisitions = 0; > unsigned int i, count = 0, buckets = 0; > unsigned long lru = 0, total_age = 0; > @@ -1240,7 +1237,6 @@ int nfsd_file_cache_stats_show(struct seq_file *m, void *v) > releases += per_cpu(nfsd_file_releases, i); > total_age += per_cpu(nfsd_file_total_age, i); > evictions += per_cpu(nfsd_file_evictions, i); > - pages_flushed += per_cpu(nfsd_file_pages_flushed, i); > } > > seq_printf(m, "total entries: %u\n", count); > @@ -1254,6 +1250,5 @@ int nfsd_file_cache_stats_show(struct seq_file *m, void *v) > seq_printf(m, "mean age (ms): %ld\n", total_age / releases); > else > seq_printf(m, "mean age (ms): -\n"); > - seq_printf(m, "pages flushed: %lu\n", pages_flushed); > return 0; > } > -- > 2.37.3 > -- Chuck Lever
diff --git a/fs/nfsd/filecache.c b/fs/nfsd/filecache.c index 98c6b5f51bc8..f8ebbf7daa18 100644 --- a/fs/nfsd/filecache.c +++ b/fs/nfsd/filecache.c @@ -32,7 +32,6 @@ static DEFINE_PER_CPU(unsigned long, nfsd_file_cache_hits); static DEFINE_PER_CPU(unsigned long, nfsd_file_acquisitions); static DEFINE_PER_CPU(unsigned long, nfsd_file_releases); static DEFINE_PER_CPU(unsigned long, nfsd_file_total_age); -static DEFINE_PER_CPU(unsigned long, nfsd_file_pages_flushed); static DEFINE_PER_CPU(unsigned long, nfsd_file_evictions); struct nfsd_fcache_disposal { @@ -370,7 +369,6 @@ nfsd_file_flush(struct nfsd_file *nf) if (!file || !(file->f_mode & FMODE_WRITE)) return; - this_cpu_add(nfsd_file_pages_flushed, file->f_mapping->nrpages); if (vfs_fsync(file, 1) != 0) nfsd_reset_write_verifier(net_generic(nf->nf_net, nfsd_net_id)); } @@ -998,7 +996,6 @@ nfsd_file_cache_shutdown(void) per_cpu(nfsd_file_acquisitions, i) = 0; per_cpu(nfsd_file_releases, i) = 0; per_cpu(nfsd_file_total_age, i) = 0; - per_cpu(nfsd_file_pages_flushed, i) = 0; per_cpu(nfsd_file_evictions, i) = 0; } } @@ -1212,7 +1209,7 @@ nfsd_file_create(struct svc_rqst *rqstp, struct svc_fh *fhp, */ int nfsd_file_cache_stats_show(struct seq_file *m, void *v) { - unsigned long releases = 0, pages_flushed = 0, evictions = 0; + unsigned long releases = 0, evictions = 0; unsigned long hits = 0, acquisitions = 0; unsigned int i, count = 0, buckets = 0; unsigned long lru = 0, total_age = 0; @@ -1240,7 +1237,6 @@ int nfsd_file_cache_stats_show(struct seq_file *m, void *v) releases += per_cpu(nfsd_file_releases, i); total_age += per_cpu(nfsd_file_total_age, i); evictions += per_cpu(nfsd_file_evictions, i); - pages_flushed += per_cpu(nfsd_file_pages_flushed, i); } seq_printf(m, "total entries: %u\n", count); @@ -1254,6 +1250,5 @@ int nfsd_file_cache_stats_show(struct seq_file *m, void *v) seq_printf(m, "mean age (ms): %ld\n", total_age / releases); else seq_printf(m, "mean age (ms): -\n"); - seq_printf(m, "pages flushed: %lu\n", pages_flushed); return 0; }
We're counting mapping->nrpages, but not all of those are necessarily dirty. We don't really have a simple way to count just the dirty pages, so just remove this stat since it's not accurate. Signed-off-by: Jeff Layton <jlayton@kernel.org> --- fs/nfsd/filecache.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-)