11:28 a.m.
Nowadays, "kmem -s" output can have long lines due to cache name with
memcg name, and I don't think that it's human-readable as it is.
crash> kmem -s
CACHE NAME OBJSIZE ALLOCATED TOTAL SLABS SSIZE
ffff8a1522c15380 kmalloc-128(12536:session-11.scope) 128 111 128 4 4k
ffff8a1522c15200 radix_tree_node(12536:session-11.scope) 576 340 434 31
8k
ffff8a1523d15380 xfs_inode(12536:session-11.scope) 904 1567 1581 93 16k
ffff8a1522c15080 nfs_inode_cache(12536:session-11.scope) 1072 140 165 11
16k
ffff8a1523d14c00 shmem_inode_cache(12536:session-11.scope) 696 0 46 2
16k
So, can we move the 'NAME' column to the last of line like this?
crash> kmem -s
CACHE OBJSIZE ALLOCATED TOTAL SLABS SSIZE NAME
ffff8a1522c15380 128 111 128 4 4k
kmalloc-128(12536:session-11.scope)
ffff8a1522c15200 576 340 434 31 8k
radix_tree_node(12536:session-11.scope)
ffff8a1523d15380 904 1567 1581 93 16k
xfs_inode(12536:session-11.scope)
ffff8a1522c15080 1072 140 165 11 16k
nfs_inode_cache(12536:session-11.scope)
ffff8a1523d14c00 696 0 46 2 16k
shmem_inode_cache(12536:session-11.scope)
If we can, crash has the three functions to print them for each slab/slub
version and I think that it would be good to change all of them together.
Fortunately, the header is same among them, and it looks like we can unify
them into one function. [Patch 1]
And then, move it to the last of line. [Patch 2]
I tested this with some vmcores having PERCPU_KMALLOC_V2 or KMALLOC_SLUB
and found no problem, but I don't have any vmcores having PERCPU_KMALLOC_V1
or no flag.
Kazuhito Hagio (2):
Unify the three functions printing "kmem -s" line into one function
Move NAME column in "kmem -s" output to the last of line
help.c | 136 +++++++++++++++++++++++++++++++--------------------------------
memory.c | 132 +++++++++++++++----------------------------------------------
2 files changed, 99 insertions(+), 169 deletions(-)
--
1.8.3.1
11:28 a.m.
New subject: [PATCH 1/2] Unify the three functions printing "kmem -s" line into one function
In preparation for moving NAME column in "kmem -s" line, unify the three
functions printing it into one function.
---
memory.c | 124 ++++++++++++++++++++-------------------------------------------
1 file changed, 39 insertions(+), 85 deletions(-)
diff --git a/memory.c b/memory.c
index 81ed689..2e48d7b 100644
--- a/memory.c
+++ b/memory.c
@@ -172,7 +172,6 @@ static void dump_kmem_cache(struct meminfo *);
static void dump_kmem_cache_percpu_v1(struct meminfo *);
static void dump_kmem_cache_percpu_v2(struct meminfo *);
static void dump_kmem_cache_slub(struct meminfo *);
-static void dump_kmem_cache_info_v2(struct meminfo *);
static void kmem_cache_list_common(void);
static ulong get_cpu_slab_ptr(struct meminfo *, int, ulong *);
static unsigned int oo_order(ulong);
@@ -9964,55 +9963,60 @@ ignore_cache(struct meminfo *si, char *name)
#define KMEM_SLAB_OVERLOAD_PAGE (8)
#define KMEM_SLAB_FREELIST (9)
-#define DUMP_KMEM_CACHE_INFO_V1() \
- { \
- char b1[BUFSIZE]; \
- fprintf(fp, "%s %-18s %8ld ", \
- mkstring(b1, VADDR_PRLEN, LJUST|LONG_HEX, MKSTR(si->cache)), \
- buf, si->size); \
- fprintf(fp, "%9ld %8ld %5ld %3ldk\n", \
- vt->flags & PERCPU_KMALLOC_V1 ? \
- si->inuse - si->cpucached_cache : \
- si->inuse, si->num_slabs * si->c_num, \
- si->num_slabs, si->slabsize/1024); \
- }
-
-#define DUMP_KMEM_CACHE_INFO_V2() dump_kmem_cache_info_v2(si)
+#define DUMP_KMEM_CACHE_INFO() dump_kmem_cache_info(si)
static void
-dump_kmem_cache_info_v2(struct meminfo *si)
+dump_kmem_cache_info(struct meminfo *si)
{
char b1[BUFSIZE];
char b2[BUFSIZE];
int namelen, sizelen, spacelen;
+ ulong objsize, allocated, total;
+
+ if (si->flags & SLAB_GATHER_FAILURE)
+ error(INFO, "%s: cannot gather relevant slab data\n", si->curname);
fprintf(fp, "%s ",
mkstring(b1, VADDR_PRLEN, LJUST|LONG_HEX, MKSTR(si->cache)));
+ objsize = (vt->flags & KMALLOC_SLUB) ? si->objsize : si->size;
+
namelen = strlen(si->curname);
- sprintf(b2, "%ld", si->size);
+ sprintf(b2, "%ld", objsize);
sizelen = strlen(b2);
spacelen = 0;
if (namelen++ > 18) {
spacelen = 29 - namelen - sizelen;
fprintf(fp, "%s%s%ld ", si->curname,
- space(spacelen <= 0 ? 1 : spacelen), si->size);
+ space(spacelen <= 0 ? 1 : spacelen), objsize);
if (spacelen > 0)
spacelen = 1;
- sprintf(b1, "%c%dld ", '%', 9 + spacelen - 1);
+ if (si->flags & SLAB_GATHER_FAILURE)
+ sprintf(b1, "%c%ds ", '%', 9 + spacelen - 1);
+ else
+ sprintf(b1, "%c%dld ", '%', 9 + spacelen - 1);
} else {
- fprintf(fp, "%-18s %8ld ", si->curname, si->size);
- sprintf(b1, "%c%dld ", '%', 9);
+ fprintf(fp, "%-18s %8ld ", si->curname, objsize);
+ if (si->flags & SLAB_GATHER_FAILURE)
+ sprintf(b1, "%c%ds ", '%', 9);
+ else
+ sprintf(b1, "%c%dld ", '%', 9);
}
- fprintf(fp, b1, vt->flags & (PERCPU_KMALLOC_V2) ?
- si->inuse - si->cpucached_cache : si->inuse);
-
- fprintf(fp, "%8ld %s%5ld %s%3ldk\n",
- si->num_slabs * si->c_num,
- si->num_slabs < 100000 ? " " : "", si->num_slabs,
- (si->slabsize/1024) < 1000 ? " " : "", si->slabsize/1024);
+ if (si->flags & SLAB_GATHER_FAILURE) {
+ fprintf(fp, b1, "?");
+ fprintf(fp, "%8s %5s %4ldk\n",
+ "?", "?", si->slabsize/1024);
+ } else {
+ allocated = (vt->flags & (PERCPU_KMALLOC_V1|PERCPU_KMALLOC_V2)) ?
+ si->inuse - si->cpucached_cache : si->inuse;
+ total = (vt->flags & KMALLOC_SLUB) ?
+ si->inuse + si->free : si->num_slabs * si->c_num;
+ fprintf(fp, b1, allocated);
+ fprintf(fp, "%8ld %5ld %4ldk\n", total,
+ si->num_slabs, si->slabsize/1024);
+ }
}
#define DUMP_SLAB_INFO() \
@@ -10152,7 +10156,7 @@ dump_kmem_cache(struct meminfo *si)
do_slab_chain(SLAB_GET_COUNTS, si);
if (!(si->flags & (ADDRESS_SPECIFIED|GET_SLAB_PAGES)))
- DUMP_KMEM_CACHE_INFO_V1();
+ DUMP_KMEM_CACHE_INFO();
if (si->flags == GET_SLAB_PAGES)
si->retval += (si->num_slabs *
@@ -10166,7 +10170,7 @@ dump_kmem_cache(struct meminfo *si)
if (si->found) {
fprintf(fp, "%s", kmem_cache_hdr);
- DUMP_KMEM_CACHE_INFO_V1();
+ DUMP_KMEM_CACHE_INFO();
fprintf(fp, "%s", slab_hdr);
DUMP_SLAB_INFO();
@@ -10362,7 +10366,7 @@ dump_kmem_cache_percpu_v1(struct meminfo *si)
do_slab_chain_percpu_v1(SLAB_GET_COUNTS, si);
if (!(si->flags & (ADDRESS_SPECIFIED|GET_SLAB_PAGES))) {
- DUMP_KMEM_CACHE_INFO_V1();
+ DUMP_KMEM_CACHE_INFO();
if (CRASHDEBUG(3))
dump_struct("kmem_cache_s", si->cache, 0);
}
@@ -10382,7 +10386,7 @@ dump_kmem_cache_percpu_v1(struct meminfo *si)
if (si->found) {
fprintf(fp, "%s", kmem_cache_hdr);
- DUMP_KMEM_CACHE_INFO_V1();
+ DUMP_KMEM_CACHE_INFO();
fprintf(fp, "%s", slab_hdr);
gather_slab_cached_count(si);
DUMP_SLAB_INFO();
@@ -10617,7 +10621,7 @@ dump_kmem_cache_percpu_v2(struct meminfo *si)
do_slab_chain_percpu_v2(SLAB_GET_COUNTS, si);
if (!(si->flags & (ADDRESS_SPECIFIED|GET_SLAB_PAGES))) {
- DUMP_KMEM_CACHE_INFO_V2();
+ DUMP_KMEM_CACHE_INFO();
if (CRASHDEBUG(3))
dump_struct("kmem_cache_s", si->cache, 0);
}
@@ -10644,7 +10648,7 @@ dump_kmem_cache_percpu_v2(struct meminfo *si)
if (si->found) {
fprintf(fp, "%s", kmem_cache_hdr);
- DUMP_KMEM_CACHE_INFO_V2();
+ DUMP_KMEM_CACHE_INFO();
fprintf(fp, "%s", slab_hdr);
gather_slab_cached_count(si);
DUMP_SLAB_INFO();
@@ -18064,56 +18068,6 @@ kmem_cache_list_common(void)
FREEBUF(cache_list);
}
-#define DUMP_KMEM_CACHE_INFO_SLUB() dump_kmem_cache_info_slub(si)
-
-static void
-dump_kmem_cache_info_slub(struct meminfo *si)
-{
- char b1[BUFSIZE];
- char b2[BUFSIZE];
- int namelen, sizelen, spacelen;
-
- if (si->flags & SLAB_GATHER_FAILURE)
- error(INFO, "%s: cannot gather relevant slab data\n", si->curname);
-
- fprintf(fp, "%s ",
- mkstring(b1, VADDR_PRLEN, LJUST|LONG_HEX, MKSTR(si->cache)));
-
- namelen = strlen(si->curname);
- sprintf(b2, "%ld", si->objsize);
- sizelen = strlen(b2);
- spacelen = 0;
-
- if (namelen++ > 18) {
- spacelen = 29 - namelen - sizelen;
- fprintf(fp, "%s%s%ld ", si->curname,
- space(spacelen <= 0 ? 1 : spacelen), si->objsize);
- if (spacelen > 0)
- spacelen = 1;
- if (si->flags & SLAB_GATHER_FAILURE)
- sprintf(b1, "%c%ds ", '%', 9 + spacelen - 1);
- else
- sprintf(b1, "%c%dld ", '%', 9 + spacelen - 1);
- } else {
- fprintf(fp, "%-18s %8ld ", si->curname, si->objsize);
- if (si->flags & SLAB_GATHER_FAILURE)
- sprintf(b1, "%c%ds ", '%', 9);
- else
- sprintf(b1, "%c%dld ", '%', 9);
- }
-
- if (si->flags & SLAB_GATHER_FAILURE) {
- fprintf(fp, b1, "?");
- fprintf(fp, "%8s %5s %4ldk\n",
- "?", "?", si->slabsize/1024);
- } else {
- fprintf(fp, b1, si->inuse);
- fprintf(fp, "%8ld %5ld %4ldk\n",
- si->inuse + si->free,
- si->num_slabs, si->slabsize/1024);
- }
-}
-
static void
dump_kmem_cache_slub(struct meminfo *si)
{
@@ -18214,7 +18168,7 @@ dump_kmem_cache_slub(struct meminfo *si)
!get_kmem_cache_slub_data(GET_SLUB_OBJECTS, si))
si->flags |= SLAB_GATHER_FAILURE;
- DUMP_KMEM_CACHE_INFO_SLUB();
+ DUMP_KMEM_CACHE_INFO();
if (si->flags & SLAB_GATHER_FAILURE) {
si->flags &= ~SLAB_GATHER_FAILURE;
--
1.8.3.1
11:28 a.m.
New subject: [PATCH 2/2] Move NAME column in "kmem -s" output to the last of line
For readability, move NAME column in "kmem -s" output to the last of line.
---
help.c | 136 +++++++++++++++++++++++++++++++--------------------------------
memory.c | 44 +++++----------------
2 files changed, 78 insertions(+), 102 deletions(-)
diff --git a/help.c b/help.c
index 83cda7c..a189038 100644
--- a/help.c
+++ b/help.c
@@ -6692,8 +6692,8 @@ char *help_kmem[] = {
" Find all of the combined slab/page structures that are used by",
" the kmalloc-8192 slab cache:\n",
" %s> kmem -s kmalloc-8192",
-" CACHE NAME OBJSIZE ALLOCATED TOTAL SLABS
SSIZE",
-" ffff880215802e00 kmalloc-8192 8192 65 80 20
32k",
+" CACHE OBJSIZE ALLOCATED TOTAL SLABS SSIZE NAME",
+" ffff880215802e00 8192 65 80 20 32k
kmalloc-8192",
" %s> kmem -m slab_cache | grep ffff880215802e00",
" ffffea0004117800 ffff880215802e00 ",
" ffffea00041ca600 ffff880215802e00 ",
@@ -6889,72 +6889,72 @@ char *help_kmem[] = {
" ",
" Display kmalloc() slab data:\n",
" %s> kmem -s",
-" CACHE NAME OBJSIZE ALLOCATED TOTAL SLABS
SSIZE",
-" c02eadc0 kmem_cache 232 58 68 4
4k",
-" f79c2888 ip_vs_conn 128 0 0 0
4k",
-" f79c2970 tcp_tw_bucket 96 0 0 0
4k",
-" f79c2a58 tcp_bind_bucket 32 12 565 5
4k",
-" f79c2b40 tcp_open_request 64 0 59 1
4k",
-" f79c2c28 inet_peer_cache 64 1 59 1
4k",
-" f79c2d10 ip_fib_hash 32 11 339 3
4k",
-" f79c2df8 ip_dst_cache 160 8 120 5
4k",
-" f79c2ee0 arp_cache 128 1 30 1
4k",
-" c8402970 blkdev_requests 96 30208 37800 945
4k",
-" c8402a58 nfs_read_data 384 0 0 0
4k",
-" c8402b40 nfs_write_data 384 0 0 0
4k",
-" c8402c28 nfs_page 96 0 0 0
4k",
-" c8402d10 dnotify cache 20 0 0 0
4k",
-" c8402df8 file lock cache 92 3 336 8
4k",
-" c8402ee0 fasync cache 16 0 0 0
4k",
-" c84027a0 uid_cache 32 3 339 3
4k",
-" c84026b8 skbuff_head_cache 160 320 624 26
4k",
-" c84025d0 sock 832 32 180 20
8k",
-" c84024e8 sigqueue 132 0 203 7
4k",
-" c8402400 cdev_cache 64 19 472 8
4k",
-" c8402318 bdev_cache 64 8 236 4
4k",
-" c8402230 mnt_cache 96 11 120 3
4k",
-" c8402148 inode_cache 480 817 848 106
4k",
-" c8402060 dentry_cache 128 1352 1470 49
4k",
-" c8403ee0 filp 96 244 440 11
4k",
-" c8403df8 names_cache 4096 0 12 12
4k",
-" c8403d10 buffer_head 96 14936 16000 400
4k",
-" c8403c28 mm_struct 128 25 240 8
4k",
-" c8403b40 vm_area_struct 64 393 1298 22
4k",
-" c8403a58 fs_cache 64 30 472 8
4k",
-" c8403970 files_cache 416 30 135 15
4k",
-" c8403888 signal_act 1312 32 99 33
4k",
-" c84037a0 size-131072(DMA) 131072 0 0 0
128k",
-" c84036b8 size-131072 131072 1 1 1
128k",
-" c84035d0 size-65536(DMA) 65536 0 0 0
64k",
-" c84034e8 size-65536 65536 0 0 0
64k",
-" c8403400 size-32768(DMA) 32768 0 0 0
32k",
-" c8403318 size-32768 32768 0 1 1
32k",
-" c8403230 size-16384(DMA) 16384 0 0 0
16k",
-" c8403148 size-16384 16384 0 0 0
16k",
-" c8403060 size-8192(DMA) 8192 0 0 0
8k",
-" c8401ee0 size-8192 8192 1 2 2
8k",
-" c8401df8 size-4096(DMA) 4096 0 0 0
4k",
-" c8401d10 size-4096 4096 30 30 30
4k",
-" c8401c28 size-2048(DMA) 2048 0 0 0
4k",
-" c8401b40 size-2048 2048 37 132 66
4k",
-" c8401a58 size-1024(DMA) 1024 0 0 0
4k",
-" c8401970 size-1024 1024 301 328 82
4k",
-" c8401888 size-512(DMA) 512 0 0 0
4k",
-" c84017a0 size-512 512 141 168 21
4k",
-" c84016b8 size-256(DMA) 256 0 0 0
4k",
-" c84015d0 size-256 256 80 435 29
4k",
-" c84014e8 size-128(DMA) 128 0 0 0
4k",
-" c8401400 size-128 128 508 840 28
4k",
-" c8401318 size-64(DMA) 64 0 0 0
4k",
-" c8401230 size-64 64 978 1357 23
4k",
-" c8401148 size-32(DMA) 32 0 0 0
4k",
-" c8401060 size-32 32 1244 1808 16
4k",
+" CACHE OBJSIZE ALLOCATED TOTAL SLABS SSIZE NAME",
+" c02eadc0 232 58 68 4 4k kmem_cache",
+" f79c2888 128 0 0 0 4k ip_vs_conn",
+" f79c2970 96 0 0 0 4k tcp_tw_bucket",
+" f79c2a58 32 12 565 5 4k tcp_bind_bucket",
+" f79c2b40 64 0 59 1 4k tcp_open_request",
+" f79c2c28 64 1 59 1 4k inet_peer_cache",
+" f79c2d10 32 11 339 3 4k ip_fib_hash",
+" f79c2df8 160 8 120 5 4k ip_dst_cache",
+" f79c2ee0 128 1 30 1 4k arp_cache",
+" c8402970 96 30208 37800 945 4k blkdev_requests",
+" c8402a58 384 0 0 0 4k nfs_read_data",
+" c8402b40 384 0 0 0 4k nfs_write_data",
+" c8402c28 96 0 0 0 4k nfs_page",
+" c8402d10 20 0 0 0 4k dnotify cache",
+" c8402df8 92 3 336 8 4k file lock cache",
+" c8402ee0 16 0 0 0 4k fasync cache",
+" c84027a0 32 3 339 3 4k uid_cache",
+" c84026b8 160 320 624 26 4k skbuff_head_cache",
+" c84025d0 832 32 180 20 8k sock",
+" c84024e8 132 0 203 7 4k sigqueue",
+" c8402400 64 19 472 8 4k cdev_cache",
+" c8402318 64 8 236 4 4k bdev_cache",
+" c8402230 96 11 120 3 4k mnt_cache",
+" c8402148 480 817 848 106 4k inode_cache",
+" c8402060 128 1352 1470 49 4k dentry_cache",
+" c8403ee0 96 244 440 11 4k filp",
+" c8403df8 4096 0 12 12 4k names_cache",
+" c8403d10 96 14936 16000 400 4k buffer_head",
+" c8403c28 128 25 240 8 4k mm_struct",
+" c8403b40 64 393 1298 22 4k vm_area_struct",
+" c8403a58 64 30 472 8 4k fs_cache",
+" c8403970 416 30 135 15 4k files_cache",
+" c8403888 1312 32 99 33 4k signal_act",
+" c84037a0 131072 0 0 0 128k size-131072(DMA)",
+" c84036b8 131072 1 1 1 128k size-131072",
+" c84035d0 65536 0 0 0 64k size-65536(DMA)",
+" c84034e8 65536 0 0 0 64k size-65536",
+" c8403400 32768 0 0 0 32k size-32768(DMA)",
+" c8403318 32768 0 1 1 32k size-32768",
+" c8403230 16384 0 0 0 16k size-16384(DMA)",
+" c8403148 16384 0 0 0 16k size-16384",
+" c8403060 8192 0 0 0 8k size-8192(DMA)",
+" c8401ee0 8192 1 2 2 8k size-8192",
+" c8401df8 4096 0 0 0 4k size-4096(DMA)",
+" c8401d10 4096 30 30 30 4k size-4096",
+" c8401c28 2048 0 0 0 4k size-2048(DMA)",
+" c8401b40 2048 37 132 66 4k size-2048",
+" c8401a58 1024 0 0 0 4k size-1024(DMA)",
+" c8401970 1024 301 328 82 4k size-1024",
+" c8401888 512 0 0 0 4k size-512(DMA)",
+" c84017a0 512 141 168 21 4k size-512",
+" c84016b8 256 0 0 0 4k size-256(DMA)",
+" c84015d0 256 80 435 29 4k size-256",
+" c84014e8 128 0 0 0 4k size-128(DMA)",
+" c8401400 128 508 840 28 4k size-128",
+" c8401318 64 0 0 0 4k size-64(DMA)",
+" c8401230 64 978 1357 23 4k size-64",
+" c8401148 32 0 0 0 4k size-32(DMA)",
+" c8401060 32 1244 1808 16 4k size-32",
" ",
" Display all slab data in the \"arp_cache\" cache:\n",
" %s> kmem -S arp_cache",
-" CACHE NAME OBJSIZE ALLOCATED TOTAL SLABS
SSIZE",
-" f79c2ee0 arp_cache 128 1 30 1
4k",
+" CACHE OBJSIZE ALLOCATED TOTAL SLABS SSIZE NAME",
+" f79c2ee0 128 1 30 1 4k arp_cache",
" SLAB MEMORY TOTAL ALLOCATED FREE",
" f729d000 f729d0a0 30 1 29",
" FREE / [ALLOCATED]",
@@ -6991,8 +6991,8 @@ char *help_kmem[] = {
" ",
" Search the kmalloc() slab subsystem for address c3fbdb60:\n",
" %s> kmem -s c3fbdb60",
-" CACHE NAME OBJSIZE ALLOCATED TOTAL SLABS
SSIZE",
-" c8402970 blkdev_requests 96 30208 37800 945
4k",
+" CACHE OBJSIZE ALLOCATED TOTAL SLABS SSIZE NAME",
+" c8402970 96 30208 37800 945 4k blkdev_requests",
" SLAB MEMORY TOTAL ALLOCATED FREE",
" c3fbd020 c3fbd0e0 40 40 0",
" FREE / [ALLOCATED]",
@@ -7000,8 +7000,8 @@ char *help_kmem[] = {
" ",
" Make a generic search (no flags) for the same address c3fbdb60:\n",
" %s> kmem c3fbdb60 ",
-" CACHE NAME OBJSIZE ALLOCATED TOTAL SLABS
SSIZE",
-" c8402970 blkdev_requests 96 30208 37800 945
4k",
+" CACHE OBJSIZE ALLOCATED TOTAL SLABS SSIZE NAME",
+" c8402970 96 30208 37800 945 4k blkdev_requests",
" SLAB MEMORY TOTAL ALLOCATED FREE",
" c3fbd020 c3fbd0e0 40 40 0 ",
" FREE / [ALLOCATED]",
diff --git a/memory.c b/memory.c
index 2e48d7b..5bcf09e 100644
--- a/memory.c
+++ b/memory.c
@@ -9378,7 +9378,7 @@ kmem_cache_init(void)
if (!strlen(kmem_cache_hdr))
sprintf(kmem_cache_hdr,
- "CACHE%sNAME OBJSIZE ALLOCATED TOTAL SLABS
SSIZE\n",
+ "CACHE%s OBJSIZE ALLOCATED TOTAL SLABS SSIZE NAME\n",
space(VADDR_PRLEN > 8 ? 12 : 4));
if (!strlen(free_inuse_hdr))
@@ -9969,54 +9969,30 @@ static void
dump_kmem_cache_info(struct meminfo *si)
{
char b1[BUFSIZE];
- char b2[BUFSIZE];
- int namelen, sizelen, spacelen;
ulong objsize, allocated, total;
if (si->flags & SLAB_GATHER_FAILURE)
error(INFO, "%s: cannot gather relevant slab data\n", si->curname);
- fprintf(fp, "%s ",
- mkstring(b1, VADDR_PRLEN, LJUST|LONG_HEX, MKSTR(si->cache)));
-
objsize = (vt->flags & KMALLOC_SLUB) ? si->objsize : si->size;
- namelen = strlen(si->curname);
- sprintf(b2, "%ld", objsize);
- sizelen = strlen(b2);
- spacelen = 0;
-
- if (namelen++ > 18) {
- spacelen = 29 - namelen - sizelen;
- fprintf(fp, "%s%s%ld ", si->curname,
- space(spacelen <= 0 ? 1 : spacelen), objsize);
- if (spacelen > 0)
- spacelen = 1;
- if (si->flags & SLAB_GATHER_FAILURE)
- sprintf(b1, "%c%ds ", '%', 9 + spacelen - 1);
- else
- sprintf(b1, "%c%dld ", '%', 9 + spacelen - 1);
- } else {
- fprintf(fp, "%-18s %8ld ", si->curname, objsize);
- if (si->flags & SLAB_GATHER_FAILURE)
- sprintf(b1, "%c%ds ", '%', 9);
- else
- sprintf(b1, "%c%dld ", '%', 9);
- }
+ fprintf(fp, "%s %8ld ",
+ mkstring(b1, VADDR_PRLEN, LJUST|LONG_HEX, MKSTR(si->cache)),
+ objsize);
if (si->flags & SLAB_GATHER_FAILURE) {
- fprintf(fp, b1, "?");
- fprintf(fp, "%8s %5s %4ldk\n",
- "?", "?", si->slabsize/1024);
+ fprintf(fp, "%9s %8s %5s ", "?", "?", "?");
} else {
allocated = (vt->flags & (PERCPU_KMALLOC_V1|PERCPU_KMALLOC_V2)) ?
si->inuse - si->cpucached_cache : si->inuse;
total = (vt->flags & KMALLOC_SLUB) ?
si->inuse + si->free : si->num_slabs * si->c_num;
- fprintf(fp, b1, allocated);
- fprintf(fp, "%8ld %5ld %4ldk\n", total,
- si->num_slabs, si->slabsize/1024);
+
+ fprintf(fp, "%9ld %8ld %5ld ",
+ allocated, total, si->num_slabs);
}
+
+ fprintf(fp, "%4ldk %s\n", si->slabsize/1024, si->curname);
}
#define DUMP_SLAB_INFO() \
--
1.8.3.1
1:48 p.m.
Hi Kazu,
I'll be back from vacation next week, and I'll take a look at the patch then.
Sounds like a reasonable idea, and I have plenty of "old" sample vmcores.
Thanks, Dave
Sent from my Verizon, Samsung Galaxy smartphone
-------- Original message --------From: Kazuhito Hagio <k-hagio(a)ab.jp.nec.com> Date:
7/30/18 12:28 PM (GMT-05:00) To: crash-utility(a)redhat.com Subject: [Crash-utility]
[PATCH 0/2] Move NAME column in "kmem -s" output to
the last of line
Nowadays, "kmem -s" output can have long lines due to cache name with
memcg name, and I don't think that it's human-readable as it is.
crash> kmem -s
CACHE NAME OBJSIZE ALLOCATED TOTAL SLABS SSIZE
ffff8a1522c15380 kmalloc-128(12536:session-11.scope) 128 111 128 4 4k
ffff8a1522c15200 radix_tree_node(12536:session-11.scope) 576 340 434 31
8k
ffff8a1523d15380 xfs_inode(12536:session-11.scope) 904 1567 1581 93 16k
ffff8a1522c15080 nfs_inode_cache(12536:session-11.scope) 1072 140 165 11
16k
ffff8a1523d14c00 shmem_inode_cache(12536:session-11.scope) 696 0 46
2 16k
So, can we move the 'NAME' column to the last of line like this?
crash> kmem -s
CACHE OBJSIZE ALLOCATED TOTAL SLABS SSIZE NAME
ffff8a1522c15380 128 111 128 4 4k
kmalloc-128(12536:session-11.scope)
ffff8a1522c15200 576 340 434 31 8k
radix_tree_node(12536:session-11.scope)
ffff8a1523d15380 904 1567 1581 93 16k
xfs_inode(12536:session-11.scope)
ffff8a1522c15080 1072 140 165 11 16k
nfs_inode_cache(12536:session-11.scope)
ffff8a1523d14c00 696 0 46 2 16k
shmem_inode_cache(12536:session-11.scope)
If we can, crash has the three functions to print them for each slab/slub
version and I think that it would be good to change all of them together.
Fortunately, the header is same among them, and it looks like we can unify
them into one function. [Patch 1]
And then, move it to the last of line. [Patch 2]
I tested this with some vmcores having PERCPU_KMALLOC_V2 or KMALLOC_SLUB
and found no problem, but I don't have any vmcores having PERCPU_KMALLOC_V1
or no flag.
Kazuhito Hagio (2):
Unify the three functions printing "kmem -s" line into one function
Move NAME column in "kmem -s" output to the last of line
help.c | 136 +++++++++++++++++++++++++++++++--------------------------------
memory.c | 132 +++++++++++++++----------------------------------------------
2 files changed, 99 insertions(+), 169 deletions(-)
--
1.8.3.1
--
Crash-utility mailing list
Crash-utility(a)redhat.com
https://www.redhat.com/mailman/listinfo/crash-utility
1:24 p.m.
New subject: [PATCH 0/2] Move NAME column in "kmem -s" output to the last of line
Kazu,
Nicely done! It's a huge improvement in readability, cleans up some
unnecessary duplication, and tests well on all of my old and new
kernel dumpfiles that I have on hand. Queued for crash-7.2.4:
https://github.com/crash-utility/crash/commit/455da1ae5c7f22ba870aa57e071...
Thanks,
Dave
----- Original Message -----
Nowadays, "kmem -s" output can have long lines due to cache
name with
memcg name, and I don't think that it's human-readable as it is.
crash> kmem -s
CACHE NAME OBJSIZE ALLOCATED TOTAL SLABS
SSIZE
ffff8a1522c15380 kmalloc-128(12536:session-11.scope) 128 111 128
4 4k
ffff8a1522c15200 radix_tree_node(12536:session-11.scope) 576 340
434 31 8k
ffff8a1523d15380 xfs_inode(12536:session-11.scope) 904 1567 1581 93
16k
ffff8a1522c15080 nfs_inode_cache(12536:session-11.scope) 1072 140
165 11 16k
ffff8a1523d14c00 shmem_inode_cache(12536:session-11.scope) 696 0
46 2 16k
So, can we move the 'NAME' column to the last of line like this?
crash> kmem -s
CACHE OBJSIZE ALLOCATED TOTAL SLABS SSIZE NAME
ffff8a1522c15380 128 111 128 4 4k
kmalloc-128(12536:session-11.scope)
ffff8a1522c15200 576 340 434 31 8k
radix_tree_node(12536:session-11.scope)
ffff8a1523d15380 904 1567 1581 93 16k
xfs_inode(12536:session-11.scope)
ffff8a1522c15080 1072 140 165 11 16k
nfs_inode_cache(12536:session-11.scope)
ffff8a1523d14c00 696 0 46 2 16k
shmem_inode_cache(12536:session-11.scope)
If we can, crash has the three functions to print them for each slab/slub
version and I think that it would be good to change all of them together.
Fortunately, the header is same among them, and it looks like we can unify
them into one function. [Patch 1]
And then, move it to the last of line. [Patch 2]
I tested this with some vmcores having PERCPU_KMALLOC_V2 or KMALLOC_SLUB
and found no problem, but I don't have any vmcores having PERCPU_KMALLOC_V1
or no flag.
Kazuhito Hagio (2):
Unify the three functions printing "kmem -s" line into one function
Move NAME column in "kmem -s" output to the last of line
help.c | 136
+++++++++++++++++++++++++++++++--------------------------------
memory.c | 132 +++++++++++++++----------------------------------------------
2 files changed, 99 insertions(+), 169 deletions(-)
--
1.8.3.1
--
Crash-utility mailing list
Crash-utility(a)redhat.com
https://www.redhat.com/mailman/listinfo/crash-utility
3:57 p.m.
Hi Dave,
On 8/8/2018 2:24 PM, Dave Anderson wrote:
Kazu,
Nicely done! It's a huge improvement in readability, cleans up some
unnecessary duplication, and tests well on all of my old and new
kernel dumpfiles that I have on hand. Queued for crash-7.2.4:
https://github.com/crash-utility/crash/commit/455da1ae5c7f22ba870aa57e071...
Thank you for the test and merging!
but I just found the rest of work, -I option is not adjusted
to the patch.
crash> kmem -s -I nfs_commit_data
CACHE OBJSIZE ALLOCATED TOTAL SLABS SSIZE NAME
ffff88017fc79800 352 0 0 0 16k nfs_direct_cache
ffff88017fc79700 nfs_commit_data [IGNORED]
ffff88017fc79600 888 32 2880 80 32k nfs_read_data
How about the following?
crash> kmem -s -I nfs_commit_data
CACHE OBJSIZE ALLOCATED TOTAL SLABS SSIZE NAME
ffff88017fc79800 352 0 0 0 16k nfs_direct_cache
ffff88017fc79700 [IGNORED] nfs_commit_data
ffff88017fc79600 888 32 2880 80 32k nfs_read_data
---
memory.c | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/memory.c b/memory.c
index 5bcf09e..4790cf6 100644
--- a/memory.c
+++ b/memory.c
@@ -9963,6 +9963,9 @@ ignore_cache(struct meminfo *si, char *name)
#define KMEM_SLAB_OVERLOAD_PAGE (8)
#define KMEM_SLAB_FREELIST (9)
+#define DUMP_KMEM_CACHE_TAG(addr, name, tag) \
+ fprintf(fp, "%lx %-43s %s\n", addr, tag, name)
+
#define DUMP_KMEM_CACHE_INFO() dump_kmem_cache_info(si)
static void
@@ -10094,7 +10097,7 @@ dump_kmem_cache(struct meminfo *si)
goto next_cache;
if (ignore_cache(si, buf)) {
- fprintf(fp, "%lx %-18s [IGNORED]\n", si->cache, buf);
+ DUMP_KMEM_CACHE_TAG(si->cache, buf, "[IGNORED]");
goto next_cache;
}
@@ -10303,7 +10306,7 @@ dump_kmem_cache_percpu_v1(struct meminfo *si)
goto next_cache;
if (ignore_cache(si, buf)) {
- fprintf(fp, "%lx %-18s [IGNORED]\n", si->cache,
buf);
+ DUMP_KMEM_CACHE_TAG(si->cache, buf, "[IGNORED]");
goto next_cache;
}
@@ -10547,12 +10550,12 @@ dump_kmem_cache_percpu_v2(struct meminfo *si)
goto next_cache;
if (ignore_cache(si, buf)) {
- fprintf(fp, "%lx %-18s [IGNORED]\n", si->cache,
buf);
+ DUMP_KMEM_CACHE_TAG(si->cache, buf, "[IGNORED]");
goto next_cache;
}
if (bad_slab_cache(si->cache)) {
- fprintf(fp, "%lx %-18s [INVALID/CORRUPTED]\n",
si->cache, buf);
+ DUMP_KMEM_CACHE_TAG(si->cache, buf,
"[INVALID/CORRUPTED]");
goto next_cache;
}
@@ -18109,8 +18112,7 @@ dump_kmem_cache_slub(struct meminfo *si)
fprintf(fp, "%s", kmem_cache_hdr);
}
if (ignore_cache(si, buf)) {
- fprintf(fp, "%lx %-18s [IGNORED]\n",
- si->cache_list[i], buf);
+ DUMP_KMEM_CACHE_TAG(si->cache_list[i], buf, "[IGNORED]");
goto next_cache;
}
--
1.8.3.1
Thanks,
Dave
----- Original Message -----
> Nowadays, "kmem -s" output can have long lines due to cache name with
> memcg name, and I don't think that it's human-readable as it is.
>
> crash> kmem -s
> CACHE NAME OBJSIZE ALLOCATED TOTAL SLABS
> SSIZE
> ffff8a1522c15380 kmalloc-128(12536:session-11.scope) 128 111 128
> 4 4k
> ffff8a1522c15200 radix_tree_node(12536:session-11.scope) 576 340
> 434 31 8k
> ffff8a1523d15380 xfs_inode(12536:session-11.scope) 904 1567 1581 93
> 16k
> ffff8a1522c15080 nfs_inode_cache(12536:session-11.scope) 1072 140
> 165 11 16k
> ffff8a1523d14c00 shmem_inode_cache(12536:session-11.scope) 696 0
> 46 2 16k
>
> So, can we move the 'NAME' column to the last of line like this?
>
> crash> kmem -s
> CACHE OBJSIZE ALLOCATED TOTAL SLABS SSIZE NAME
> ffff8a1522c15380 128 111 128 4 4k
> kmalloc-128(12536:session-11.scope)
> ffff8a1522c15200 576 340 434 31 8k
> radix_tree_node(12536:session-11.scope)
> ffff8a1523d15380 904 1567 1581 93 16k
> xfs_inode(12536:session-11.scope)
> ffff8a1522c15080 1072 140 165 11 16k
> nfs_inode_cache(12536:session-11.scope)
> ffff8a1523d14c00 696 0 46 2 16k
> shmem_inode_cache(12536:session-11.scope)
>
> If we can, crash has the three functions to print them for each slab/slub
> version and I think that it would be good to change all of them together.
> Fortunately, the header is same among them, and it looks like we can unify
> them into one function. [Patch 1]
>
> And then, move it to the last of line. [Patch 2]
>
> I tested this with some vmcores having PERCPU_KMALLOC_V2 or KMALLOC_SLUB
> and found no problem, but I don't have any vmcores having PERCPU_KMALLOC_V1
> or no flag.
>
> Kazuhito Hagio (2):
> Unify the three functions printing "kmem -s" line into one function
> Move NAME column in "kmem -s" output to the last of line
>
> help.c | 136
> +++++++++++++++++++++++++++++++--------------------------------
> memory.c | 132 +++++++++++++++----------------------------------------------
> 2 files changed, 99 insertions(+), 169 deletions(-)
>
> --
> 1.8.3.1
>
> --
> Crash-utility mailing list
> Crash-utility(a)redhat.com
> https://www.redhat.com/mailman/listinfo/crash-utility
>
--
Crash-utility mailing list
Crash-utility(a)redhat.com
https://www.redhat.com/mailman/listinfo/crash-utility
10:36 a.m.
----- Original Message -----
Hi Dave,
On 8/8/2018 2:24 PM, Dave Anderson wrote:
>
> Kazu,
>
> Nicely done! It's a huge improvement in readability, cleans up some
> unnecessary duplication, and tests well on all of my old and new
> kernel dumpfiles that I have on hand. Queued for crash-7.2.4:
>
>
https://github.com/crash-utility/crash/commit/455da1ae5c7f22ba870aa57e071...
Thank you for the test and merging!
but I just found the rest of work, -I option is not adjusted
to the patch.
Hi Kazu,
Looks good -- and I also fixed the "help kmem" description of the -I option.
Queued for crash-7.2.4:
https://github.com/crash-utility/crash/commit/e9532aea6818b347bc0740f39ef...
Thanks again,
Dave
crash> kmem -s -I nfs_commit_data
CACHE OBJSIZE ALLOCATED TOTAL SLABS SSIZE NAME
ffff88017fc79800 352 0 0 0 16k
nfs_direct_cache
ffff88017fc79700 nfs_commit_data [IGNORED]
ffff88017fc79600 888 32 2880 80 32k nfs_read_data
How about the following?
crash> kmem -s -I nfs_commit_data
CACHE OBJSIZE ALLOCATED TOTAL SLABS SSIZE NAME
ffff88017fc79800 352 0 0 0 16k
nfs_direct_cache
ffff88017fc79700 [IGNORED]
nfs_commit_data
ffff88017fc79600 888 32 2880 80 32k nfs_read_data
---
memory.c | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/memory.c b/memory.c
index 5bcf09e..4790cf6 100644
--- a/memory.c
+++ b/memory.c
@@ -9963,6 +9963,9 @@ ignore_cache(struct meminfo *si, char *name)
#define KMEM_SLAB_OVERLOAD_PAGE (8)
#define KMEM_SLAB_FREELIST (9)
+#define DUMP_KMEM_CACHE_TAG(addr, name, tag) \
+ fprintf(fp, "%lx %-43s %s\n", addr, tag, name)
+
#define DUMP_KMEM_CACHE_INFO() dump_kmem_cache_info(si)
static void
@@ -10094,7 +10097,7 @@ dump_kmem_cache(struct meminfo *si)
goto next_cache;
if (ignore_cache(si, buf)) {
- fprintf(fp, "%lx %-18s [IGNORED]\n", si->cache, buf);
+ DUMP_KMEM_CACHE_TAG(si->cache, buf, "[IGNORED]");
goto next_cache;
}
@@ -10303,7 +10306,7 @@ dump_kmem_cache_percpu_v1(struct meminfo *si)
goto next_cache;
if (ignore_cache(si, buf)) {
- fprintf(fp, "%lx %-18s [IGNORED]\n", si->cache,
buf);
+ DUMP_KMEM_CACHE_TAG(si->cache, buf, "[IGNORED]");
goto next_cache;
}
@@ -10547,12 +10550,12 @@ dump_kmem_cache_percpu_v2(struct meminfo *si)
goto next_cache;
if (ignore_cache(si, buf)) {
- fprintf(fp, "%lx %-18s [IGNORED]\n", si->cache,
buf);
+ DUMP_KMEM_CACHE_TAG(si->cache, buf, "[IGNORED]");
goto next_cache;
}
if (bad_slab_cache(si->cache)) {
- fprintf(fp, "%lx %-18s [INVALID/CORRUPTED]\n",
si->cache, buf);
+ DUMP_KMEM_CACHE_TAG(si->cache, buf,
"[INVALID/CORRUPTED]");
goto next_cache;
}
@@ -18109,8 +18112,7 @@ dump_kmem_cache_slub(struct meminfo *si)
fprintf(fp, "%s", kmem_cache_hdr);
}
if (ignore_cache(si, buf)) {
- fprintf(fp, "%lx %-18s [IGNORED]\n",
- si->cache_list[i], buf);
+ DUMP_KMEM_CACHE_TAG(si->cache_list[i], buf, "[IGNORED]");
goto next_cache;
}
--
1.8.3.1
>
> Thanks,
> Dave
>
>
> ----- Original Message -----
>> Nowadays, "kmem -s" output can have long lines due to cache name with
>> memcg name, and I don't think that it's human-readable as it is.
>>
>> crash> kmem -s
>> CACHE NAME OBJSIZE ALLOCATED TOTAL SLABS
>> SSIZE
>> ffff8a1522c15380 kmalloc-128(12536:session-11.scope) 128 111 128
>> 4 4k
>> ffff8a1522c15200 radix_tree_node(12536:session-11.scope) 576 340
>> 434 31 8k
>> ffff8a1523d15380 xfs_inode(12536:session-11.scope) 904 1567 1581
>> 93
>> 16k
>> ffff8a1522c15080 nfs_inode_cache(12536:session-11.scope) 1072 140
>> 165 11 16k
>> ffff8a1523d14c00 shmem_inode_cache(12536:session-11.scope) 696 0
>> 46 2 16k
>>
>> So, can we move the 'NAME' column to the last of line like this?
>>
>> crash> kmem -s
>> CACHE OBJSIZE ALLOCATED TOTAL SLABS SSIZE NAME
>> ffff8a1522c15380 128 111 128 4 4k
>> kmalloc-128(12536:session-11.scope)
>> ffff8a1522c15200 576 340 434 31 8k
>> radix_tree_node(12536:session-11.scope)
>> ffff8a1523d15380 904 1567 1581 93 16k
>> xfs_inode(12536:session-11.scope)
>> ffff8a1522c15080 1072 140 165 11 16k
>> nfs_inode_cache(12536:session-11.scope)
>> ffff8a1523d14c00 696 0 46 2 16k
>> shmem_inode_cache(12536:session-11.scope)
>>
>> If we can, crash has the three functions to print them for each slab/slub
>> version and I think that it would be good to change all of them together.
>> Fortunately, the header is same among them, and it looks like we can unify
>> them into one function. [Patch 1]
>>
>> And then, move it to the last of line. [Patch 2]
>>
>> I tested this with some vmcores having PERCPU_KMALLOC_V2 or KMALLOC_SLUB
>> and found no problem, but I don't have any vmcores having
>> PERCPU_KMALLOC_V1
>> or no flag.
>>
>> Kazuhito Hagio (2):
>> Unify the three functions printing "kmem -s" line into one function
>> Move NAME column in "kmem -s" output to the last of line
>>
>> help.c | 136
>> +++++++++++++++++++++++++++++++--------------------------------
>> memory.c | 132
>> +++++++++++++++----------------------------------------------
>> 2 files changed, 99 insertions(+), 169 deletions(-)
>>
>> --
>> 1.8.3.1
>>
>> --
>> Crash-utility mailing list
>> Crash-utility(a)redhat.com
>> https://www.redhat.com/mailman/listinfo/crash-utility
>>
>
> --
> Crash-utility mailing list
> Crash-utility(a)redhat.com
> https://www.redhat.com/mailman/listinfo/crash-utility
>
--
Crash-utility mailing list
Crash-utility(a)redhat.com
https://www.redhat.com/mailman/listinfo/crash-utility
2301
days inactive
2311
days old
devel@lists.crash-utility.osci.io
6 comments
3 participants
participants (3)
-
anderson -
Dave Anderson -
Kazuhito Hagio