6:13 a.m.
Hi,
The first patch changes dump_kmeminfo() to report overcommit information
similar to that displayed under the proc/meminfo file. It may be useful to
indicate memory over commitment abuse, for example with forced vmcores from
system hangs due to shortage of memory. The intended output is as follows:
crash> kmem -i
PAGES TOTAL PERCENTAGE
TOTAL MEM 1965332 7.5 GB ----
FREE 78080 305 MB 3% of TOTAL MEM
USED 1887252 7.2 GB 96% of TOTAL MEM
SHARED 789954 3 GB 40% of TOTAL MEM
BUFFERS 110606 432.1 MB 5% of TOTAL MEM
CACHED 1212645 4.6 GB 61% of TOTAL MEM
SLAB 146563 572.5 MB 7% of TOTAL MEM
TOTAL SWAP 1970175 7.5 GB ----
SWAP USED 5 20 KB 0% of TOTAL SWAP
SWAP FREE 1970170 7.5 GB 99% of TOTAL SWAP
COMMIT LIMIT 2952841 11.3 GB ----
COMMITTED 1150595 4.4 GB 38% of TOTAL LIMIT
The second patch simply removes dump_zone_page_usage().
Tested under 3.16.4-200.fc20.x86_64 only.
Though this should work under RHEL5 (2.6.18) and above.
Aaron Tomlin (2):
crash: Show memory overcommit data in dump_kmeminfo()
crash: kill dump_zone_page_usage()
help.c | 40 +++++------
memory.c | 229 ++++++++++++++++++++++++++++++++-------------------------------
2 files changed, 134 insertions(+), 135 deletions(-)
--
1.9.3
6:13 a.m.
New subject: [RFC PATCH 1/2] crash: Show memory overcommit data in dump_kmeminfo()
This patch changes dump_kmeminfo() to report overcommit information similar
to that displayed under the proc/meminfo file. It may be useful to indicate
memory over commitment abuse, for example with forced vmcores from system
hangs due to shortage of memory. The intended output is as follows:
crash> kmem -i
PAGES TOTAL PERCENTAGE
TOTAL MEM 1965332 7.5 GB ----
FREE 78080 305 MB 3% of TOTAL MEM
USED 1887252 7.2 GB 96% of TOTAL MEM
SHARED 789954 3 GB 40% of TOTAL MEM
BUFFERS 110606 432.1 MB 5% of TOTAL MEM
CACHED 1212645 4.6 GB 61% of TOTAL MEM
SLAB 146563 572.5 MB 7% of TOTAL MEM
TOTAL SWAP 1970175 7.5 GB ----
SWAP USED 5 20 KB 0% of TOTAL SWAP
SWAP FREE 1970170 7.5 GB 99% of TOTAL SWAP
COMMIT LIMIT 2952841 11.3 GB ----
COMMITTED 1150595 4.4 GB 38% of TOTAL LIMIT
Tested under 3.16.4-200.fc20.x86_64 only.
Though this should work under RHEL5 (2.6.18) and above.
Signed-off-by: Aaron Tomlin <atomlin(a)redhat.com>
Suggested-by: Alexis Solanas <alexis(a)redhat.com>
---
help.c | 33 ++++++++--------
memory.c | 132 +++++++++++++++++++++++++++++++++++++++++++++++++++++++--------
2 files changed, 134 insertions(+), 31 deletions(-)
diff --git a/help.c b/help.c
index 6aa3e20..bedd7c3 100644
--- a/help.c
+++ b/help.c
@@ -5587,23 +5587,26 @@ char *help_kmem[] = {
"\nEXAMPLES",
" Display memory usage information:\n",
" %s> kmem -i",
-" PAGES TOTAL PERCENTAGE",
-" TOTAL MEM 63602 248.4 MB ----",
-" FREE 993 3.9 MB 1% of TOTAL MEM",
-" USED 62609 244.6 MB 98% of TOTAL MEM",
-" SHARED 34035 132.9 MB 53% of TOTAL MEM",
-" BUFFERS 10928 42.7 MB 17% of TOTAL MEM",
-" CACHED 35249 137.7 MB 55% of TOTAL MEM",
-" SLAB 2823 11 MB 4% of TOTAL MEM",
+" PAGES TOTAL PERCENTAGE",
+" TOTAL MEM 63602 248.4 MB ----",
+" FREE 993 3.9 MB 1% of TOTAL MEM",
+" USED 62609 244.6 MB 98% of TOTAL MEM",
+" SHARED 34035 132.9 MB 53% of TOTAL MEM",
+" BUFFERS 10928 42.7 MB 17% of TOTAL MEM",
+" CACHED 35249 137.7 MB 55% of TOTAL MEM",
+" SLAB 2823 11 MB 4% of TOTAL MEM",
" ",
-" TOTAL HIGH 0 0 0% of TOTAL MEM",
-" FREE HIGH 0 0 0% of TOTAL HIGH",
-" TOTAL LOW 63602 248.4 MB 100% of TOTAL MEM",
-" FREE LOW 993 3.9 MB 1% of TOTAL LOW",
+" TOTAL HIGH 0 0 0% of TOTAL MEM",
+" FREE HIGH 0 0 0% of TOTAL HIGH",
+" TOTAL LOW 63602 248.4 MB 100% of TOTAL MEM",
+" FREE LOW 993 3.9 MB 1% of TOTAL LOW",
" ",
-" TOTAL SWAP 129792 507 MB ----",
-" SWAP USED 14727 57.5 MB 11% of TOTAL SWAP",
-" SWAP FREE 115065 449.5 MB 88% of TOTAL SWAP",
+" TOTAL SWAP 129792 507 MB ----",
+" SWAP USED 14727 57.5 MB 11% of TOTAL SWAP",
+" SWAP FREE 115065 449.5 MB 88% of TOTAL SWAP",
+" ",
+" COMMIT LIMIT 2952841 11.3 GB ----",
+" COMMITTED 1158600 4.4 GB 39% of TOTAL LIMIT",
" ",
" ZONE NAME FREE ACTIVE INACTIVE_DIRTY INACTIVE_CLEAN
MIN/LOW/HIGH",
" 0 DMA 240 1166 7 161 128/256/384
",
diff --git a/memory.c b/memory.c
index 3ac928d..823ec75 100644
--- a/memory.c
+++ b/memory.c
@@ -227,6 +227,7 @@ static int vm_area_page_dump(ulong, ulong, ulong, ulong, ulong,
struct reference *);
static void rss_page_types_init(void);
static int dump_swap_info(ulong, ulong *, ulong *);
+static ulong hugetlb_total_pages(void);
static void swap_info_init(void);
static char *get_swapdev(ulong, char *);
static void fill_swap_info(ulong);
@@ -4627,7 +4628,7 @@ cmd_kmem(void)
}
- if (iflag == 1)
+ if (iflag)
dump_kmeminfo();
if (pflag == 1)
@@ -7653,7 +7654,7 @@ bailout:
* by /proc/meminfo, and then some...
*/
-char *kmeminfo_hdr = " PAGES TOTAL PERCENTAGE\n";
+char *kmeminfo_hdr = " PAGES TOTAL PERCENTAGE\n";
static void
dump_kmeminfo(void)
@@ -7670,6 +7671,10 @@ dump_kmeminfo(void)
ulong freehighmem_pages;
ulong totallowmem_pages;
ulong freelowmem_pages;
+ ulong allowed;
+ long committed;
+ ulong overcommit_kbytes;
+ int overcommit_ratio;
long nr_file_pages, nr_slab;
ulong swapper_space_nrpages;
ulong pct;
@@ -7720,7 +7725,7 @@ dump_kmeminfo(void)
} else
totalram_pages = get_totalram;
- fprintf(fp, "%10s %7ld %11s ----\n", "TOTAL MEM",
+ fprintf(fp, "%13s %7ld %11s ----\n", "TOTAL MEM",
totalram_pages, pages_to_size(totalram_pages, buf));
/*
@@ -7731,12 +7736,12 @@ dump_kmeminfo(void)
vt->dump_free_pages(&meminfo);
freeram_pages = meminfo.retval;
pct = (freeram_pages * 100)/totalram_pages;
- fprintf(fp, "%10s %7ld %11s %3ld%% of TOTAL MEM\n",
+ fprintf(fp, "%13s %7ld %11s %3ld%% of TOTAL MEM\n",
"FREE", freeram_pages, pages_to_size(freeram_pages, buf), pct);
used_pages = totalram_pages - freeram_pages;
pct = (used_pages * 100)/totalram_pages;
- fprintf(fp, "%10s %7ld %11s %3ld%% of TOTAL MEM\n",
+ fprintf(fp, "%13s %7ld %11s %3ld%% of TOTAL MEM\n",
"USED", used_pages, pages_to_size(used_pages, buf), pct);
/*
@@ -7745,7 +7750,7 @@ dump_kmeminfo(void)
* pages that have a count of greater than 1.
*/
pct = (shared_pages * 100)/totalram_pages;
- fprintf(fp, "%10s %7ld %11s %3ld%% of TOTAL MEM\n",
+ fprintf(fp, "%13s %7ld %11s %3ld%% of TOTAL MEM\n",
"SHARED", shared_pages, pages_to_size(shared_pages, buf), pct);
subtract_buffer_pages = 0;
@@ -7762,7 +7767,7 @@ dump_kmeminfo(void)
buffer_pages = 0;
pct = (buffer_pages * 100)/totalram_pages;
- fprintf(fp, "%10s %7ld %11s %3ld%% of TOTAL MEM\n",
+ fprintf(fp, "%13s %7ld %11s %3ld%% of TOTAL MEM\n",
"BUFFERS", buffer_pages, pages_to_size(buffer_pages, buf), pct);
if (CRASHDEBUG(1))
@@ -7816,7 +7821,7 @@ dump_kmeminfo(void)
pct = (page_cache_size * 100)/totalram_pages;
- fprintf(fp, "%10s %7ld %11s %3ld%% of TOTAL MEM\n",
+ fprintf(fp, "%13s %7ld %11s %3ld%% of TOTAL MEM\n",
"CACHED", page_cache_size,
pages_to_size(page_cache_size, buf), pct);
@@ -7826,7 +7831,7 @@ dump_kmeminfo(void)
*/
pct = (get_slabs * 100)/totalram_pages;
- fprintf(fp, "%10s %7ld %11s %3ld%% of TOTAL MEM\n",
+ fprintf(fp, "%13s %7ld %11s %3ld%% of TOTAL MEM\n",
"SLAB", get_slabs, pages_to_size(get_slabs, buf), pct);
if (symbol_exists("totalhigh_pages")) {
@@ -7851,7 +7856,7 @@ dump_kmeminfo(void)
pct = totalhigh_pages ?
(totalhigh_pages * 100)/totalram_pages : 0;
- fprintf(fp, "\n%10s %7ld %11s %3ld%% of TOTAL MEM\n",
+ fprintf(fp, "\n%13s %7ld %11s %3ld%% of TOTAL MEM\n",
"TOTAL HIGH", totalhigh_pages,
pages_to_size(totalhigh_pages, buf), pct);
@@ -7860,19 +7865,19 @@ dump_kmeminfo(void)
freehighmem_pages = meminfo.retval;
pct = freehighmem_pages ?
(freehighmem_pages * 100)/totalhigh_pages : 0;
- fprintf(fp, "%10s %7ld %11s %3ld%% of TOTAL HIGH\n",
+ fprintf(fp, "%13s %7ld %11s %3ld%% of TOTAL HIGH\n",
"FREE HIGH", freehighmem_pages,
pages_to_size(freehighmem_pages, buf), pct);
totallowmem_pages = totalram_pages - totalhigh_pages;
pct = (totallowmem_pages * 100)/totalram_pages;
- fprintf(fp, "%10s %7ld %11s %3ld%% of TOTAL MEM\n",
+ fprintf(fp, "%13s %7ld %11s %3ld%% of TOTAL MEM\n",
"TOTAL LOW", totallowmem_pages,
pages_to_size(totallowmem_pages, buf), pct);
freelowmem_pages = freeram_pages - freehighmem_pages;
pct = (freelowmem_pages * 100)/totallowmem_pages;
- fprintf(fp, "%10s %7ld %11s %3ld%% of TOTAL LOW\n",
+ fprintf(fp, "%13s %7ld %11s %3ld%% of TOTAL LOW\n",
"FREE LOW", freelowmem_pages,
pages_to_size(freelowmem_pages, buf), pct);
}
@@ -7884,18 +7889,18 @@ dump_kmeminfo(void)
if (symbol_exists("swapper_space") ||
symbol_exists("swapper_spaces")) {
if (dump_swap_info(RETURN_ON_ERROR, &totalswap_pages,
&totalused_pages)) {
- fprintf(fp, "%10s %7ld %11s ----\n",
+ fprintf(fp, "%13s %7ld %11s ----\n",
"TOTAL SWAP", totalswap_pages,
pages_to_size(totalswap_pages, buf));
pct = totalswap_pages ? (totalused_pages * 100) /
totalswap_pages : 100;
- fprintf(fp, "%10s %7ld %11s %3ld%% of TOTAL SWAP\n",
+ fprintf(fp, "%13s %7ld %11s %3ld%% of TOTAL SWAP\n",
"SWAP USED", totalused_pages,
pages_to_size(totalused_pages, buf), pct);
pct = totalswap_pages ?
((totalswap_pages - totalused_pages) *
100) / totalswap_pages : 0;
- fprintf(fp, "%10s %7ld %11s %3ld%% of TOTAL SWAP\n",
+ fprintf(fp, "%13s %7ld %11s %3ld%% of TOTAL SWAP\n",
"SWAP FREE",
totalswap_pages - totalused_pages,
pages_to_size(totalswap_pages - totalused_pages,
@@ -7905,6 +7910,56 @@ dump_kmeminfo(void)
"swap_info[%ld].swap_map at %lx is inaccessible\n",
totalused_pages, totalswap_pages);
}
+ /*
+ * Show committed memory
+ */
+ if (kernel_symbol_exists("sysctl_overcommit_memory")) {
+ fprintf(fp, "\n");
+ if (kernel_symbol_exists("sysctl_overcommit_kbytes")) {
+ get_symbol_data("sysctl_overcommit_kbytes",
+ sizeof(ulong), &overcommit_kbytes);
+ if (overcommit_kbytes)
+ allowed = overcommit_kbytes >>
+ (machdep->pageshift - 10);
+ else {
+ get_symbol_data("sysctl_overcommit_ratio",
+ sizeof(int),
+ &overcommit_ratio);
+ allowed = ((totalram_pages - hugetlb_total_pages())
+ * overcommit_ratio / 100);
+ }
+ }
+ if (symbol_exists("vm_committed_as")) {
+ readmem(symbol_value("vm_committed_as") +
+ MEMBER_OFFSET("percpu_counter",
+ "count"), KVADDR,
+ &committed,
+ sizeof(long),
+ "percpu_counter count",
+ FAULT_ON_ERROR);
+
+ /* Ensure always positive */
+ if (committed < 0)
+ committed = 0;
+ } else {
+ readmem(symbol_value("vm_committed_space") +
+ MEMBER_OFFSET("atomic_t",
+ "counter"), KVADDR,
+ &committed, sizeof(int),
+ "atomic_t counter",
+ FAULT_ON_ERROR);
+ }
+ allowed += totalswap_pages;
+ fprintf(fp, "%13s %7ld %11s ----\n",
+ "COMMIT LIMIT", allowed,
+ pages_to_size(allowed, buf));
+
+ pct = committed ? ((committed * 100)
+ / allowed) : 0;
+ fprintf(fp, "%13s %7ld %11s %3ld%% of TOTAL LIMIT\n",
+ "COMMITTED", committed,
+ pages_to_size(committed, buf), pct);
+ }
dump_zone_page_usage();
}
@@ -14734,6 +14789,51 @@ next_physpage(ulonglong paddr, ulonglong *nextpaddr)
return FALSE;
}
+ulong
+hugetlb_total_pages(void)
+{
+ ulong hstate_p;
+ int i, len;
+ ulong nr_total_pages = 0;
+ ulong nr_huge_pages;
+ uint horder;
+
+ if (kernel_symbol_exists("hstates")) {
+ STRUCT_SIZE_INIT(hstate, "hstate");
+ MEMBER_OFFSET_INIT(hstate_order, "hstate", "order");
+ MEMBER_OFFSET_INIT(hstate_nr_huge_pages, "hstate",
"nr_huge_pages");
+
+ len = get_array_length("hstates", NULL, 0);
+ hstate_p = symbol_value("hstates");
+
+ for (i = 0; i < len; i++) {
+ hstate_p = hstate_p + (SIZE(hstate) * i);
+
+ readmem(hstate_p + OFFSET(hstate_order), KVADDR,
+ &horder, sizeof(uint),
+ "hstate_order",
+ FAULT_ON_ERROR);
+
+ readmem(hstate_p + OFFSET(hstate_nr_huge_pages), KVADDR,
+ &nr_huge_pages, sizeof(ulong),
+ "hstate_nr_huge_pages",
+ FAULT_ON_ERROR);
+
+ nr_total_pages += nr_huge_pages * (1 << horder);
+ }
+ } else if (kernel_symbol_exists("nr_huge_pages")) {
+ unsigned long hpage_shift = 21;
+
+ if ((machine_type("X86") && !(machdep->flags & PAE)))
+ hpage_shift = 22;
+ get_symbol_data("nr_huge_pages",
+ sizeof(ulong), &nr_huge_pages);
+ nr_total_pages = nr_huge_pages * ((1 << hpage_shift) /
+ machdep->pagesize);
+ }
+ return nr_total_pages;
+}
+
/*
* Display swap statistics.
*/
--
1.9.3
11:06 a.m.
New subject: [RFC PATCH 1/2] crash: Show memory overcommit data in dump_kmeminfo()
Aaron,
I like the addition. But I've got a few nits regarding the patch.
Given that "kmem -i" is so commonly-used, I prefer not to introduce something
that could conceivably generate a command-killing "invalid structure member
offset" error. And that could happen in your hugetlb_total_pages() function
because of the hstate structure dependencies. (See dump_hstates() for example)
Also, in dump_kmeminfo() you use MEMBER_OFFSET(), which should be avoided
because it will quietly return -1 if the structure member doesn't exist,
leading to bogus output. That's the whole purpose behind using OFFSET(),
or at least storing/validating the MEMBER_OFFSET() return value before
blindly using it.
It may seem pedantic, but if history has shown us anything, it's that
kernel developers cannot stop themselves from changing structure/member
names.
So if you could just adjust those kinds of issues, this patch would be
a nice addition.
Thanks,
Dave
----- Original Message -----
This patch changes dump_kmeminfo() to report overcommit information
similar
to that displayed under the proc/meminfo file. It may be useful to indicate
memory over commitment abuse, for example with forced vmcores from system
hangs due to shortage of memory. The intended output is as follows:
crash> kmem -i
PAGES TOTAL PERCENTAGE
TOTAL MEM 1965332 7.5 GB ----
FREE 78080 305 MB 3% of TOTAL MEM
USED 1887252 7.2 GB 96% of TOTAL MEM
SHARED 789954 3 GB 40% of TOTAL MEM
BUFFERS 110606 432.1 MB 5% of TOTAL MEM
CACHED 1212645 4.6 GB 61% of TOTAL MEM
SLAB 146563 572.5 MB 7% of TOTAL MEM
TOTAL SWAP 1970175 7.5 GB ----
SWAP USED 5 20 KB 0% of TOTAL SWAP
SWAP FREE 1970170 7.5 GB 99% of TOTAL SWAP
COMMIT LIMIT 2952841 11.3 GB ----
COMMITTED 1150595 4.4 GB 38% of TOTAL LIMIT
Tested under 3.16.4-200.fc20.x86_64 only.
Though this should work under RHEL5 (2.6.18) and above.
Signed-off-by: Aaron Tomlin <atomlin(a)redhat.com>
Suggested-by: Alexis Solanas <alexis(a)redhat.com>
---
help.c | 33 ++++++++--------
memory.c | 132
+++++++++++++++++++++++++++++++++++++++++++++++++++++++--------
2 files changed, 134 insertions(+), 31 deletions(-)
diff --git a/help.c b/help.c
index 6aa3e20..bedd7c3 100644
--- a/help.c
+++ b/help.c
@@ -5587,23 +5587,26 @@ char *help_kmem[] = {
"\nEXAMPLES",
" Display memory usage information:\n",
" %s> kmem -i",
-" PAGES TOTAL PERCENTAGE",
-" TOTAL MEM 63602 248.4 MB ----",
-" FREE 993 3.9 MB 1% of TOTAL MEM",
-" USED 62609 244.6 MB 98% of TOTAL MEM",
-" SHARED 34035 132.9 MB 53% of TOTAL MEM",
-" BUFFERS 10928 42.7 MB 17% of TOTAL MEM",
-" CACHED 35249 137.7 MB 55% of TOTAL MEM",
-" SLAB 2823 11 MB 4% of TOTAL MEM",
+" PAGES TOTAL PERCENTAGE",
+" TOTAL MEM 63602 248.4 MB ----",
+" FREE 993 3.9 MB 1% of TOTAL MEM",
+" USED 62609 244.6 MB 98% of TOTAL MEM",
+" SHARED 34035 132.9 MB 53% of TOTAL MEM",
+" BUFFERS 10928 42.7 MB 17% of TOTAL MEM",
+" CACHED 35249 137.7 MB 55% of TOTAL MEM",
+" SLAB 2823 11 MB 4% of TOTAL MEM",
" ",
-" TOTAL HIGH 0 0 0% of TOTAL MEM",
-" FREE HIGH 0 0 0% of TOTAL HIGH",
-" TOTAL LOW 63602 248.4 MB 100% of TOTAL MEM",
-" FREE LOW 993 3.9 MB 1% of TOTAL LOW",
+" TOTAL HIGH 0 0 0% of TOTAL MEM",
+" FREE HIGH 0 0 0% of TOTAL HIGH",
+" TOTAL LOW 63602 248.4 MB 100% of TOTAL MEM",
+" FREE LOW 993 3.9 MB 1% of TOTAL LOW",
" ",
-" TOTAL SWAP 129792 507 MB ----",
-" SWAP USED 14727 57.5 MB 11% of TOTAL SWAP",
-" SWAP FREE 115065 449.5 MB 88% of TOTAL SWAP",
+" TOTAL SWAP 129792 507 MB ----",
+" SWAP USED 14727 57.5 MB 11% of TOTAL SWAP",
+" SWAP FREE 115065 449.5 MB 88% of TOTAL SWAP",
+" ",
+" COMMIT LIMIT 2952841 11.3 GB ----",
+" COMMITTED 1158600 4.4 GB 39% of TOTAL LIMIT",
" ",
" ZONE NAME FREE ACTIVE INACTIVE_DIRTY INACTIVE_CLEAN
MIN/LOW/HIGH",
" 0 DMA 240 1166 7 161
128/256/384 ",
diff --git a/memory.c b/memory.c
index 3ac928d..823ec75 100644
--- a/memory.c
+++ b/memory.c
@@ -227,6 +227,7 @@ static int vm_area_page_dump(ulong, ulong, ulong, ulong,
ulong,
struct reference *);
static void rss_page_types_init(void);
static int dump_swap_info(ulong, ulong *, ulong *);
+static ulong hugetlb_total_pages(void);
static void swap_info_init(void);
static char *get_swapdev(ulong, char *);
static void fill_swap_info(ulong);
@@ -4627,7 +4628,7 @@ cmd_kmem(void)
}
- if (iflag == 1)
+ if (iflag)
dump_kmeminfo();
if (pflag == 1)
@@ -7653,7 +7654,7 @@ bailout:
* by /proc/meminfo, and then some...
*/
-char *kmeminfo_hdr = " PAGES TOTAL PERCENTAGE\n";
+char *kmeminfo_hdr = " PAGES TOTAL
PERCENTAGE\n";
static void
dump_kmeminfo(void)
@@ -7670,6 +7671,10 @@ dump_kmeminfo(void)
ulong freehighmem_pages;
ulong totallowmem_pages;
ulong freelowmem_pages;
+ ulong allowed;
+ long committed;
+ ulong overcommit_kbytes;
+ int overcommit_ratio;
long nr_file_pages, nr_slab;
ulong swapper_space_nrpages;
ulong pct;
@@ -7720,7 +7725,7 @@ dump_kmeminfo(void)
} else
totalram_pages = get_totalram;
- fprintf(fp, "%10s %7ld %11s ----\n", "TOTAL MEM",
+ fprintf(fp, "%13s %7ld %11s ----\n", "TOTAL MEM",
totalram_pages, pages_to_size(totalram_pages, buf));
/*
@@ -7731,12 +7736,12 @@ dump_kmeminfo(void)
vt->dump_free_pages(&meminfo);
freeram_pages = meminfo.retval;
pct = (freeram_pages * 100)/totalram_pages;
- fprintf(fp, "%10s %7ld %11s %3ld%% of TOTAL MEM\n",
+ fprintf(fp, "%13s %7ld %11s %3ld%% of TOTAL MEM\n",
"FREE", freeram_pages, pages_to_size(freeram_pages, buf), pct);
used_pages = totalram_pages - freeram_pages;
pct = (used_pages * 100)/totalram_pages;
- fprintf(fp, "%10s %7ld %11s %3ld%% of TOTAL MEM\n",
+ fprintf(fp, "%13s %7ld %11s %3ld%% of TOTAL MEM\n",
"USED", used_pages, pages_to_size(used_pages, buf), pct);
/*
@@ -7745,7 +7750,7 @@ dump_kmeminfo(void)
* pages that have a count of greater than 1.
*/
pct = (shared_pages * 100)/totalram_pages;
- fprintf(fp, "%10s %7ld %11s %3ld%% of TOTAL MEM\n",
+ fprintf(fp, "%13s %7ld %11s %3ld%% of TOTAL MEM\n",
"SHARED", shared_pages, pages_to_size(shared_pages, buf), pct);
subtract_buffer_pages = 0;
@@ -7762,7 +7767,7 @@ dump_kmeminfo(void)
buffer_pages = 0;
pct = (buffer_pages * 100)/totalram_pages;
- fprintf(fp, "%10s %7ld %11s %3ld%% of TOTAL MEM\n",
+ fprintf(fp, "%13s %7ld %11s %3ld%% of TOTAL MEM\n",
"BUFFERS", buffer_pages, pages_to_size(buffer_pages, buf), pct);
if (CRASHDEBUG(1))
@@ -7816,7 +7821,7 @@ dump_kmeminfo(void)
pct = (page_cache_size * 100)/totalram_pages;
- fprintf(fp, "%10s %7ld %11s %3ld%% of TOTAL MEM\n",
+ fprintf(fp, "%13s %7ld %11s %3ld%% of TOTAL MEM\n",
"CACHED", page_cache_size,
pages_to_size(page_cache_size, buf), pct);
@@ -7826,7 +7831,7 @@ dump_kmeminfo(void)
*/
pct = (get_slabs * 100)/totalram_pages;
- fprintf(fp, "%10s %7ld %11s %3ld%% of TOTAL MEM\n",
+ fprintf(fp, "%13s %7ld %11s %3ld%% of TOTAL MEM\n",
"SLAB", get_slabs, pages_to_size(get_slabs, buf), pct);
if (symbol_exists("totalhigh_pages")) {
@@ -7851,7 +7856,7 @@ dump_kmeminfo(void)
pct = totalhigh_pages ?
(totalhigh_pages * 100)/totalram_pages : 0;
- fprintf(fp, "\n%10s %7ld %11s %3ld%% of TOTAL MEM\n",
+ fprintf(fp, "\n%13s %7ld %11s %3ld%% of TOTAL MEM\n",
"TOTAL HIGH", totalhigh_pages,
pages_to_size(totalhigh_pages, buf), pct);
@@ -7860,19 +7865,19 @@ dump_kmeminfo(void)
freehighmem_pages = meminfo.retval;
pct = freehighmem_pages ?
(freehighmem_pages * 100)/totalhigh_pages : 0;
- fprintf(fp, "%10s %7ld %11s %3ld%% of TOTAL HIGH\n",
+ fprintf(fp, "%13s %7ld %11s %3ld%% of TOTAL HIGH\n",
"FREE HIGH", freehighmem_pages,
pages_to_size(freehighmem_pages, buf), pct);
totallowmem_pages = totalram_pages - totalhigh_pages;
pct = (totallowmem_pages * 100)/totalram_pages;
- fprintf(fp, "%10s %7ld %11s %3ld%% of TOTAL MEM\n",
+ fprintf(fp, "%13s %7ld %11s %3ld%% of TOTAL MEM\n",
"TOTAL LOW", totallowmem_pages,
pages_to_size(totallowmem_pages, buf), pct);
freelowmem_pages = freeram_pages - freehighmem_pages;
pct = (freelowmem_pages * 100)/totallowmem_pages;
- fprintf(fp, "%10s %7ld %11s %3ld%% of TOTAL LOW\n",
+ fprintf(fp, "%13s %7ld %11s %3ld%% of TOTAL LOW\n",
"FREE LOW", freelowmem_pages,
pages_to_size(freelowmem_pages, buf), pct);
}
@@ -7884,18 +7889,18 @@ dump_kmeminfo(void)
if (symbol_exists("swapper_space") ||
symbol_exists("swapper_spaces")) {
if (dump_swap_info(RETURN_ON_ERROR, &totalswap_pages,
&totalused_pages)) {
- fprintf(fp, "%10s %7ld %11s ----\n",
+ fprintf(fp, "%13s %7ld %11s ----\n",
"TOTAL SWAP", totalswap_pages,
pages_to_size(totalswap_pages, buf));
pct = totalswap_pages ? (totalused_pages * 100) /
totalswap_pages : 100;
- fprintf(fp, "%10s %7ld %11s %3ld%% of TOTAL SWAP\n",
+ fprintf(fp, "%13s %7ld %11s %3ld%% of TOTAL SWAP\n",
"SWAP USED", totalused_pages,
pages_to_size(totalused_pages, buf), pct);
pct = totalswap_pages ?
((totalswap_pages - totalused_pages) *
100) / totalswap_pages : 0;
- fprintf(fp, "%10s %7ld %11s %3ld%% of TOTAL SWAP\n",
+ fprintf(fp, "%13s %7ld %11s %3ld%% of TOTAL SWAP\n",
"SWAP FREE",
totalswap_pages - totalused_pages,
pages_to_size(totalswap_pages - totalused_pages,
@@ -7905,6 +7910,56 @@ dump_kmeminfo(void)
"swap_info[%ld].swap_map at %lx is inaccessible\n",
totalused_pages, totalswap_pages);
}
+ /*
+ * Show committed memory
+ */
+ if (kernel_symbol_exists("sysctl_overcommit_memory")) {
+ fprintf(fp, "\n");
+ if (kernel_symbol_exists("sysctl_overcommit_kbytes")) {
+ get_symbol_data("sysctl_overcommit_kbytes",
+ sizeof(ulong), &overcommit_kbytes);
+ if (overcommit_kbytes)
+ allowed = overcommit_kbytes >>
+ (machdep->pageshift - 10);
+ else {
+ get_symbol_data("sysctl_overcommit_ratio",
+ sizeof(int),
+ &overcommit_ratio);
+ allowed = ((totalram_pages - hugetlb_total_pages())
+ * overcommit_ratio / 100);
+ }
+ }
+ if (symbol_exists("vm_committed_as")) {
+ readmem(symbol_value("vm_committed_as") +
+ MEMBER_OFFSET("percpu_counter",
+ "count"), KVADDR,
+ &committed,
+ sizeof(long),
+ "percpu_counter count",
+ FAULT_ON_ERROR);
+
+ /* Ensure always positive */
+ if (committed < 0)
+ committed = 0;
+ } else {
+ readmem(symbol_value("vm_committed_space") +
+ MEMBER_OFFSET("atomic_t",
+ "counter"), KVADDR,
+ &committed, sizeof(int),
+ "atomic_t counter",
+ FAULT_ON_ERROR);
+ }
+ allowed += totalswap_pages;
+ fprintf(fp, "%13s %7ld %11s ----\n",
+ "COMMIT LIMIT", allowed,
+ pages_to_size(allowed, buf));
+
+ pct = committed ? ((committed * 100)
+ / allowed) : 0;
+ fprintf(fp, "%13s %7ld %11s %3ld%% of TOTAL LIMIT\n",
+ "COMMITTED", committed,
+ pages_to_size(committed, buf), pct);
+ }
dump_zone_page_usage();
}
@@ -14734,6 +14789,51 @@ next_physpage(ulonglong paddr, ulonglong *nextpaddr)
return FALSE;
}
+ulong
+hugetlb_total_pages(void)
+{
+ ulong hstate_p;
+ int i, len;
+ ulong nr_total_pages = 0;
+ ulong nr_huge_pages;
+ uint horder;
+
+ if (kernel_symbol_exists("hstates")) {
+ STRUCT_SIZE_INIT(hstate, "hstate");
+ MEMBER_OFFSET_INIT(hstate_order, "hstate", "order");
+ MEMBER_OFFSET_INIT(hstate_nr_huge_pages, "hstate",
"nr_huge_pages");
+
+ len = get_array_length("hstates", NULL, 0);
+ hstate_p = symbol_value("hstates");
+
+ for (i = 0; i < len; i++) {
+ hstate_p = hstate_p + (SIZE(hstate) * i);
+
+ readmem(hstate_p + OFFSET(hstate_order), KVADDR,
+ &horder, sizeof(uint),
+ "hstate_order",
+ FAULT_ON_ERROR);
+
+ readmem(hstate_p + OFFSET(hstate_nr_huge_pages), KVADDR,
+ &nr_huge_pages, sizeof(ulong),
+ "hstate_nr_huge_pages",
+ FAULT_ON_ERROR);
+
+ nr_total_pages += nr_huge_pages * (1 << horder);
+ }
+ } else if (kernel_symbol_exists("nr_huge_pages")) {
+ unsigned long hpage_shift = 21;
+
+ if ((machine_type("X86") && !(machdep->flags & PAE)))
+ hpage_shift = 22;
+ get_symbol_data("nr_huge_pages",
+ sizeof(ulong), &nr_huge_pages);
+ nr_total_pages = nr_huge_pages * ((1 << hpage_shift) /
+ machdep->pagesize);
+ }
+ return nr_total_pages;
+}
+
/*
* Display swap statistics.
*/
--
1.9.3
--
Crash-utility mailing list
Crash-utility(a)redhat.com
https://www.redhat.com/mailman/listinfo/crash-utility
1:14 p.m.
New subject: [RFC PATCH 1/2] crash: Show memory overcommit data in dump_kmeminfo()
On Fri 2014-11-21 12:06 -0500, Dave Anderson wrote:
Aaron,
I like the addition. But I've got a few nits regarding the patch.
Given that "kmem -i" is so commonly-used, I prefer not to introduce something
that could conceivably generate a command-killing "invalid structure member
offset" error. And that could happen in your hugetlb_total_pages() function
because of the hstate structure dependencies. (See dump_hstates() for example)
Also, in dump_kmeminfo() you use MEMBER_OFFSET(), which should be avoided
because it will quietly return -1 if the structure member doesn't exist,
leading to bogus output. That's the whole purpose behind using OFFSET(),
or at least storing/validating the MEMBER_OFFSET() return value before
blindly using it.
It may seem pedantic, but if history has shown us anything, it's that
kernel developers cannot stop themselves from changing structure/member
names.
OK - understood.
So if you could just adjust those kinds of issues, this patch would
be
a nice addition.
Thanks. I'll work on a v2.
--
Aaron Tomlin
10:33 a.m.
New subject: [RFC PATCH 1/2] crash: Show memory overcommit data in dump_kmeminfo()
On Fri 2014-11-21 12:06 -0500, Dave Anderson wrote:
Aaron,
I like the addition. But I've got a few nits regarding the patch.
Given that "kmem -i" is so commonly-used, I prefer not to introduce something
that could conceivably generate a command-killing "invalid structure member
offset" error. And that could happen in your hugetlb_total_pages() function
because of the hstate structure dependencies. (See dump_hstates() for example)
Also, in dump_kmeminfo() you use MEMBER_OFFSET(), which should be avoided
because it will quietly return -1 if the structure member doesn't exist,
leading to bogus output. That's the whole purpose behind using OFFSET(),
or at least storing/validating the MEMBER_OFFSET() return value before
blindly using it.
OK understood.
--
Aaron Tomlin
2:32 p.m.
New subject: [RFC PATCH 1/2] crash: Show memory overcommit data in dump_kmeminfo()
Aaron -- FYI: this warning looks legit:
$ make warn
TARGET: X86_64
CRASH: 7.1.0rc5
GDB: 7.6
cc -c -g -DX86_64 -DLZO -DSNAPPY -DGDB_7_6 build_data.c -Wall -O2 -Wstrict-prototypes
-Wmissing-prototypes -fstack-protector -Wformat-security
cc -c -g -DX86_64 -DLZO -DSNAPPY -DGDB_7_6 memory.c -Wall -O2 -Wstrict-prototypes
-Wmissing-prototypes -fstack-protector -Wformat-security
memory.c: In function ‘dump_kmeminfo’:
memory.c:7952:11: warning: ‘allowed’ may be used uninitialized in this function
[-Wmaybe-uninitialized]
cc -c -g -DX86_64 -DLZO -DSNAPPY -DGDB_7_6 help.c -Wall -O2 -Wstrict-prototypes
-Wmissing-prototypes -fstack-protector -Wformat-security
...
Dave
----- Original Message -----
This patch changes dump_kmeminfo() to report overcommit information
similar
to that displayed under the proc/meminfo file. It may be useful to indicate
memory over commitment abuse, for example with forced vmcores from system
hangs due to shortage of memory. The intended output is as follows:
crash> kmem -i
PAGES TOTAL PERCENTAGE
TOTAL MEM 1965332 7.5 GB ----
FREE 78080 305 MB 3% of TOTAL MEM
USED 1887252 7.2 GB 96% of TOTAL MEM
SHARED 789954 3 GB 40% of TOTAL MEM
BUFFERS 110606 432.1 MB 5% of TOTAL MEM
CACHED 1212645 4.6 GB 61% of TOTAL MEM
SLAB 146563 572.5 MB 7% of TOTAL MEM
TOTAL SWAP 1970175 7.5 GB ----
SWAP USED 5 20 KB 0% of TOTAL SWAP
SWAP FREE 1970170 7.5 GB 99% of TOTAL SWAP
COMMIT LIMIT 2952841 11.3 GB ----
COMMITTED 1150595 4.4 GB 38% of TOTAL LIMIT
Tested under 3.16.4-200.fc20.x86_64 only.
Though this should work under RHEL5 (2.6.18) and above.
Signed-off-by: Aaron Tomlin <atomlin(a)redhat.com>
Suggested-by: Alexis Solanas <alexis(a)redhat.com>
---
help.c | 33 ++++++++--------
memory.c | 132
+++++++++++++++++++++++++++++++++++++++++++++++++++++++--------
2 files changed, 134 insertions(+), 31 deletions(-)
diff --git a/help.c b/help.c
index 6aa3e20..bedd7c3 100644
--- a/help.c
+++ b/help.c
@@ -5587,23 +5587,26 @@ char *help_kmem[] = {
"\nEXAMPLES",
" Display memory usage information:\n",
" %s> kmem -i",
-" PAGES TOTAL PERCENTAGE",
-" TOTAL MEM 63602 248.4 MB ----",
-" FREE 993 3.9 MB 1% of TOTAL MEM",
-" USED 62609 244.6 MB 98% of TOTAL MEM",
-" SHARED 34035 132.9 MB 53% of TOTAL MEM",
-" BUFFERS 10928 42.7 MB 17% of TOTAL MEM",
-" CACHED 35249 137.7 MB 55% of TOTAL MEM",
-" SLAB 2823 11 MB 4% of TOTAL MEM",
+" PAGES TOTAL PERCENTAGE",
+" TOTAL MEM 63602 248.4 MB ----",
+" FREE 993 3.9 MB 1% of TOTAL MEM",
+" USED 62609 244.6 MB 98% of TOTAL MEM",
+" SHARED 34035 132.9 MB 53% of TOTAL MEM",
+" BUFFERS 10928 42.7 MB 17% of TOTAL MEM",
+" CACHED 35249 137.7 MB 55% of TOTAL MEM",
+" SLAB 2823 11 MB 4% of TOTAL MEM",
" ",
-" TOTAL HIGH 0 0 0% of TOTAL MEM",
-" FREE HIGH 0 0 0% of TOTAL HIGH",
-" TOTAL LOW 63602 248.4 MB 100% of TOTAL MEM",
-" FREE LOW 993 3.9 MB 1% of TOTAL LOW",
+" TOTAL HIGH 0 0 0% of TOTAL MEM",
+" FREE HIGH 0 0 0% of TOTAL HIGH",
+" TOTAL LOW 63602 248.4 MB 100% of TOTAL MEM",
+" FREE LOW 993 3.9 MB 1% of TOTAL LOW",
" ",
-" TOTAL SWAP 129792 507 MB ----",
-" SWAP USED 14727 57.5 MB 11% of TOTAL SWAP",
-" SWAP FREE 115065 449.5 MB 88% of TOTAL SWAP",
+" TOTAL SWAP 129792 507 MB ----",
+" SWAP USED 14727 57.5 MB 11% of TOTAL SWAP",
+" SWAP FREE 115065 449.5 MB 88% of TOTAL SWAP",
+" ",
+" COMMIT LIMIT 2952841 11.3 GB ----",
+" COMMITTED 1158600 4.4 GB 39% of TOTAL LIMIT",
" ",
" ZONE NAME FREE ACTIVE INACTIVE_DIRTY INACTIVE_CLEAN
MIN/LOW/HIGH",
" 0 DMA 240 1166 7 161
128/256/384 ",
diff --git a/memory.c b/memory.c
index 3ac928d..823ec75 100644
--- a/memory.c
+++ b/memory.c
@@ -227,6 +227,7 @@ static int vm_area_page_dump(ulong, ulong, ulong, ulong,
ulong,
struct reference *);
static void rss_page_types_init(void);
static int dump_swap_info(ulong, ulong *, ulong *);
+static ulong hugetlb_total_pages(void);
static void swap_info_init(void);
static char *get_swapdev(ulong, char *);
static void fill_swap_info(ulong);
@@ -4627,7 +4628,7 @@ cmd_kmem(void)
}
- if (iflag == 1)
+ if (iflag)
dump_kmeminfo();
if (pflag == 1)
@@ -7653,7 +7654,7 @@ bailout:
* by /proc/meminfo, and then some...
*/
-char *kmeminfo_hdr = " PAGES TOTAL PERCENTAGE\n";
+char *kmeminfo_hdr = " PAGES TOTAL
PERCENTAGE\n";
static void
dump_kmeminfo(void)
@@ -7670,6 +7671,10 @@ dump_kmeminfo(void)
ulong freehighmem_pages;
ulong totallowmem_pages;
ulong freelowmem_pages;
+ ulong allowed;
+ long committed;
+ ulong overcommit_kbytes;
+ int overcommit_ratio;
long nr_file_pages, nr_slab;
ulong swapper_space_nrpages;
ulong pct;
@@ -7720,7 +7725,7 @@ dump_kmeminfo(void)
} else
totalram_pages = get_totalram;
- fprintf(fp, "%10s %7ld %11s ----\n", "TOTAL MEM",
+ fprintf(fp, "%13s %7ld %11s ----\n", "TOTAL MEM",
totalram_pages, pages_to_size(totalram_pages, buf));
/*
@@ -7731,12 +7736,12 @@ dump_kmeminfo(void)
vt->dump_free_pages(&meminfo);
freeram_pages = meminfo.retval;
pct = (freeram_pages * 100)/totalram_pages;
- fprintf(fp, "%10s %7ld %11s %3ld%% of TOTAL MEM\n",
+ fprintf(fp, "%13s %7ld %11s %3ld%% of TOTAL MEM\n",
"FREE", freeram_pages, pages_to_size(freeram_pages, buf), pct);
used_pages = totalram_pages - freeram_pages;
pct = (used_pages * 100)/totalram_pages;
- fprintf(fp, "%10s %7ld %11s %3ld%% of TOTAL MEM\n",
+ fprintf(fp, "%13s %7ld %11s %3ld%% of TOTAL MEM\n",
"USED", used_pages, pages_to_size(used_pages, buf), pct);
/*
@@ -7745,7 +7750,7 @@ dump_kmeminfo(void)
* pages that have a count of greater than 1.
*/
pct = (shared_pages * 100)/totalram_pages;
- fprintf(fp, "%10s %7ld %11s %3ld%% of TOTAL MEM\n",
+ fprintf(fp, "%13s %7ld %11s %3ld%% of TOTAL MEM\n",
"SHARED", shared_pages, pages_to_size(shared_pages, buf), pct);
subtract_buffer_pages = 0;
@@ -7762,7 +7767,7 @@ dump_kmeminfo(void)
buffer_pages = 0;
pct = (buffer_pages * 100)/totalram_pages;
- fprintf(fp, "%10s %7ld %11s %3ld%% of TOTAL MEM\n",
+ fprintf(fp, "%13s %7ld %11s %3ld%% of TOTAL MEM\n",
"BUFFERS", buffer_pages, pages_to_size(buffer_pages, buf), pct);
if (CRASHDEBUG(1))
@@ -7816,7 +7821,7 @@ dump_kmeminfo(void)
pct = (page_cache_size * 100)/totalram_pages;
- fprintf(fp, "%10s %7ld %11s %3ld%% of TOTAL MEM\n",
+ fprintf(fp, "%13s %7ld %11s %3ld%% of TOTAL MEM\n",
"CACHED", page_cache_size,
pages_to_size(page_cache_size, buf), pct);
@@ -7826,7 +7831,7 @@ dump_kmeminfo(void)
*/
pct = (get_slabs * 100)/totalram_pages;
- fprintf(fp, "%10s %7ld %11s %3ld%% of TOTAL MEM\n",
+ fprintf(fp, "%13s %7ld %11s %3ld%% of TOTAL MEM\n",
"SLAB", get_slabs, pages_to_size(get_slabs, buf), pct);
if (symbol_exists("totalhigh_pages")) {
@@ -7851,7 +7856,7 @@ dump_kmeminfo(void)
pct = totalhigh_pages ?
(totalhigh_pages * 100)/totalram_pages : 0;
- fprintf(fp, "\n%10s %7ld %11s %3ld%% of TOTAL MEM\n",
+ fprintf(fp, "\n%13s %7ld %11s %3ld%% of TOTAL MEM\n",
"TOTAL HIGH", totalhigh_pages,
pages_to_size(totalhigh_pages, buf), pct);
@@ -7860,19 +7865,19 @@ dump_kmeminfo(void)
freehighmem_pages = meminfo.retval;
pct = freehighmem_pages ?
(freehighmem_pages * 100)/totalhigh_pages : 0;
- fprintf(fp, "%10s %7ld %11s %3ld%% of TOTAL HIGH\n",
+ fprintf(fp, "%13s %7ld %11s %3ld%% of TOTAL HIGH\n",
"FREE HIGH", freehighmem_pages,
pages_to_size(freehighmem_pages, buf), pct);
totallowmem_pages = totalram_pages - totalhigh_pages;
pct = (totallowmem_pages * 100)/totalram_pages;
- fprintf(fp, "%10s %7ld %11s %3ld%% of TOTAL MEM\n",
+ fprintf(fp, "%13s %7ld %11s %3ld%% of TOTAL MEM\n",
"TOTAL LOW", totallowmem_pages,
pages_to_size(totallowmem_pages, buf), pct);
freelowmem_pages = freeram_pages - freehighmem_pages;
pct = (freelowmem_pages * 100)/totallowmem_pages;
- fprintf(fp, "%10s %7ld %11s %3ld%% of TOTAL LOW\n",
+ fprintf(fp, "%13s %7ld %11s %3ld%% of TOTAL LOW\n",
"FREE LOW", freelowmem_pages,
pages_to_size(freelowmem_pages, buf), pct);
}
@@ -7884,18 +7889,18 @@ dump_kmeminfo(void)
if (symbol_exists("swapper_space") ||
symbol_exists("swapper_spaces")) {
if (dump_swap_info(RETURN_ON_ERROR, &totalswap_pages,
&totalused_pages)) {
- fprintf(fp, "%10s %7ld %11s ----\n",
+ fprintf(fp, "%13s %7ld %11s ----\n",
"TOTAL SWAP", totalswap_pages,
pages_to_size(totalswap_pages, buf));
pct = totalswap_pages ? (totalused_pages * 100) /
totalswap_pages : 100;
- fprintf(fp, "%10s %7ld %11s %3ld%% of TOTAL SWAP\n",
+ fprintf(fp, "%13s %7ld %11s %3ld%% of TOTAL SWAP\n",
"SWAP USED", totalused_pages,
pages_to_size(totalused_pages, buf), pct);
pct = totalswap_pages ?
((totalswap_pages - totalused_pages) *
100) / totalswap_pages : 0;
- fprintf(fp, "%10s %7ld %11s %3ld%% of TOTAL SWAP\n",
+ fprintf(fp, "%13s %7ld %11s %3ld%% of TOTAL SWAP\n",
"SWAP FREE",
totalswap_pages - totalused_pages,
pages_to_size(totalswap_pages - totalused_pages,
@@ -7905,6 +7910,56 @@ dump_kmeminfo(void)
"swap_info[%ld].swap_map at %lx is inaccessible\n",
totalused_pages, totalswap_pages);
}
+ /*
+ * Show committed memory
+ */
+ if (kernel_symbol_exists("sysctl_overcommit_memory")) {
+ fprintf(fp, "\n");
+ if (kernel_symbol_exists("sysctl_overcommit_kbytes")) {
+ get_symbol_data("sysctl_overcommit_kbytes",
+ sizeof(ulong), &overcommit_kbytes);
+ if (overcommit_kbytes)
+ allowed = overcommit_kbytes >>
+ (machdep->pageshift - 10);
+ else {
+ get_symbol_data("sysctl_overcommit_ratio",
+ sizeof(int),
+ &overcommit_ratio);
+ allowed = ((totalram_pages - hugetlb_total_pages())
+ * overcommit_ratio / 100);
+ }
+ }
+ if (symbol_exists("vm_committed_as")) {
+ readmem(symbol_value("vm_committed_as") +
+ MEMBER_OFFSET("percpu_counter",
+ "count"), KVADDR,
+ &committed,
+ sizeof(long),
+ "percpu_counter count",
+ FAULT_ON_ERROR);
+
+ /* Ensure always positive */
+ if (committed < 0)
+ committed = 0;
+ } else {
+ readmem(symbol_value("vm_committed_space") +
+ MEMBER_OFFSET("atomic_t",
+ "counter"), KVADDR,
+ &committed, sizeof(int),
+ "atomic_t counter",
+ FAULT_ON_ERROR);
+ }
+ allowed += totalswap_pages;
+ fprintf(fp, "%13s %7ld %11s ----\n",
+ "COMMIT LIMIT", allowed,
+ pages_to_size(allowed, buf));
+
+ pct = committed ? ((committed * 100)
+ / allowed) : 0;
+ fprintf(fp, "%13s %7ld %11s %3ld%% of TOTAL LIMIT\n",
+ "COMMITTED", committed,
+ pages_to_size(committed, buf), pct);
+ }
dump_zone_page_usage();
}
@@ -14734,6 +14789,51 @@ next_physpage(ulonglong paddr, ulonglong *nextpaddr)
return FALSE;
}
+ulong
+hugetlb_total_pages(void)
+{
+ ulong hstate_p;
+ int i, len;
+ ulong nr_total_pages = 0;
+ ulong nr_huge_pages;
+ uint horder;
+
+ if (kernel_symbol_exists("hstates")) {
+ STRUCT_SIZE_INIT(hstate, "hstate");
+ MEMBER_OFFSET_INIT(hstate_order, "hstate", "order");
+ MEMBER_OFFSET_INIT(hstate_nr_huge_pages, "hstate",
"nr_huge_pages");
+
+ len = get_array_length("hstates", NULL, 0);
+ hstate_p = symbol_value("hstates");
+
+ for (i = 0; i < len; i++) {
+ hstate_p = hstate_p + (SIZE(hstate) * i);
+
+ readmem(hstate_p + OFFSET(hstate_order), KVADDR,
+ &horder, sizeof(uint),
+ "hstate_order",
+ FAULT_ON_ERROR);
+
+ readmem(hstate_p + OFFSET(hstate_nr_huge_pages), KVADDR,
+ &nr_huge_pages, sizeof(ulong),
+ "hstate_nr_huge_pages",
+ FAULT_ON_ERROR);
+
+ nr_total_pages += nr_huge_pages * (1 << horder);
+ }
+ } else if (kernel_symbol_exists("nr_huge_pages")) {
+ unsigned long hpage_shift = 21;
+
+ if ((machine_type("X86") && !(machdep->flags & PAE)))
+ hpage_shift = 22;
+ get_symbol_data("nr_huge_pages",
+ sizeof(ulong), &nr_huge_pages);
+ nr_total_pages = nr_huge_pages * ((1 << hpage_shift) /
+ machdep->pagesize);
+ }
+ return nr_total_pages;
+}
+
/*
* Display swap statistics.
*/
--
1.9.3
--
Crash-utility mailing list
Crash-utility(a)redhat.com
https://www.redhat.com/mailman/listinfo/crash-utility
2:50 p.m.
New subject: [RFC PATCH 1/2] crash: Show memory overcommit data in dump_kmeminfo()
----- Original Message -----
Aaron -- FYI: this warning looks legit:
$ make warn
TARGET: X86_64
CRASH: 7.1.0rc5
GDB: 7.6
cc -c -g -DX86_64 -DLZO -DSNAPPY -DGDB_7_6 build_data.c -Wall -O2 -Wstrict-prototypes
-Wmissing-prototypes -fstack-protector -Wformat-security
cc -c -g -DX86_64 -DLZO -DSNAPPY -DGDB_7_6 memory.c -Wall -O2 -Wstrict-prototypes
-Wmissing-prototypes -fstack-protector -Wformat-security
memory.c: In function ‘dump_kmeminfo’:
memory.c:7952:11: warning: ‘allowed’ may be used uninitialized in this function
[-Wmaybe-uninitialized]
cc -c -g -DX86_64 -DLZO -DSNAPPY -DGDB_7_6 help.c -Wall -O2 -Wstrict-prototypes
-Wmissing-prototypes -fstack-protector -Wformat-security
...
Sure enough, in a 2.6.30 kernel, which has no "sysctl_overcommit_kbytes", I get
a SIGFPE on this line:
pct = committed ? ((committed * 100)
/ allowed) : 0;
because sysctl_overcommit_kbytes doesn't exist. I don't know what
the initial setting should be, because certainly 0 won't work.
Dave
Dave
----- Original Message -----
> This patch changes dump_kmeminfo() to report overcommit information similar
> to that displayed under the proc/meminfo file. It may be useful to indicate
> memory over commitment abuse, for example with forced vmcores from system
> hangs due to shortage of memory. The intended output is as follows:
>
> crash> kmem -i
> PAGES TOTAL PERCENTAGE
> TOTAL MEM 1965332 7.5 GB ----
> FREE 78080 305 MB 3% of TOTAL MEM
> USED 1887252 7.2 GB 96% of TOTAL MEM
> SHARED 789954 3 GB 40% of TOTAL MEM
> BUFFERS 110606 432.1 MB 5% of TOTAL MEM
> CACHED 1212645 4.6 GB 61% of TOTAL MEM
> SLAB 146563 572.5 MB 7% of TOTAL MEM
>
> TOTAL SWAP 1970175 7.5 GB ----
> SWAP USED 5 20 KB 0% of TOTAL SWAP
> SWAP FREE 1970170 7.5 GB 99% of TOTAL SWAP
>
> COMMIT LIMIT 2952841 11.3 GB ----
> COMMITTED 1150595 4.4 GB 38% of TOTAL LIMIT
>
> Tested under 3.16.4-200.fc20.x86_64 only.
> Though this should work under RHEL5 (2.6.18) and above.
>
> Signed-off-by: Aaron Tomlin <atomlin(a)redhat.com>
> Suggested-by: Alexis Solanas <alexis(a)redhat.com>
> ---
> help.c | 33 ++++++++--------
> memory.c | 132
> +++++++++++++++++++++++++++++++++++++++++++++++++++++++--------
> 2 files changed, 134 insertions(+), 31 deletions(-)
>
> diff --git a/help.c b/help.c
> index 6aa3e20..bedd7c3 100644
> --- a/help.c
> +++ b/help.c
> @@ -5587,23 +5587,26 @@ char *help_kmem[] = {
> "\nEXAMPLES",
> " Display memory usage information:\n",
> " %s> kmem -i",
> -" PAGES TOTAL PERCENTAGE",
> -" TOTAL MEM 63602 248.4 MB ----",
> -" FREE 993 3.9 MB 1% of TOTAL MEM",
> -" USED 62609 244.6 MB 98% of TOTAL MEM",
> -" SHARED 34035 132.9 MB 53% of TOTAL MEM",
> -" BUFFERS 10928 42.7 MB 17% of TOTAL MEM",
> -" CACHED 35249 137.7 MB 55% of TOTAL MEM",
> -" SLAB 2823 11 MB 4% of TOTAL MEM",
> +" PAGES TOTAL PERCENTAGE",
> +" TOTAL MEM 63602 248.4 MB ----",
> +" FREE 993 3.9 MB 1% of TOTAL MEM",
> +" USED 62609 244.6 MB 98% of TOTAL MEM",
> +" SHARED 34035 132.9 MB 53% of TOTAL MEM",
> +" BUFFERS 10928 42.7 MB 17% of TOTAL MEM",
> +" CACHED 35249 137.7 MB 55% of TOTAL MEM",
> +" SLAB 2823 11 MB 4% of TOTAL MEM",
> " ",
> -" TOTAL HIGH 0 0 0% of TOTAL MEM",
> -" FREE HIGH 0 0 0% of TOTAL HIGH",
> -" TOTAL LOW 63602 248.4 MB 100% of TOTAL MEM",
> -" FREE LOW 993 3.9 MB 1% of TOTAL LOW",
> +" TOTAL HIGH 0 0 0% of TOTAL MEM",
> +" FREE HIGH 0 0 0% of TOTAL HIGH",
> +" TOTAL LOW 63602 248.4 MB 100% of TOTAL MEM",
> +" FREE LOW 993 3.9 MB 1% of TOTAL LOW",
> " ",
> -" TOTAL SWAP 129792 507 MB ----",
> -" SWAP USED 14727 57.5 MB 11% of TOTAL SWAP",
> -" SWAP FREE 115065 449.5 MB 88% of TOTAL SWAP",
> +" TOTAL SWAP 129792 507 MB ----",
> +" SWAP USED 14727 57.5 MB 11% of TOTAL SWAP",
> +" SWAP FREE 115065 449.5 MB 88% of TOTAL SWAP",
> +" ",
> +" COMMIT LIMIT 2952841 11.3 GB ----",
> +" COMMITTED 1158600 4.4 GB 39% of TOTAL LIMIT",
> " ",
> " ZONE NAME FREE ACTIVE INACTIVE_DIRTY INACTIVE_CLEAN
> MIN/LOW/HIGH",
> " 0 DMA 240 1166 7 161
> 128/256/384 ",
> diff --git a/memory.c b/memory.c
> index 3ac928d..823ec75 100644
> --- a/memory.c
> +++ b/memory.c
> @@ -227,6 +227,7 @@ static int vm_area_page_dump(ulong, ulong, ulong,
> ulong,
> ulong,
> struct reference *);
> static void rss_page_types_init(void);
> static int dump_swap_info(ulong, ulong *, ulong *);
> +static ulong hugetlb_total_pages(void);
> static void swap_info_init(void);
> static char *get_swapdev(ulong, char *);
> static void fill_swap_info(ulong);
> @@ -4627,7 +4628,7 @@ cmd_kmem(void)
>
> }
>
> - if (iflag == 1)
> + if (iflag)
> dump_kmeminfo();
>
> if (pflag == 1)
> @@ -7653,7 +7654,7 @@ bailout:
> * by /proc/meminfo, and then some...
> */
>
> -char *kmeminfo_hdr = " PAGES TOTAL
PERCENTAGE\n";
> +char *kmeminfo_hdr = " PAGES TOTAL
> PERCENTAGE\n";
>
> static void
> dump_kmeminfo(void)
> @@ -7670,6 +7671,10 @@ dump_kmeminfo(void)
> ulong freehighmem_pages;
> ulong totallowmem_pages;
> ulong freelowmem_pages;
> + ulong allowed;
> + long committed;
> + ulong overcommit_kbytes;
> + int overcommit_ratio;
> long nr_file_pages, nr_slab;
> ulong swapper_space_nrpages;
> ulong pct;
> @@ -7720,7 +7725,7 @@ dump_kmeminfo(void)
> } else
> totalram_pages = get_totalram;
>
> - fprintf(fp, "%10s %7ld %11s ----\n", "TOTAL MEM",
> + fprintf(fp, "%13s %7ld %11s ----\n", "TOTAL MEM",
> totalram_pages, pages_to_size(totalram_pages, buf));
>
> /*
> @@ -7731,12 +7736,12 @@ dump_kmeminfo(void)
> vt->dump_free_pages(&meminfo);
> freeram_pages = meminfo.retval;
> pct = (freeram_pages * 100)/totalram_pages;
> - fprintf(fp, "%10s %7ld %11s %3ld%% of TOTAL MEM\n",
> + fprintf(fp, "%13s %7ld %11s %3ld%% of TOTAL MEM\n",
> "FREE", freeram_pages, pages_to_size(freeram_pages, buf), pct);
>
> used_pages = totalram_pages - freeram_pages;
> pct = (used_pages * 100)/totalram_pages;
> - fprintf(fp, "%10s %7ld %11s %3ld%% of TOTAL MEM\n",
> + fprintf(fp, "%13s %7ld %11s %3ld%% of TOTAL MEM\n",
> "USED", used_pages, pages_to_size(used_pages, buf), pct);
>
> /*
> @@ -7745,7 +7750,7 @@ dump_kmeminfo(void)
> * pages that have a count of greater than 1.
> */
> pct = (shared_pages * 100)/totalram_pages;
> - fprintf(fp, "%10s %7ld %11s %3ld%% of TOTAL MEM\n",
> + fprintf(fp, "%13s %7ld %11s %3ld%% of TOTAL MEM\n",
> "SHARED", shared_pages, pages_to_size(shared_pages, buf), pct);
>
> subtract_buffer_pages = 0;
> @@ -7762,7 +7767,7 @@ dump_kmeminfo(void)
> buffer_pages = 0;
>
> pct = (buffer_pages * 100)/totalram_pages;
> - fprintf(fp, "%10s %7ld %11s %3ld%% of TOTAL MEM\n",
> + fprintf(fp, "%13s %7ld %11s %3ld%% of TOTAL MEM\n",
> "BUFFERS", buffer_pages, pages_to_size(buffer_pages, buf), pct);
>
> if (CRASHDEBUG(1))
> @@ -7816,7 +7821,7 @@ dump_kmeminfo(void)
>
>
> pct = (page_cache_size * 100)/totalram_pages;
> - fprintf(fp, "%10s %7ld %11s %3ld%% of TOTAL MEM\n",
> + fprintf(fp, "%13s %7ld %11s %3ld%% of TOTAL MEM\n",
> "CACHED", page_cache_size,
> pages_to_size(page_cache_size, buf), pct);
>
> @@ -7826,7 +7831,7 @@ dump_kmeminfo(void)
> */
>
> pct = (get_slabs * 100)/totalram_pages;
> - fprintf(fp, "%10s %7ld %11s %3ld%% of TOTAL MEM\n",
> + fprintf(fp, "%13s %7ld %11s %3ld%% of TOTAL MEM\n",
> "SLAB", get_slabs, pages_to_size(get_slabs, buf), pct);
>
> if (symbol_exists("totalhigh_pages")) {
> @@ -7851,7 +7856,7 @@ dump_kmeminfo(void)
>
> pct = totalhigh_pages ?
> (totalhigh_pages * 100)/totalram_pages : 0;
> - fprintf(fp, "\n%10s %7ld %11s %3ld%% of TOTAL MEM\n",
> + fprintf(fp, "\n%13s %7ld %11s %3ld%% of TOTAL MEM\n",
> "TOTAL HIGH", totalhigh_pages,
> pages_to_size(totalhigh_pages, buf), pct);
>
> @@ -7860,19 +7865,19 @@ dump_kmeminfo(void)
> freehighmem_pages = meminfo.retval;
> pct = freehighmem_pages ?
> (freehighmem_pages * 100)/totalhigh_pages : 0;
> - fprintf(fp, "%10s %7ld %11s %3ld%% of TOTAL HIGH\n",
> + fprintf(fp, "%13s %7ld %11s %3ld%% of TOTAL HIGH\n",
> "FREE HIGH", freehighmem_pages,
> pages_to_size(freehighmem_pages, buf), pct);
>
> totallowmem_pages = totalram_pages - totalhigh_pages;
> pct = (totallowmem_pages * 100)/totalram_pages;
> - fprintf(fp, "%10s %7ld %11s %3ld%% of TOTAL MEM\n",
> + fprintf(fp, "%13s %7ld %11s %3ld%% of TOTAL MEM\n",
> "TOTAL LOW", totallowmem_pages,
> pages_to_size(totallowmem_pages, buf), pct);
>
> freelowmem_pages = freeram_pages - freehighmem_pages;
> pct = (freelowmem_pages * 100)/totallowmem_pages;
> - fprintf(fp, "%10s %7ld %11s %3ld%% of TOTAL LOW\n",
> + fprintf(fp, "%13s %7ld %11s %3ld%% of TOTAL LOW\n",
> "FREE LOW", freelowmem_pages,
> pages_to_size(freelowmem_pages, buf), pct);
> }
> @@ -7884,18 +7889,18 @@ dump_kmeminfo(void)
> if (symbol_exists("swapper_space") ||
symbol_exists("swapper_spaces")) {
> if (dump_swap_info(RETURN_ON_ERROR, &totalswap_pages,
> &totalused_pages)) {
> - fprintf(fp, "%10s %7ld %11s ----\n",
> + fprintf(fp, "%13s %7ld %11s ----\n",
> "TOTAL SWAP", totalswap_pages,
> pages_to_size(totalswap_pages, buf));
> pct = totalswap_pages ? (totalused_pages * 100) /
> totalswap_pages : 100;
> - fprintf(fp, "%10s %7ld %11s %3ld%% of TOTAL SWAP\n",
> + fprintf(fp, "%13s %7ld %11s %3ld%% of TOTAL SWAP\n",
> "SWAP USED", totalused_pages,
> pages_to_size(totalused_pages, buf), pct);
> pct = totalswap_pages ?
> ((totalswap_pages - totalused_pages) *
> 100) / totalswap_pages : 0;
> - fprintf(fp, "%10s %7ld %11s %3ld%% of TOTAL SWAP\n",
> + fprintf(fp, "%13s %7ld %11s %3ld%% of TOTAL SWAP\n",
> "SWAP FREE",
> totalswap_pages - totalused_pages,
> pages_to_size(totalswap_pages - totalused_pages,
> @@ -7905,6 +7910,56 @@ dump_kmeminfo(void)
> "swap_info[%ld].swap_map at %lx is inaccessible\n",
> totalused_pages, totalswap_pages);
> }
> + /*
> + * Show committed memory
> + */
> + if (kernel_symbol_exists("sysctl_overcommit_memory")) {
> + fprintf(fp, "\n");
> + if (kernel_symbol_exists("sysctl_overcommit_kbytes")) {
> + get_symbol_data("sysctl_overcommit_kbytes",
> + sizeof(ulong), &overcommit_kbytes);
> + if (overcommit_kbytes)
> + allowed = overcommit_kbytes >>
> + (machdep->pageshift - 10);
> + else {
> + get_symbol_data("sysctl_overcommit_ratio",
> + sizeof(int),
> + &overcommit_ratio);
> + allowed = ((totalram_pages - hugetlb_total_pages())
> + * overcommit_ratio / 100);
> + }
> + }
> + if (symbol_exists("vm_committed_as")) {
> + readmem(symbol_value("vm_committed_as") +
> + MEMBER_OFFSET("percpu_counter",
> + "count"), KVADDR,
> + &committed,
> + sizeof(long),
> + "percpu_counter count",
> + FAULT_ON_ERROR);
> +
> + /* Ensure always positive */
> + if (committed < 0)
> + committed = 0;
> + } else {
> + readmem(symbol_value("vm_committed_space") +
> + MEMBER_OFFSET("atomic_t",
> + "counter"), KVADDR,
> + &committed, sizeof(int),
> + "atomic_t counter",
> + FAULT_ON_ERROR);
> + }
> + allowed += totalswap_pages;
> + fprintf(fp, "%13s %7ld %11s ----\n",
> + "COMMIT LIMIT", allowed,
> + pages_to_size(allowed, buf));
> +
> + pct = committed ? ((committed * 100)
> + / allowed) : 0;
> + fprintf(fp, "%13s %7ld %11s %3ld%% of TOTAL LIMIT\n",
> + "COMMITTED", committed,
> + pages_to_size(committed, buf), pct);
> + }
> dump_zone_page_usage();
> }
>
> @@ -14734,6 +14789,51 @@ next_physpage(ulonglong paddr, ulonglong
> *nextpaddr)
> return FALSE;
> }
>
> +ulong
> +hugetlb_total_pages(void)
> +{
> + ulong hstate_p;
> + int i, len;
> + ulong nr_total_pages = 0;
> + ulong nr_huge_pages;
> + uint horder;
> +
> + if (kernel_symbol_exists("hstates")) {
> + STRUCT_SIZE_INIT(hstate, "hstate");
> + MEMBER_OFFSET_INIT(hstate_order, "hstate", "order");
> + MEMBER_OFFSET_INIT(hstate_nr_huge_pages, "hstate",
"nr_huge_pages");
> +
> + len = get_array_length("hstates", NULL, 0);
> + hstate_p = symbol_value("hstates");
> +
> + for (i = 0; i < len; i++) {
> + hstate_p = hstate_p + (SIZE(hstate) * i);
> +
> + readmem(hstate_p + OFFSET(hstate_order), KVADDR,
> + &horder, sizeof(uint),
> + "hstate_order",
> + FAULT_ON_ERROR);
> +
> + readmem(hstate_p + OFFSET(hstate_nr_huge_pages), KVADDR,
> + &nr_huge_pages, sizeof(ulong),
> + "hstate_nr_huge_pages",
> + FAULT_ON_ERROR);
> +
> + nr_total_pages += nr_huge_pages * (1 << horder);
> + }
> + } else if (kernel_symbol_exists("nr_huge_pages")) {
> + unsigned long hpage_shift = 21;
> +
> + if ((machine_type("X86") && !(machdep->flags & PAE)))
> + hpage_shift = 22;
> + get_symbol_data("nr_huge_pages",
> + sizeof(ulong), &nr_huge_pages);
> + nr_total_pages = nr_huge_pages * ((1 << hpage_shift) /
> + machdep->pagesize);
> + }
> + return nr_total_pages;
> +}
> +
> /*
> * Display swap statistics.
> */
> --
> 1.9.3
>
> --
> 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
9:22 a.m.
New subject: [RFC PATCH 1/2] crash: Show memory overcommit data in dump_kmeminfo()
On Fri 2014-11-21 15:50 -0500, Dave Anderson wrote:
Sure enough, in a 2.6.30 kernel, which has no
"sysctl_overcommit_kbytes", I get
a SIGFPE on this line:
pct = committed ? ((committed * 100)
/ allowed) : 0;
because sysctl_overcommit_kbytes doesn't exist. I don't know what
the initial setting should be, because certainly 0 won't work.
OK - I've changed the logic so that if "sysctl_overcommit_kbytes" does not
exist or if set to 0, then we fall back to using "sysctl_overcommit_ratio"
in the calculation for "allowed" as per normal.
--
Aaron Tomlin
9:24 a.m.
New subject: [RFC PATCH 1/2] crash: Show memory overcommit data in dump_kmeminfo()
On Fri 2014-11-21 15:32 -0500, Dave Anderson wrote:
Aaron -- FYI: this warning looks legit:
$ make warn
TARGET: X86_64
CRASH: 7.1.0rc5
GDB: 7.6
cc -c -g -DX86_64 -DLZO -DSNAPPY -DGDB_7_6 build_data.c -Wall -O2 -Wstrict-prototypes
-Wmissing-prototypes -fstack-protector -Wformat-security
cc -c -g -DX86_64 -DLZO -DSNAPPY -DGDB_7_6 memory.c -Wall -O2 -Wstrict-prototypes
-Wmissing-prototypes -fstack-protector -Wformat-security
memory.c: In function ‘dump_kmeminfo’:
memory.c:7952:11: warning: ‘allowed’ may be used uninitialized in this function
[-Wmaybe-uninitialized]
cc -c -g -DX86_64 -DLZO -DSNAPPY -DGDB_7_6 help.c -Wall -O2 -Wstrict-prototypes
-Wmissing-prototypes -fstack-protector -Wformat-security
...
OK - fixed.
--
Aaron Tomlin
6:13 a.m.
New subject: [RFC PATCH 2/2] crash: kill dump_zone_page_usage()
Most of the information provided by this function is duplicated in
dump_zone_stats(). Also dump_zone_stats() is perhaps more useful.
As such let's just remove dump_zone_page_usage().
Signed-off-by: Aaron Tomlin <atomlin(a)redhat.com>
---
help.c | 7 -----
memory.c | 97 ----------------------------------------------------------------
2 files changed, 104 deletions(-)
diff --git a/help.c b/help.c
index bedd7c3..cccef23 100644
--- a/help.c
+++ b/help.c
@@ -5608,13 +5608,6 @@ char *help_kmem[] = {
" COMMIT LIMIT 2952841 11.3 GB ----",
" COMMITTED 1158600 4.4 GB 39% of TOTAL LIMIT",
" ",
-" ZONE NAME FREE ACTIVE INACTIVE_DIRTY INACTIVE_CLEAN
MIN/LOW/HIGH",
-" 0 DMA 240 1166 7 161 128/256/384
",
-" 1 Normal 753 17009 27834 0 255/510/765
",
-" 2 HighMem 0 0 0 0 0/0/0
",
-
-
-" ",
" Display and verify free memory data:\n",
" %s> kmem -f",
" NODE",
diff --git a/memory.c b/memory.c
index 823ec75..428df2d 100644
--- a/memory.c
+++ b/memory.c
@@ -142,7 +142,6 @@ static int page_flags_init_from_pageflag_names(void);
static int page_flags_init_from_pageflags_enum(void);
static int translate_page_flags(char *, ulong);
static void dump_free_pages(struct meminfo *);
-static int dump_zone_page_usage(void);
static void dump_multidimensional_free_pages(struct meminfo *);
static void dump_free_pages_zones_v1(struct meminfo *);
static void dump_free_pages_zones_v2(struct meminfo *);
@@ -7365,101 +7364,6 @@ done_search:
}
}
-
-static char *
-page_usage_hdr = "ZONE NAME FREE ACTIVE INACTIVE_DIRTY INACTIVE_CLEAN
MIN/LOW/HIGH";
-
-/*
- * Display info about the non-free pages in each zone.
- */
-static int
-dump_zone_page_usage(void)
-{
- int i, n;
- ulong value, node_zones;
- struct node_table *nt;
- ulong inactive_dirty_pages, inactive_clean_pages, active_pages;
- ulong free_pages, pages_min, pages_low, pages_high;
- char namebuf[BUFSIZE];
- char buf1[BUFSIZE];
- char buf2[BUFSIZE];
- char buf3[BUFSIZE];
-
- if (!VALID_MEMBER(zone_struct_inactive_dirty_pages) ||
- !VALID_MEMBER(zone_struct_inactive_clean_pages) ||
- !VALID_MEMBER(zone_struct_active_pages) ||
- !VALID_MEMBER(zone_struct_pages_min) ||
- !VALID_MEMBER(zone_struct_pages_low) ||
- !VALID_MEMBER(zone_struct_pages_high))
- return FALSE;
-
- fprintf(fp, "\n");
-
- for (n = 0; n < vt->numnodes; n++) {
- nt = &vt->node_table[n];
- node_zones = nt->pgdat + OFFSET(pglist_data_node_zones);
-
- if ((vt->numnodes > 1) && (vt->flags & NODES)) {
- fprintf(fp, "%sNODE\n %2d\n",
- n ? "\n" : "", nt->node_id);
- }
- fprintf(fp, "%s\n", page_usage_hdr);
-
- for (i = 0; i < vt->nr_zones; i++) {
- readmem(node_zones+OFFSET(zone_struct_free_pages),
- KVADDR, &free_pages, sizeof(ulong),
- "node_zones free_pages", FAULT_ON_ERROR);
- readmem(node_zones+
- OFFSET(zone_struct_inactive_dirty_pages),
- KVADDR, &inactive_dirty_pages, sizeof(ulong),
- "node_zones inactive_dirty_pages",
- FAULT_ON_ERROR);
- readmem(node_zones+
- OFFSET(zone_struct_inactive_clean_pages),
- KVADDR, &inactive_clean_pages, sizeof(ulong),
- "node_zones inactive_clean_pages",
- FAULT_ON_ERROR);
- readmem(node_zones+OFFSET(zone_struct_active_pages),
- KVADDR, &active_pages, sizeof(ulong),
- "node_zones active_pages", FAULT_ON_ERROR);
- readmem(node_zones+OFFSET(zone_struct_pages_min),
- KVADDR, &pages_min, sizeof(ulong),
- "node_zones pages_min", FAULT_ON_ERROR);
- readmem(node_zones+OFFSET(zone_struct_pages_low),
- KVADDR, &pages_low, sizeof(ulong),
- "node_zones pages_low", FAULT_ON_ERROR);
- readmem(node_zones+OFFSET(zone_struct_pages_high),
- KVADDR, &pages_high, sizeof(ulong),
- "node_zones pages_high", FAULT_ON_ERROR);
-
- readmem(node_zones+OFFSET(zone_struct_name), KVADDR,
- &value, sizeof(void *),
- "node_zones name", FAULT_ON_ERROR);
- if (read_string(value, buf1, BUFSIZE-1))
- sprintf(namebuf, "%-8s", buf1);
- else
- sprintf(namebuf, "(unknown)");
-
- sprintf(buf2, "%ld/%ld/%ld",
- pages_min, pages_low, pages_high);
- fprintf(fp, "%3d %s %7ld %7ld %15ld %15ld %s\n",
- i,
- namebuf,
- free_pages,
- active_pages,
- inactive_dirty_pages,
- inactive_clean_pages,
- mkstring(buf3, strlen("MIN/LOW/HIGH"),
- CENTER, buf2));
-
- node_zones += SIZE(zone_struct);
- }
- }
-
- return TRUE;
-}
-
-
/*
* Dump the num "order" contents of the zone_t free_area array.
*/
@@ -7960,7 +7864,6 @@ dump_kmeminfo(void)
"COMMITTED", committed,
pages_to_size(committed, buf), pct);
}
- dump_zone_page_usage();
}
/*
--
1.9.3
10:45 a.m.
New subject: [RFC PATCH 2/2] crash: kill dump_zone_page_usage()
----- Original Message -----
Most of the information provided by this function is duplicated in
dump_zone_stats(). Also dump_zone_stats() is perhaps more useful.
As such let's just remove dump_zone_page_usage().
Interesting -- I cannot even find a kernel version that satisfies
the structure-member-existance requirements in order for the zone
statistics to even be displayed by that function. But there
must have been some range of kernel releases where it did work,
so I'd prefer to just leave the function alone, albeit in a
comatose state.
However, since it's so exceedingly rare, I agree that it's worth
removing it from the "help kmem" display. (and for those antique
kernels where it still applies, it's just an added bonus)
Dave
Signed-off-by: Aaron Tomlin <atomlin(a)redhat.com>
---
help.c | 7 -----
memory.c | 97
----------------------------------------------------------------
2 files changed, 104 deletions(-)
diff --git a/help.c b/help.c
index bedd7c3..cccef23 100644
--- a/help.c
+++ b/help.c
@@ -5608,13 +5608,6 @@ char *help_kmem[] = {
" COMMIT LIMIT 2952841 11.3 GB ----",
" COMMITTED 1158600 4.4 GB 39% of TOTAL LIMIT",
" ",
-" ZONE NAME FREE ACTIVE INACTIVE_DIRTY INACTIVE_CLEAN
MIN/LOW/HIGH",
-" 0 DMA 240 1166 7 161
128/256/384 ",
-" 1 Normal 753 17009 27834 0
255/510/765 ",
-" 2 HighMem 0 0 0 0 0/0/0
",
-
-
-" ",
" Display and verify free memory data:\n",
" %s> kmem -f",
" NODE",
diff --git a/memory.c b/memory.c
index 823ec75..428df2d 100644
--- a/memory.c
+++ b/memory.c
@@ -142,7 +142,6 @@ static int page_flags_init_from_pageflag_names(void);
static int page_flags_init_from_pageflags_enum(void);
static int translate_page_flags(char *, ulong);
static void dump_free_pages(struct meminfo *);
-static int dump_zone_page_usage(void);
static void dump_multidimensional_free_pages(struct meminfo *);
static void dump_free_pages_zones_v1(struct meminfo *);
static void dump_free_pages_zones_v2(struct meminfo *);
@@ -7365,101 +7364,6 @@ done_search:
}
}
-
-static char *
-page_usage_hdr = "ZONE NAME FREE ACTIVE INACTIVE_DIRTY
INACTIVE_CLEAN MIN/LOW/HIGH";
-
-/*
- * Display info about the non-free pages in each zone.
- */
-static int
-dump_zone_page_usage(void)
-{
- int i, n;
- ulong value, node_zones;
- struct node_table *nt;
- ulong inactive_dirty_pages, inactive_clean_pages, active_pages;
- ulong free_pages, pages_min, pages_low, pages_high;
- char namebuf[BUFSIZE];
- char buf1[BUFSIZE];
- char buf2[BUFSIZE];
- char buf3[BUFSIZE];
-
- if (!VALID_MEMBER(zone_struct_inactive_dirty_pages) ||
- !VALID_MEMBER(zone_struct_inactive_clean_pages) ||
- !VALID_MEMBER(zone_struct_active_pages) ||
- !VALID_MEMBER(zone_struct_pages_min) ||
- !VALID_MEMBER(zone_struct_pages_low) ||
- !VALID_MEMBER(zone_struct_pages_high))
- return FALSE;
-
- fprintf(fp, "\n");
-
- for (n = 0; n < vt->numnodes; n++) {
- nt = &vt->node_table[n];
- node_zones = nt->pgdat + OFFSET(pglist_data_node_zones);
-
- if ((vt->numnodes > 1) && (vt->flags & NODES)) {
- fprintf(fp, "%sNODE\n %2d\n",
- n ? "\n" : "", nt->node_id);
- }
- fprintf(fp, "%s\n", page_usage_hdr);
-
- for (i = 0; i < vt->nr_zones; i++) {
- readmem(node_zones+OFFSET(zone_struct_free_pages),
- KVADDR, &free_pages, sizeof(ulong),
- "node_zones free_pages", FAULT_ON_ERROR);
- readmem(node_zones+
- OFFSET(zone_struct_inactive_dirty_pages),
- KVADDR, &inactive_dirty_pages, sizeof(ulong),
- "node_zones inactive_dirty_pages",
- FAULT_ON_ERROR);
- readmem(node_zones+
- OFFSET(zone_struct_inactive_clean_pages),
- KVADDR, &inactive_clean_pages, sizeof(ulong),
- "node_zones inactive_clean_pages",
- FAULT_ON_ERROR);
- readmem(node_zones+OFFSET(zone_struct_active_pages),
- KVADDR, &active_pages, sizeof(ulong),
- "node_zones active_pages", FAULT_ON_ERROR);
- readmem(node_zones+OFFSET(zone_struct_pages_min),
- KVADDR, &pages_min, sizeof(ulong),
- "node_zones pages_min", FAULT_ON_ERROR);
- readmem(node_zones+OFFSET(zone_struct_pages_low),
- KVADDR, &pages_low, sizeof(ulong),
- "node_zones pages_low", FAULT_ON_ERROR);
- readmem(node_zones+OFFSET(zone_struct_pages_high),
- KVADDR, &pages_high, sizeof(ulong),
- "node_zones pages_high", FAULT_ON_ERROR);
-
- readmem(node_zones+OFFSET(zone_struct_name), KVADDR,
- &value, sizeof(void *),
- "node_zones name", FAULT_ON_ERROR);
- if (read_string(value, buf1, BUFSIZE-1))
- sprintf(namebuf, "%-8s", buf1);
- else
- sprintf(namebuf, "(unknown)");
-
- sprintf(buf2, "%ld/%ld/%ld",
- pages_min, pages_low, pages_high);
- fprintf(fp, "%3d %s %7ld %7ld %15ld %15ld %s\n",
- i,
- namebuf,
- free_pages,
- active_pages,
- inactive_dirty_pages,
- inactive_clean_pages,
- mkstring(buf3, strlen("MIN/LOW/HIGH"),
- CENTER, buf2));
-
- node_zones += SIZE(zone_struct);
- }
- }
-
- return TRUE;
-}
-
-
/*
* Dump the num "order" contents of the zone_t free_area array.
*/
@@ -7960,7 +7864,6 @@ dump_kmeminfo(void)
"COMMITTED", committed,
pages_to_size(committed, buf), pct);
}
- dump_zone_page_usage();
}
/*
--
1.9.3
--
Crash-utility mailing list
Crash-utility(a)redhat.com
https://www.redhat.com/mailman/listinfo/crash-utility
10:58 a.m.
New subject: [RFC PATCH 2/2] crash: kill dump_zone_page_usage()
On Fri 2014-11-21 11:45 -0500, Dave Anderson wrote:
----- Original Message -----
> Most of the information provided by this function is duplicated in
> dump_zone_stats(). Also dump_zone_stats() is perhaps more useful.
> As such let's just remove dump_zone_page_usage().
Interesting -- I cannot even find a kernel version that satisfies
the structure-member-existance requirements in order for the zone
statistics to even be displayed by that function. But there
must have been some range of kernel releases where it did work,
so I'd prefer to just leave the function alone, albeit in a
comatose state.
However, since it's so exceedingly rare, I agree that it's worth
removing it from the "help kmem" display. (and for those antique
kernels where it still applies, it's just an added bonus)
Sure that's fine - in which case I'll have to adjust dump_zone_page_usage()
to be aligned with the proposed changes to dump_kmeminfo().
Thanks,
--
Aaron Tomlin
11:12 a.m.
New subject: [RFC PATCH 2/2] crash: kill dump_zone_page_usage()
----- Original Message -----
On Fri 2014-11-21 11:45 -0500, Dave Anderson wrote:
> ----- Original Message -----
> > Most of the information provided by this function is duplicated in
> > dump_zone_stats(). Also dump_zone_stats() is perhaps more useful.
> > As such let's just remove dump_zone_page_usage().
>
> Interesting -- I cannot even find a kernel version that satisfies
> the structure-member-existance requirements in order for the zone
> statistics to even be displayed by that function. But there
> must have been some range of kernel releases where it did work,
> so I'd prefer to just leave the function alone, albeit in a
> comatose state.
>
> However, since it's so exceedingly rare, I agree that it's worth
> removing it from the "help kmem" display. (and for those antique
> kernels where it still applies, it's just an added bonus)
Sure that's fine - in which case I'll have to adjust dump_zone_page_usage()
to be aligned with the proposed changes to dump_kmeminfo().
I wouldn't even bother. It's quite possible that the two are mutually
exclusive anyway. I didn't look at the display changes, but just would
ask that you don't exceed 80 columns.
Thanks,
Dave
Thanks,
--
Aaron Tomlin
--
Crash-utility mailing list
Crash-utility(a)redhat.com
https://www.redhat.com/mailman/listinfo/crash-utility
12:55 p.m.
New subject: [RFC PATCH 2/2] crash: kill dump_zone_page_usage()
On Fri 2014-11-21 12:12 -0500, Dave Anderson wrote:
[ ... ]
I wouldn't even bother. It's quite possible that the two are
mutually
exclusive anyway. I didn't look at the display changes, but just would
ask that you don't exceed 80 columns.
OK - understood.
--
Aaron Tomlin
3649
days inactive
3658
days old
devel@lists.crash-utility.osci.io
13 comments
2 participants
participants (2)
-
Aaron Tomlin -
Dave Anderson