Extend the function related to excluding unnecessary pages.
The function creates partial bitmap corresponding to range of target region
when cyclic flag is on.
Signed-off-by: Atsushi Kumagai <kumagai-atsushi at mxc.nes.nec.co.jp>
---
makedumpfile.c | 86 ++++++++++++++++++++++++++++++++++++++++++++++++--------
1 file changed, 75 insertions(+), 11 deletions(-)
diff --git a/makedumpfile.c b/makedumpfile.c
index 9e77913..e7c9f5e 100644
--- a/makedumpfile.c
+++ b/makedumpfile.c
@@ -3264,9 +3264,9 @@ reset_bitmap_of_free_pages(unsigned long node_zones)
}
for (i = 0; i < (1<<order); i++) {
pfn = start_pfn + i;
- clear_bit_on_2nd_bitmap_for_kernel(pfn);
+ if (clear_bit_on_2nd_bitmap_for_kernel(pfn))
+ found_free_pages++;
}
- found_free_pages += i;
previous = curr;
if (!readmem(VADDR, curr+OFFSET(list_head.next),
@@ -3300,7 +3300,7 @@ reset_bitmap_of_free_pages(unsigned long node_zones)
ERRMSG("Can't get free_pages.\n");
return FALSE;
}
- if (free_pages != found_free_pages) {
+ if (free_pages != found_free_pages && !info->flag_cyclic) {
/*
* On linux-2.6.21 or later, the number of free_pages is
* sometimes different from the one of the list "free_area",
@@ -3640,6 +3640,32 @@ create_1st_bitmap(void)
return TRUE;
}
+int
+create_1st_bitmap_cyclic()
+{
+ unsigned long long pfn, pfn_bitmap1;
+
+ /*
+ * At first, clear all the bits on the 1st-bitmap.
+ */
+ initialize_bitmap_cyclic(info->partial_bitmap1);
+
+ /*
+ * If page is on memory hole, set bit on the 1st-bitmap.
+ */
+ pfn_bitmap1 = 0;
+
+ for (pfn = info->cyclic_start_pfn; pfn <info->cyclic_end_pfn; pfn++) {
+ if (is_in_segs(pfn_to_paddr(pfn))) {
+ set_bit_on_1st_bitmap(pfn);
+ pfn_bitmap1++;
+ }
+ }
+ pfn_memhole -= pfn_bitmap1;
+
+ return TRUE;
+}
+
/*
* Exclude the page filled with zero in case of creating an elf dumpfile.
*/
@@ -3680,8 +3706,8 @@ exclude_zero_pages(void)
}
}
if (is_zero_page(buf, info->page_size)) {
- clear_bit_on_2nd_bitmap(pfn);
- pfn_zero++;
+ if (clear_bit_on_2nd_bitmap(pfn))
+ pfn_zero++;
}
}
@@ -3758,8 +3784,8 @@ __exclude_unnecessary_pages(unsigned long mem_map,
if ((info->dump_level & DL_EXCLUDE_CACHE)
&& (isLRU(flags) || isSwapCache(flags))
&& !isPrivate(flags) && !isAnon(mapping)) {
- clear_bit_on_2nd_bitmap_for_kernel(pfn);
- pfn_cache++;
+ if (clear_bit_on_2nd_bitmap_for_kernel(pfn))
+ pfn_cache++;
}
/*
* Exclude the cache page with the private page.
@@ -3767,16 +3793,16 @@ __exclude_unnecessary_pages(unsigned long mem_map,
else if ((info->dump_level & DL_EXCLUDE_CACHE_PRI)
&& (isLRU(flags) || isSwapCache(flags))
&& !isAnon(mapping)) {
- clear_bit_on_2nd_bitmap_for_kernel(pfn);
- pfn_cache_private++;
+ if (clear_bit_on_2nd_bitmap_for_kernel(pfn))
+ pfn_cache_private++;
}
/*
* Exclude the data page of the user process.
*/
else if ((info->dump_level & DL_EXCLUDE_USER_DATA)
&& isAnon(mapping)) {
- clear_bit_on_2nd_bitmap_for_kernel(pfn);
- pfn_user++;
+ if (clear_bit_on_2nd_bitmap_for_kernel(pfn))
+ pfn_user++;
}
}
return TRUE;
@@ -3813,6 +3839,44 @@ exclude_unnecessary_pages(void)
return TRUE;
}
+void
+copy_bitmap_cyclic(void)
+{
+ memcpy(info->partial_bitmap2, info->partial_bitmap1, BUFSIZE_CYCLIC);
+}
+
+int
+exclude_unnecessary_pages_cyclic(void)
+{
+ unsigned int mm;
+ struct mem_map_data *mmd;
+
+ /*
+ * Copy 1st-bitmap to 2nd-bitmap.
+ */
+ copy_bitmap_cyclic();
+
+ if (info->dump_level & DL_EXCLUDE_FREE)
+ if (!exclude_free_page())
+ return FALSE;
+
+ for (mm = 0; mm < info->num_mem_map; mm++) {
+
+ mmd = &info->mem_map_data[mm];
+
+ if (mmd->mem_map == NOT_MEMMAP_ADDR)
+ continue;
+
+ if (mmd->pfn_end >= info->cyclic_start_pfn || mmd->pfn_start <= info->cyclic_end_pfn) {
+ if (!__exclude_unnecessary_pages(mmd->mem_map,
+ mmd->pfn_start, mmd->pfn_end))
+ return FALSE;
+ }
+ }
+
+ return TRUE;
+}
+
int
copy_bitmap(void)
{
--
1.7.9.2
