Commit ba1ddcb6 authored by Steven Whitehouse's avatar Steven Whitehouse

GFS2: Cache last hash bucket for glock seq_files

For the glocks and glstats seq_files, which are exposed via debugfs
we should cache the most recent hash bucket, along with the offset
into that bucket. This allows us to restart from that point, rather
than having to begin at the beginning each time.

This is an idea from Eric Dumazet, however I've slightly extended it
so that if the position from which we are due to start is at any
point beyond the last cached point, we start from the last cached
point, plus whatever is the appropriate offset. I don't really expect
people to be lseeking around these files, but if they did so with only
positive offsets, then we'd still get some of the benefit of using a
cached offset.

With my simple test of around 200k entries in the file, I'm seeing
an approx 10x speed up.

Cc: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: default avatarSteven Whitehouse <swhiteho@redhat.com>
parent df5d2f55
...@@ -46,10 +46,12 @@ ...@@ -46,10 +46,12 @@
#include "trace_gfs2.h" #include "trace_gfs2.h"
struct gfs2_glock_iter { struct gfs2_glock_iter {
int hash; /* hash bucket index */ int hash; /* hash bucket index */
struct gfs2_sbd *sdp; /* incore superblock */ unsigned nhash; /* Index within current bucket */
struct gfs2_glock *gl; /* current glock struct */ struct gfs2_sbd *sdp; /* incore superblock */
char string[512]; /* scratch space */ struct gfs2_glock *gl; /* current glock struct */
loff_t last_pos; /* last position */
char string[512]; /* scratch space */
}; };
typedef void (*glock_examiner) (struct gfs2_glock * gl); typedef void (*glock_examiner) (struct gfs2_glock * gl);
...@@ -950,7 +952,7 @@ void gfs2_print_dbg(struct seq_file *seq, const char *fmt, ...) ...@@ -950,7 +952,7 @@ void gfs2_print_dbg(struct seq_file *seq, const char *fmt, ...)
if (seq) { if (seq) {
struct gfs2_glock_iter *gi = seq->private; struct gfs2_glock_iter *gi = seq->private;
vsprintf(gi->string, fmt, args); vsprintf(gi->string, fmt, args);
seq_printf(seq, gi->string); seq_puts(seq, gi->string);
} else { } else {
vaf.fmt = fmt; vaf.fmt = fmt;
vaf.va = &args; vaf.va = &args;
...@@ -1854,8 +1856,14 @@ static int gfs2_glock_iter_next(struct gfs2_glock_iter *gi) ...@@ -1854,8 +1856,14 @@ static int gfs2_glock_iter_next(struct gfs2_glock_iter *gi)
gl = gi->gl; gl = gi->gl;
if (gl) { if (gl) {
gi->gl = glock_hash_next(gl); gi->gl = glock_hash_next(gl);
gi->nhash++;
} else { } else {
if (gi->hash >= GFS2_GL_HASH_SIZE) {
rcu_read_unlock();
return 1;
}
gi->gl = glock_hash_chain(gi->hash); gi->gl = glock_hash_chain(gi->hash);
gi->nhash = 0;
} }
while (gi->gl == NULL) { while (gi->gl == NULL) {
gi->hash++; gi->hash++;
...@@ -1864,6 +1872,7 @@ static int gfs2_glock_iter_next(struct gfs2_glock_iter *gi) ...@@ -1864,6 +1872,7 @@ static int gfs2_glock_iter_next(struct gfs2_glock_iter *gi)
return 1; return 1;
} }
gi->gl = glock_hash_chain(gi->hash); gi->gl = glock_hash_chain(gi->hash);
gi->nhash = 0;
} }
/* Skip entries for other sb and dead entries */ /* Skip entries for other sb and dead entries */
} while (gi->sdp != gi->gl->gl_sbd || atomic_read(&gi->gl->gl_ref) == 0); } while (gi->sdp != gi->gl->gl_sbd || atomic_read(&gi->gl->gl_ref) == 0);
...@@ -1876,7 +1885,12 @@ static void *gfs2_glock_seq_start(struct seq_file *seq, loff_t *pos) ...@@ -1876,7 +1885,12 @@ static void *gfs2_glock_seq_start(struct seq_file *seq, loff_t *pos)
struct gfs2_glock_iter *gi = seq->private; struct gfs2_glock_iter *gi = seq->private;
loff_t n = *pos; loff_t n = *pos;
gi->hash = 0; if (gi->last_pos <= *pos)
n = gi->nhash + (*pos - gi->last_pos);
else
gi->hash = 0;
gi->nhash = 0;
rcu_read_lock(); rcu_read_lock();
do { do {
...@@ -1884,6 +1898,7 @@ static void *gfs2_glock_seq_start(struct seq_file *seq, loff_t *pos) ...@@ -1884,6 +1898,7 @@ static void *gfs2_glock_seq_start(struct seq_file *seq, loff_t *pos)
return NULL; return NULL;
} while (n--); } while (n--);
gi->last_pos = *pos;
return gi->gl; return gi->gl;
} }
...@@ -1893,7 +1908,7 @@ static void *gfs2_glock_seq_next(struct seq_file *seq, void *iter_ptr, ...@@ -1893,7 +1908,7 @@ static void *gfs2_glock_seq_next(struct seq_file *seq, void *iter_ptr,
struct gfs2_glock_iter *gi = seq->private; struct gfs2_glock_iter *gi = seq->private;
(*pos)++; (*pos)++;
gi->last_pos = *pos;
if (gfs2_glock_iter_next(gi)) if (gfs2_glock_iter_next(gi))
return NULL; return NULL;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment