Skip to content

L
linux
Commit 9c0ad59e authored by Konrad Rzeszutek Wilk's avatar Konrad Rzeszutek Wilk Committed by Greg Kroah-Hartman
Browse files
Options

zcache/debug: Use an array to initialize/use debugfs attributes. 

It makes it neater and also allows us to piggyback on that
in the zcache_dump function.
Acked-by: default avatarDan Magenheimer <dan.magenheimer@oracle.com>
Signed-off-by: default avatarKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 95bdaee2
Hide whitespace changes
Inline Side-by-side
Showing with 51 additions and 112 deletions
drivers/staging/zcache/debug.c
View file @ 9c0ad59e
......@@ -3,130 +3,69 @@
#ifdef CONFIG_DEBUG_FS
#include <linux/debugfs.h>
#define zdfs debugfs_create_size_t
#define zdfs64 debugfs_create_u64
#define ATTR(x) { .name = #x, .val = &zcache_##x, }
static struct debug_entry {
const char *name;
ssize_t *val;
} attrs[] = {
ATTR(obj_count), ATTR(obj_count_max),
ATTR(objnode_count), ATTR(objnode_count_max),
ATTR(flush_total), ATTR(flush_found),
ATTR(flobj_total), ATTR(flobj_found),
ATTR(failed_eph_puts), ATTR(failed_pers_puts),
ATTR(failed_getfreepages), ATTR(failed_alloc),
ATTR(put_to_flush),
ATTR(compress_poor), ATTR(mean_compress_poor),
ATTR(eph_ate_tail), ATTR(eph_ate_tail_failed),
ATTR(pers_ate_eph), ATTR(pers_ate_eph_failed),
ATTR(evicted_eph_zpages), ATTR(evicted_eph_pageframes),
ATTR(eph_pageframes), ATTR(eph_pageframes_max),
ATTR(eph_zpages), ATTR(eph_zpages_max),
ATTR(pers_zpages), ATTR(pers_zpages_max),
ATTR(last_active_file_pageframes),
ATTR(last_inactive_file_pageframes),
ATTR(last_active_anon_pageframes),
ATTR(last_inactive_anon_pageframes),
ATTR(eph_nonactive_puts_ignored),
ATTR(pers_nonactive_puts_ignored),
#ifdef CONFIG_ZCACHE_WRITEBACK
ATTR(zcache_outstanding_writeback_pages),
ATTR(zcache_writtenback_pages),
#endif
};
#undef ATTR
int zcache_debugfs_init(void)
{
unsigned int i;
struct dentry *root = debugfs_create_dir("zcache", NULL);
if (root == NULL)
return -ENXIO;
zdfs("obj_count", S_IRUGO, root, &zcache_obj_count);
zdfs("obj_count_max", S_IRUGO, root, &zcache_obj_count_max);
zdfs("objnode_count", S_IRUGO, root, &zcache_objnode_count);
zdfs("objnode_count_max", S_IRUGO, root, &zcache_objnode_count_max);
zdfs("flush_total", S_IRUGO, root, &zcache_flush_total);
zdfs("flush_found", S_IRUGO, root, &zcache_flush_found);
zdfs("flobj_total", S_IRUGO, root, &zcache_flobj_total);
zdfs("flobj_found", S_IRUGO, root, &zcache_flobj_found);
zdfs("failed_eph_puts", S_IRUGO, root, &zcache_failed_eph_puts);
zdfs("failed_pers_puts", S_IRUGO, root, &zcache_failed_pers_puts);
zdfs("failed_get_free_pages", S_IRUGO, root,
&zcache_failed_getfreepages);
zdfs("failed_alloc", S_IRUGO, root, &zcache_failed_alloc);
zdfs("put_to_flush", S_IRUGO, root, &zcache_put_to_flush);
zdfs("compress_poor", S_IRUGO, root, &zcache_compress_poor);
zdfs("mean_compress_poor", S_IRUGO, root, &zcache_mean_compress_poor);
zdfs("eph_ate_tail", S_IRUGO, root, &zcache_eph_ate_tail);
zdfs("eph_ate_tail_failed", S_IRUGO, root, &zcache_eph_ate_tail_failed);
zdfs("pers_ate_eph", S_IRUGO, root, &zcache_pers_ate_eph);
zdfs("pers_ate_eph_failed", S_IRUGO, root, &zcache_pers_ate_eph_failed);
zdfs("evicted_eph_zpages", S_IRUGO, root, &zcache_evicted_eph_zpages);
zdfs("evicted_eph_pageframes", S_IRUGO, root,
&zcache_evicted_eph_pageframes);
zdfs("eph_pageframes", S_IRUGO, root, &zcache_eph_pageframes);
zdfs("eph_pageframes_max", S_IRUGO, root, &zcache_eph_pageframes_max);
zdfs("pers_pageframes", S_IRUGO, root, &zcache_pers_pageframes);
zdfs("pers_pageframes_max", S_IRUGO, root, &zcache_pers_pageframes_max);
zdfs("eph_zpages", S_IRUGO, root, &zcache_eph_zpages);
zdfs("eph_zpages_max", S_IRUGO, root, &zcache_eph_zpages_max);
zdfs("pers_zpages", S_IRUGO, root, &zcache_pers_zpages);
zdfs("pers_zpages_max", S_IRUGO, root, &zcache_pers_zpages_max);
zdfs("last_active_file_pageframes", S_IRUGO, root,
&zcache_last_active_file_pageframes);
zdfs("last_inactive_file_pageframes", S_IRUGO, root,
&zcache_last_inactive_file_pageframes);
zdfs("last_active_anon_pageframes", S_IRUGO, root,
&zcache_last_active_anon_pageframes);
zdfs("last_inactive_anon_pageframes", S_IRUGO, root,
&zcache_last_inactive_anon_pageframes);
zdfs("eph_nonactive_puts_ignored", S_IRUGO, root,
&zcache_eph_nonactive_puts_ignored);
zdfs("pers_nonactive_puts_ignored", S_IRUGO, root,
&zcache_pers_nonactive_puts_ignored);
zdfs64("eph_zbytes", S_IRUGO, root, &zcache_eph_zbytes);
zdfs64("eph_zbytes_max", S_IRUGO, root, &zcache_eph_zbytes_max);
zdfs64("pers_zbytes", S_IRUGO, root, &zcache_pers_zbytes);
zdfs64("pers_zbytes_max", S_IRUGO, root, &zcache_pers_zbytes_max);
zdfs("outstanding_writeback_pages", S_IRUGO, root,
&zcache_outstanding_writeback_pages);
zdfs("writtenback_pages", S_IRUGO, root, &zcache_writtenback_pages);
for (i = 0; i < ARRAY_SIZE(attrs); i++)
if (!debugfs_create_size_t(attrs[i].name, S_IRUGO, root, attrs[i].val))
goto out;
debugfs_create_u64("eph_zbytes", S_IRUGO, root, &zcache_eph_zbytes);
debugfs_create_u64("eph_zbytes_max", S_IRUGO, root, &zcache_eph_zbytes_max);
debugfs_create_u64("pers_zbytes", S_IRUGO, root, &zcache_pers_zbytes);
debugfs_create_u64("pers_zbytes_max", S_IRUGO, root, &zcache_pers_zbytes_max);
return 0;
out:
return -ENODEV;
}
#undef zdebugfs
#undef zdfs64
/* developers can call this in case of ooms, e.g. to find memory leaks */
void zcache_dump(void)
{
pr_debug("zcache: obj_count=%zd\n", zcache_obj_count);
pr_debug("zcache: obj_count_max=%zd\n", zcache_obj_count_max);
pr_debug("zcache: objnode_count=%zd\n", zcache_objnode_count);
pr_debug("zcache: objnode_count_max=%zd\n", zcache_objnode_count_max);
pr_debug("zcache: flush_total=%zd\n", zcache_flush_total);
pr_debug("zcache: flush_found=%zd\n", zcache_flush_found);
pr_debug("zcache: flobj_total=%zd\n", zcache_flobj_total);
pr_debug("zcache: flobj_found=%zd\n", zcache_flobj_found);
pr_debug("zcache: failed_eph_puts=%zd\n", zcache_failed_eph_puts);
pr_debug("zcache: failed_pers_puts=%zd\n", zcache_failed_pers_puts);
pr_debug("zcache: failed_get_free_pages=%zd\n",
zcache_failed_getfreepages);
pr_debug("zcache: failed_alloc=%zd\n", zcache_failed_alloc);
pr_debug("zcache: put_to_flush=%zd\n", zcache_put_to_flush);
pr_debug("zcache: compress_poor=%zd\n", zcache_compress_poor);
pr_debug("zcache: mean_compress_poor=%zd\n",
zcache_mean_compress_poor);
pr_debug("zcache: eph_ate_tail=%zd\n", zcache_eph_ate_tail);
pr_debug("zcache: eph_ate_tail_failed=%zd\n",
zcache_eph_ate_tail_failed);
pr_debug("zcache: pers_ate_eph=%zd\n", zcache_pers_ate_eph);
pr_debug("zcache: pers_ate_eph_failed=%zd\n",
zcache_pers_ate_eph_failed);
pr_debug("zcache: evicted_eph_zpages=%zd\n", zcache_evicted_eph_zpages);
pr_debug("zcache: evicted_eph_pageframes=%zd\n",
zcache_evicted_eph_pageframes);
pr_debug("zcache: eph_pageframes=%zd\n", zcache_eph_pageframes);
pr_debug("zcache: eph_pageframes_max=%zd\n", zcache_eph_pageframes_max);
pr_debug("zcache: pers_pageframes=%zd\n", zcache_pers_pageframes);
pr_debug("zcache: pers_pageframes_max=%zd\n",
zcache_pers_pageframes_max);
pr_debug("zcache: eph_zpages=%zd\n", zcache_eph_zpages);
pr_debug("zcache: eph_zpages_max=%zd\n", zcache_eph_zpages_max);
pr_debug("zcache: pers_zpages=%zd\n", zcache_pers_zpages);
pr_debug("zcache: pers_zpages_max=%zd\n", zcache_pers_zpages_max);
pr_debug("zcache: last_active_file_pageframes=%zd\n",
zcache_last_active_file_pageframes);
pr_debug("zcache: last_inactive_file_pageframes=%zd\n",
zcache_last_inactive_file_pageframes);
pr_debug("zcache: last_active_anon_pageframes=%zd\n",
zcache_last_active_anon_pageframes);
pr_debug("zcache: last_inactive_anon_pageframes=%zd\n",
zcache_last_inactive_anon_pageframes);
pr_debug("zcache: eph_nonactive_puts_ignored=%zd\n",
zcache_eph_nonactive_puts_ignored);
pr_debug("zcache: pers_nonactive_puts_ignored=%zd\n",
zcache_pers_nonactive_puts_ignored);
pr_debug("zcache: eph_zbytes=%llu\n",
zcache_eph_zbytes);
pr_debug("zcache: eph_zbytes_max=%llu\n",
zcache_eph_zbytes_max);
pr_debug("zcache: pers_zbytes=%llu\n",
zcache_pers_zbytes);
pr_debug("zcache: pers_zbytes_max=%llu\n",
zcache_pers_zbytes_max);
pr_debug("zcache: outstanding_writeback_pages=%zd\n",
zcache_outstanding_writeback_pages);
pr_debug("zcache: writtenback_pages=%zd\n", zcache_writtenback_pages);
unsigned int i;
for (i = 0; i < ARRAY_SIZE(attrs); i++)
pr_debug("zcache: %s=%zu\n", attrs[i].name, *attrs[i].val);
pr_debug("zcache: eph_zbytes=%llu\n", (unsigned long long)zcache_eph_zbytes);
pr_debug("zcache: eph_zbytes_max=%llu\n", (unsigned long long)zcache_eph_zbytes_max);
pr_debug("zcache: pers_zbytes=%llu\n", (unsigned long long)zcache_pers_zbytes);
pr_debug("zcache: pers_zbytes_max=%llu\n", (unsigned long long)zcache_pers_zbytes_max);
}
#endif
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7