tools/vm/slabinfo: sort slabs by loss
Introduce opt "-L|--sort-loss" to sort and output slabs by loss (waste) in slabcache(). Signed-off-by: Sergey Senozhatsky <sergey.senozhatsky@gmail.com> Cc: Christoph Lameter <cl@linux.com> Cc: Pekka Enberg <penberg@kernel.org> Cc: David Rientjes <rientjes@google.com> Cc: Joonsoo Kim <iamjoonsoo.kim@lge.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Родитель
4980a9639b
Коммит
2651f6e7fe
|
@ -80,6 +80,7 @@ int set_debug = 0;
|
||||||
int show_ops = 0;
|
int show_ops = 0;
|
||||||
int show_activity = 0;
|
int show_activity = 0;
|
||||||
int output_lines = -1;
|
int output_lines = -1;
|
||||||
|
int sort_loss;
|
||||||
|
|
||||||
/* Debug options */
|
/* Debug options */
|
||||||
int sanity = 0;
|
int sanity = 0;
|
||||||
|
@ -126,6 +127,7 @@ static void usage(void)
|
||||||
"-z|--zero Include empty slabs\n"
|
"-z|--zero Include empty slabs\n"
|
||||||
"-1|--1ref Single reference\n"
|
"-1|--1ref Single reference\n"
|
||||||
"-N|--lines=K Show the first K slabs\n"
|
"-N|--lines=K Show the first K slabs\n"
|
||||||
|
"-L|--Loss Sort by loss\n"
|
||||||
"\nValid debug options (FZPUT may be combined)\n"
|
"\nValid debug options (FZPUT may be combined)\n"
|
||||||
"a / A Switch on all debug options (=FZUP)\n"
|
"a / A Switch on all debug options (=FZUP)\n"
|
||||||
"- Switch off all debug options\n"
|
"- Switch off all debug options\n"
|
||||||
|
@ -301,8 +303,9 @@ static void first_line(void)
|
||||||
if (show_activity)
|
if (show_activity)
|
||||||
printf("Name Objects Alloc Free %%Fast Fallb O CmpX UL\n");
|
printf("Name Objects Alloc Free %%Fast Fallb O CmpX UL\n");
|
||||||
else
|
else
|
||||||
printf("Name Objects Objsize Space "
|
printf("Name Objects Objsize %s "
|
||||||
"Slabs/Part/Cpu O/S O %%Fr %%Ef Flg\n");
|
"Slabs/Part/Cpu O/S O %%Fr %%Ef Flg\n",
|
||||||
|
sort_loss ? "Loss" : "Space");
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -335,6 +338,11 @@ static unsigned long slab_activity(struct slabinfo *s)
|
||||||
s->alloc_slowpath + s->free_slowpath;
|
s->alloc_slowpath + s->free_slowpath;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static unsigned long slab_waste(struct slabinfo *s)
|
||||||
|
{
|
||||||
|
return slab_size(s) - s->objects * s->object_size;
|
||||||
|
}
|
||||||
|
|
||||||
static void slab_numa(struct slabinfo *s, int mode)
|
static void slab_numa(struct slabinfo *s, int mode)
|
||||||
{
|
{
|
||||||
int node;
|
int node;
|
||||||
|
@ -563,7 +571,10 @@ static void slabcache(struct slabinfo *s)
|
||||||
if (show_empty && s->slabs)
|
if (show_empty && s->slabs)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
store_size(size_str, slab_size(s));
|
if (sort_loss == 0)
|
||||||
|
store_size(size_str, slab_size(s));
|
||||||
|
else
|
||||||
|
store_size(size_str, slab_waste(s));
|
||||||
snprintf(dist_str, 40, "%lu/%lu/%d", s->slabs - s->cpu_slabs,
|
snprintf(dist_str, 40, "%lu/%lu/%d", s->slabs - s->cpu_slabs,
|
||||||
s->partial, s->cpu_slabs);
|
s->partial, s->cpu_slabs);
|
||||||
|
|
||||||
|
@ -1013,6 +1024,8 @@ static void sort_slabs(void)
|
||||||
result = slab_size(s1) < slab_size(s2);
|
result = slab_size(s1) < slab_size(s2);
|
||||||
else if (sort_active)
|
else if (sort_active)
|
||||||
result = slab_activity(s1) < slab_activity(s2);
|
result = slab_activity(s1) < slab_activity(s2);
|
||||||
|
else if (sort_loss)
|
||||||
|
result = slab_waste(s1) < slab_waste(s2);
|
||||||
else
|
else
|
||||||
result = strcasecmp(s1->name, s2->name);
|
result = strcasecmp(s1->name, s2->name);
|
||||||
|
|
||||||
|
@ -1291,6 +1304,7 @@ struct option opts[] = {
|
||||||
{ "zero", no_argument, NULL, 'z' },
|
{ "zero", no_argument, NULL, 'z' },
|
||||||
{ "1ref", no_argument, NULL, '1'},
|
{ "1ref", no_argument, NULL, '1'},
|
||||||
{ "lines", required_argument, NULL, 'N'},
|
{ "lines", required_argument, NULL, 'N'},
|
||||||
|
{ "Loss", no_argument, NULL, 'L'},
|
||||||
{ NULL, 0, NULL, 0 }
|
{ NULL, 0, NULL, 0 }
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -1302,7 +1316,7 @@ int main(int argc, char *argv[])
|
||||||
|
|
||||||
page_size = getpagesize();
|
page_size = getpagesize();
|
||||||
|
|
||||||
while ((c = getopt_long(argc, argv, "aAd::Defhil1noprstvzTSN:",
|
while ((c = getopt_long(argc, argv, "aAd::Defhil1noprstvzTSN:L",
|
||||||
opts, NULL)) != -1)
|
opts, NULL)) != -1)
|
||||||
switch (c) {
|
switch (c) {
|
||||||
case '1':
|
case '1':
|
||||||
|
@ -1371,6 +1385,9 @@ int main(int argc, char *argv[])
|
||||||
output_lines = 1;
|
output_lines = 1;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
case 'L':
|
||||||
|
sort_loss = 1;
|
||||||
|
break;
|
||||||
default:
|
default:
|
||||||
fatal("%s: Invalid option '%c'\n", argv[0], optopt);
|
fatal("%s: Invalid option '%c'\n", argv[0], optopt);
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче