* [PATCH 1/4] tools/vm/slabinfo: Update options in usage message
2019-02-12 0:12 [PATCH 0/4] tools/vm/slabinfo: Clean up slabinfo -h Tobin C. Harding
@ 2019-02-12 0:12 ` Tobin C. Harding
2019-02-12 0:12 ` [PATCH 2/4] tools/vm/slabinfo: Put options in alphabetic order Tobin C. Harding
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Tobin C. Harding @ 2019-02-12 0:12 UTC (permalink / raw)
To: Andrew Morton; +Cc: Tobin C. Harding, Christopher Lameter, linux-kernel
Currently usage message list only a subset of the available options.
should list them all.
Update options in usage massage to include all available options.
Signed-off-by: Tobin C. Harding <tobin@kernel.org>
Acked-by: Christoph Lameter <cl@linux.com>
---
tools/vm/slabinfo.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/vm/slabinfo.c b/tools/vm/slabinfo.c
index 334b16db0ebb..d3908c50c87c 100644
--- a/tools/vm/slabinfo.c
+++ b/tools/vm/slabinfo.c
@@ -110,7 +110,7 @@ static void fatal(const char *x, ...)
static void usage(void)
{
printf("slabinfo 4/15/2011. (c) 2007 sgi/(c) 2011 Linux Foundation.\n\n"
- "slabinfo [-ahnpvtsz] [-d debugopts] [slab-regexp]\n"
+ "slabinfo [-aADefhilnosrStTvz1LXBU] [N=K] [-dafzput] [slab-regexp]\n"
"-a|--aliases Show aliases\n"
"-A|--activity Most active slabs first\n"
"-d<options>|--debug=<options> Set/Clear Debug options\n"
--
2.20.1
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH 2/4] tools/vm/slabinfo: Put options in alphabetic order
2019-02-12 0:12 [PATCH 0/4] tools/vm/slabinfo: Clean up slabinfo -h Tobin C. Harding
2019-02-12 0:12 ` [PATCH 1/4] tools/vm/slabinfo: Update options in usage message Tobin C. Harding
@ 2019-02-12 0:12 ` Tobin C. Harding
2019-02-12 0:12 ` [PATCH 3/4] tools/vm/slabinfo: Align usage output columns Tobin C. Harding
2019-02-12 0:12 ` [PATCH 4/4] tools/vm/slabinfo: Clean up usage menu debug items Tobin C. Harding
3 siblings, 0 replies; 5+ messages in thread
From: Tobin C. Harding @ 2019-02-12 0:12 UTC (permalink / raw)
To: Andrew Morton; +Cc: Tobin C. Harding, Christopher Lameter, linux-kernel
Primarily the usage message lists options in alphabetic order however
there are a bunch of the options that are not in alphabetic order.
Put options in alphabetic order.
Signed-off-by: Tobin C. Harding <tobin@kernel.org>
Acked-by: Christoph Lameter <cl@linux.com>
---
tools/vm/slabinfo.c | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/tools/vm/slabinfo.c b/tools/vm/slabinfo.c
index d3908c50c87c..5119adb9d009 100644
--- a/tools/vm/slabinfo.c
+++ b/tools/vm/slabinfo.c
@@ -113,6 +113,7 @@ static void usage(void)
"slabinfo [-aADefhilnosrStTvz1LXBU] [N=K] [-dafzput] [slab-regexp]\n"
"-a|--aliases Show aliases\n"
"-A|--activity Most active slabs first\n"
+ "-B|--Bytes Show size in bytes\n"
"-d<options>|--debug=<options> Set/Clear Debug options\n"
"-D|--display-active Switch line format to activity\n"
"-e|--empty Show empty slabs\n"
@@ -120,21 +121,21 @@ static void usage(void)
"-h|--help Show usage information\n"
"-i|--inverted Inverted list\n"
"-l|--slabs Show slabs\n"
+ "-L|--Loss Sort by loss\n"
"-n|--numa Show NUMA information\n"
+ "-N|--lines=K Show the first K slabs\n"
"-o|--ops Show kmem_cache_ops\n"
- "-s|--shrink Shrink slabs\n"
"-r|--report Detailed report on single slabs\n"
+ "-s|--shrink Shrink slabs\n"
"-S|--Size Sort by size\n"
"-t|--tracking Show alloc/free information\n"
"-T|--Totals Show summary information\n"
+ "-U|--Unreclaim Show unreclaimable slabs only\n"
"-v|--validate Validate slabs\n"
"-z|--zero Include empty slabs\n"
"-1|--1ref Single reference\n"
- "-N|--lines=K Show the first K slabs\n"
- "-L|--Loss Sort by loss\n"
"-X|--Xtotals Show extended summary information\n"
- "-B|--Bytes Show size in bytes\n"
- "-U|--Unreclaim Show unreclaimable slabs only\n"
+
"\nValid debug options (FZPUT may be combined)\n"
"a / A Switch on all debug options (=FZUP)\n"
"- Switch off all debug options\n"
--
2.20.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 3/4] tools/vm/slabinfo: Align usage output columns
2019-02-12 0:12 [PATCH 0/4] tools/vm/slabinfo: Clean up slabinfo -h Tobin C. Harding
2019-02-12 0:12 ` [PATCH 1/4] tools/vm/slabinfo: Update options in usage message Tobin C. Harding
2019-02-12 0:12 ` [PATCH 2/4] tools/vm/slabinfo: Put options in alphabetic order Tobin C. Harding
@ 2019-02-12 0:12 ` Tobin C. Harding
2019-02-12 0:12 ` [PATCH 4/4] tools/vm/slabinfo: Clean up usage menu debug items Tobin C. Harding
3 siblings, 0 replies; 5+ messages in thread
From: Tobin C. Harding @ 2019-02-12 0:12 UTC (permalink / raw)
To: Andrew Morton; +Cc: Tobin C. Harding, Christopher Lameter, linux-kernel
Usage message uses spaces not tabspaces, a few tabspaces have snuck in
making the columns not align correctly when output.
Align usage output columns using spaces instead of tabspaces.
Signed-off-by: Tobin C. Harding <tobin@kernel.org>
Acked-by: Christoph Lameter <cl@linux.com>
---
tools/vm/slabinfo.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/tools/vm/slabinfo.c b/tools/vm/slabinfo.c
index 5119adb9d009..97715b73af70 100644
--- a/tools/vm/slabinfo.c
+++ b/tools/vm/slabinfo.c
@@ -124,13 +124,13 @@ static void usage(void)
"-L|--Loss Sort by loss\n"
"-n|--numa Show NUMA information\n"
"-N|--lines=K Show the first K slabs\n"
- "-o|--ops Show kmem_cache_ops\n"
- "-r|--report Detailed report on single slabs\n"
+ "-o|--ops Show kmem_cache_ops\n"
+ "-r|--report Detailed report on single slabs\n"
"-s|--shrink Shrink slabs\n"
"-S|--Size Sort by size\n"
"-t|--tracking Show alloc/free information\n"
"-T|--Totals Show summary information\n"
- "-U|--Unreclaim Show unreclaimable slabs only\n"
+ "-U|--Unreclaim Show unreclaimable slabs only\n"
"-v|--validate Validate slabs\n"
"-z|--zero Include empty slabs\n"
"-1|--1ref Single reference\n"
--
2.20.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 4/4] tools/vm/slabinfo: Clean up usage menu debug items
2019-02-12 0:12 [PATCH 0/4] tools/vm/slabinfo: Clean up slabinfo -h Tobin C. Harding
` (2 preceding siblings ...)
2019-02-12 0:12 ` [PATCH 3/4] tools/vm/slabinfo: Align usage output columns Tobin C. Harding
@ 2019-02-12 0:12 ` Tobin C. Harding
3 siblings, 0 replies; 5+ messages in thread
From: Tobin C. Harding @ 2019-02-12 0:12 UTC (permalink / raw)
To: Andrew Morton; +Cc: Tobin C. Harding, Christopher Lameter, linux-kernel
Attempt to make the usage comment for debug options a little cleaner.
Signed-off-by: Tobin C. Harding <tobin@kernel.org>
Acked-by: Christoph Lameter <cl@linux.com>
---
tools/vm/slabinfo.c | 20 +++++++++++---------
1 file changed, 11 insertions(+), 9 deletions(-)
diff --git a/tools/vm/slabinfo.c b/tools/vm/slabinfo.c
index 97715b73af70..73818f1b2ef8 100644
--- a/tools/vm/slabinfo.c
+++ b/tools/vm/slabinfo.c
@@ -114,7 +114,6 @@ static void usage(void)
"-a|--aliases Show aliases\n"
"-A|--activity Most active slabs first\n"
"-B|--Bytes Show size in bytes\n"
- "-d<options>|--debug=<options> Set/Clear Debug options\n"
"-D|--display-active Switch line format to activity\n"
"-e|--empty Show empty slabs\n"
"-f|--first-alias Show first alias\n"
@@ -136,14 +135,17 @@ static void usage(void)
"-1|--1ref Single reference\n"
"-X|--Xtotals Show extended summary information\n"
- "\nValid debug options (FZPUT may be combined)\n"
- "a / A Switch on all debug options (=FZUP)\n"
- "- Switch off all debug options\n"
- "f / F Sanity Checks (SLAB_CONSISTENCY_CHECKS)\n"
- "z / Z Redzoning\n"
- "p / P Poisoning\n"
- "u / U Tracking\n"
- "t / T Tracing\n"
+ "\n"
+ "-d | --debug Switch off all debug options\n"
+ "-da | --debug=a Switch on all debug options (--debug=FZPU)\n"
+
+ "\n"
+ "-d[afzput] | --debug=[afzput]\n"
+ " f | F Sanity Checks (SLAB_CONSISTENCY_CHECKS)\n"
+ " z | Z Redzoning\n"
+ " p | P Poisoning\n"
+ " u | U Tracking\n"
+ " t | T Tracing\n"
);
}
--
2.20.1
^ permalink raw reply related [flat|nested] 5+ messages in thread