Commit 0d7561c6 authored by Glauber Costa's avatar Glauber Costa Committed by Pekka Enberg

sl[au]b: Process slabinfo_show in common code

With all the infrastructure in place, we can now have slabinfo_show
done from slab_common.c. A cache-specific function is called to grab
information about the cache itself, since that is still heavily
dependent on the implementation. But with the values produced by it, all
the printing and handling is done from common code.
Signed-off-by: default avatarGlauber Costa <glommer@parallels.com>
CC: Christoph Lameter <cl@linux.com>
CC: David Rientjes <rientjes@google.com>
Signed-off-by: default avatarPekka Enberg <penberg@kernel.org>
parent bcee6e2a
...@@ -4276,9 +4276,8 @@ static void cache_reap(struct work_struct *w) ...@@ -4276,9 +4276,8 @@ static void cache_reap(struct work_struct *w)
} }
#ifdef CONFIG_SLABINFO #ifdef CONFIG_SLABINFO
int slabinfo_show(struct seq_file *m, void *p) void get_slabinfo(struct kmem_cache *cachep, struct slabinfo *sinfo)
{ {
struct kmem_cache *cachep = list_entry(p, struct kmem_cache, list);
struct slab *slabp; struct slab *slabp;
unsigned long active_objs; unsigned long active_objs;
unsigned long num_objs; unsigned long num_objs;
...@@ -4333,13 +4332,20 @@ int slabinfo_show(struct seq_file *m, void *p) ...@@ -4333,13 +4332,20 @@ int slabinfo_show(struct seq_file *m, void *p)
if (error) if (error)
printk(KERN_ERR "slab: cache %s error: %s\n", name, error); printk(KERN_ERR "slab: cache %s error: %s\n", name, error);
seq_printf(m, "%-17s %6lu %6lu %6u %4u %4d", sinfo->active_objs = active_objs;
name, active_objs, num_objs, cachep->size, sinfo->num_objs = num_objs;
cachep->num, (1 << cachep->gfporder)); sinfo->active_slabs = active_slabs;
seq_printf(m, " : tunables %4u %4u %4u", sinfo->num_slabs = num_slabs;
cachep->limit, cachep->batchcount, cachep->shared); sinfo->shared_avail = shared_avail;
seq_printf(m, " : slabdata %6lu %6lu %6lu", sinfo->limit = cachep->limit;
active_slabs, num_slabs, shared_avail); sinfo->batchcount = cachep->batchcount;
sinfo->shared = cachep->shared;
sinfo->objects_per_slab = cachep->num;
sinfo->cache_order = cachep->gfporder;
}
void slabinfo_show_stats(struct seq_file *m, struct kmem_cache *cachep)
{
#if STATS #if STATS
{ /* list3 stats */ { /* list3 stats */
unsigned long high = cachep->high_mark; unsigned long high = cachep->high_mark;
...@@ -4369,8 +4375,6 @@ int slabinfo_show(struct seq_file *m, void *p) ...@@ -4369,8 +4375,6 @@ int slabinfo_show(struct seq_file *m, void *p)
allochit, allocmiss, freehit, freemiss); allochit, allocmiss, freehit, freemiss);
} }
#endif #endif
seq_putc(m, '\n');
return 0;
} }
#define MAX_SLABINFO_WRITE 128 #define MAX_SLABINFO_WRITE 128
......
...@@ -49,8 +49,22 @@ int __kmem_cache_shutdown(struct kmem_cache *); ...@@ -49,8 +49,22 @@ int __kmem_cache_shutdown(struct kmem_cache *);
struct seq_file; struct seq_file;
struct file; struct file;
int slabinfo_show(struct seq_file *m, void *p);
struct slabinfo {
unsigned long active_objs;
unsigned long num_objs;
unsigned long active_slabs;
unsigned long num_slabs;
unsigned long shared_avail;
unsigned int limit;
unsigned int batchcount;
unsigned int shared;
unsigned int objects_per_slab;
unsigned int cache_order;
};
void get_slabinfo(struct kmem_cache *s, struct slabinfo *sinfo);
void slabinfo_show_stats(struct seq_file *m, struct kmem_cache *s);
ssize_t slabinfo_write(struct file *file, const char __user *buffer, ssize_t slabinfo_write(struct file *file, const char __user *buffer,
size_t count, loff_t *ppos); size_t count, loff_t *ppos);
#endif #endif
...@@ -242,7 +242,23 @@ static void s_stop(struct seq_file *m, void *p) ...@@ -242,7 +242,23 @@ static void s_stop(struct seq_file *m, void *p)
static int s_show(struct seq_file *m, void *p) static int s_show(struct seq_file *m, void *p)
{ {
return slabinfo_show(m, p); struct kmem_cache *s = list_entry(p, struct kmem_cache, list);
struct slabinfo sinfo;
memset(&sinfo, 0, sizeof(sinfo));
get_slabinfo(s, &sinfo);
seq_printf(m, "%-17s %6lu %6lu %6u %4u %4d",
s->name, sinfo.active_objs, sinfo.num_objs, s->size,
sinfo.objects_per_slab, (1 << sinfo.cache_order));
seq_printf(m, " : tunables %4u %4u %4u",
sinfo.limit, sinfo.batchcount, sinfo.shared);
seq_printf(m, " : slabdata %6lu %6lu %6lu",
sinfo.active_slabs, sinfo.num_slabs, sinfo.shared_avail);
slabinfo_show_stats(m, s);
seq_putc(m, '\n');
return 0;
} }
/* /*
......
...@@ -5405,18 +5405,14 @@ __initcall(slab_sysfs_init); ...@@ -5405,18 +5405,14 @@ __initcall(slab_sysfs_init);
* The /proc/slabinfo ABI * The /proc/slabinfo ABI
*/ */
#ifdef CONFIG_SLABINFO #ifdef CONFIG_SLABINFO
int slabinfo_show(struct seq_file *m, void *p) void get_slabinfo(struct kmem_cache *s, struct slabinfo *sinfo)
{ {
unsigned long nr_partials = 0; unsigned long nr_partials = 0;
unsigned long nr_slabs = 0; unsigned long nr_slabs = 0;
unsigned long nr_inuse = 0;
unsigned long nr_objs = 0; unsigned long nr_objs = 0;
unsigned long nr_free = 0; unsigned long nr_free = 0;
struct kmem_cache *s;
int node; int node;
s = list_entry(p, struct kmem_cache, list);
for_each_online_node(node) { for_each_online_node(node) {
struct kmem_cache_node *n = get_node(s, node); struct kmem_cache_node *n = get_node(s, node);
...@@ -5429,16 +5425,16 @@ int slabinfo_show(struct seq_file *m, void *p) ...@@ -5429,16 +5425,16 @@ int slabinfo_show(struct seq_file *m, void *p)
nr_free += count_partial(n, count_free); nr_free += count_partial(n, count_free);
} }
nr_inuse = nr_objs - nr_free; sinfo->active_objs = nr_objs - nr_free;
sinfo->num_objs = nr_objs;
sinfo->active_slabs = nr_slabs;
sinfo->num_slabs = nr_slabs;
sinfo->objects_per_slab = oo_objects(s->oo);
sinfo->cache_order = oo_order(s->oo);
}
seq_printf(m, "%-17s %6lu %6lu %6u %4u %4d", s->name, nr_inuse, void slabinfo_show_stats(struct seq_file *m, struct kmem_cache *s)
nr_objs, s->size, oo_objects(s->oo), {
(1 << oo_order(s->oo)));
seq_printf(m, " : tunables %4u %4u %4u", 0, 0, 0);
seq_printf(m, " : slabdata %6lu %6lu %6lu", nr_slabs, nr_slabs,
0UL);
seq_putc(m, '\n');
return 0;
} }
ssize_t slabinfo_write(struct file *file, const char __user *buffer, ssize_t slabinfo_write(struct file *file, const char __user *buffer,
......
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