rpms/kexec-tools
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Remove the 1st bitmap buffer from the ELF path in cyclic mode.

Browse Source 
This is a backport of the following upstream commit.

commit 16b94ab7fad6744d8b77f2b26838f220307e3118
Author: Atsushi Kumagai <kumagai-atsushi@mxc.nes.nec.co.jp>
Date:   Mon Jun 9 17:44:43 2014 +0900

    [PATCH 1/3] Remove the 1st bitmap buffer from the ELF path in cyclic mode.

    We can create the 2nd bitmap without creating the 1st bitmap by commit
    363d53fc8, so we don't need to create the 1st bitmap in cyclic mode
    in the ELF path since it isn't used. Thus, we can use the whole bitmap
    buffer only for the 2nd bitmap like the kdump path.

    Signed-off-by: Atsushi Kumagai <kumagai-atsushi@mxc.nes.nec.co.jp>

Signed-off-by: Baoquan He <bhe@redhat.com>
Acked-by: Vivek Goyal <vgoyal@redhat.com>
This commit is contained in:
Baoquan He 2014-07-15 15:50:23 +08:00 committed by WANG Chao
parent 598e09b6b6
commit 0bb00b495b
2 changed files with 191 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

189
kexec-tools-2.0.4-makedumpfile-Remove-the-1st-bitmap-buffer-from-the-ELF-.patch Normal file
View File

@ -0,0 +1,189 @@
From 16b94ab7fad6744d8b77f2b26838f220307e3118 Mon Sep 17 00:00:00 2001
From: Atsushi Kumagai <kumagai-atsushi@mxc.nes.nec.co.jp>
Date: Mon, 9 Jun 2014 17:44:43 +0900
Subject: [PATCH] [PATCH 1/3] Remove the 1st bitmap buffer from the ELF path in
cyclic mode.
We can create the 2nd bitmap without creating the 1st bitmap by commit
363d53fc8, so we don't need to create the 1st bitmap in cyclic mode
in the ELF path since it isn't used. Thus, we can use the whole bitmap
buffer only for the 2nd bitmap like the kdump path.
Signed-off-by: Atsushi Kumagai <kumagai-atsushi@mxc.nes.nec.co.jp>
Signed-off-by: Baoquan He <bhe@redhat.com>
---
makedumpfile.8 | 1 -
makedumpfile.c | 88 ++++++----------------------------------------------------
print_info.c | 1 -
3 files changed, 9 insertions(+), 81 deletions(-)
diff --git a/makedumpfile.8 b/makedumpfile.8
index 529335c..25fe74e 100644
--- a/makedumpfile-1.5.6/makedumpfile.8
+++ b/makedumpfile-1.5.6/makedumpfile.8
@@ -371,7 +371,6 @@ The default value is 4.
.TP
\fB\-\-cyclic\-buffer\fR \fIbuffer_size\fR
Specify the buffer size in kilo bytes for analysis in the cyclic mode.
-Actually, the double of \fIbuffer_size\fR kilo bytes will be allocated in memory.
In the cyclic mode, the number of cycles is represented as:
num_of_cycles = system_memory / (\fIbuffer_size\fR * 1024 * bit_per_bytes * page_size )
diff --git a/makedumpfile.c b/makedumpfile.c
index 34db997..f62e94c 100644
--- a/makedumpfile-1.5.6/makedumpfile.c
+++ b/makedumpfile-1.5.6/makedumpfile.c
@@ -3195,24 +3195,7 @@ out:
MSG("Specified buffer size is larger than free memory.\n");
MSG("The buffer size for the cyclic mode will ");
MSG("be truncated to %lld byte.\n", free_memory);
- /*
- * On conversion from ELF to ELF,
- * bufsize_cyclic is used to allocate
- * 1st and 2nd bitmap, so it should be
- * truncated to the half of
- * free_memory.
- *
- * On conversion from ELF to
- * kdump-compressed format, a whole
- * part of the 1st bitmap is created
- * first, so a whole part of
- * free_memory is used for the 2nd
- * bitmap.
- */
- if (info->flag_elf_dumpfile)
- info->bufsize_cyclic = free_memory / 2;
- else
- info->bufsize_cyclic = free_memory;
+ info->bufsize_cyclic = free_memory;
}
}
@@ -5016,38 +4999,6 @@ prepare_bitmap_buffer(void)
}
int
-prepare_bitmap_buffer_cyclic(void)
-{
- unsigned long long tmp;
-
- /*
- * Create 2 bitmaps (1st-bitmap & 2nd-bitmap) on block_size boundary.
- * The crash utility requires both of them to be aligned to block_size
- * boundary.
- */
- tmp = divideup(divideup(info->max_mapnr, BITPERBYTE), info->page_size);
- info->len_bitmap = tmp*info->page_size*2;
-
- /*
- * Prepare partial bitmap buffers for cyclic processing.
- */
- if ((info->partial_bitmap1 = (char *)malloc(info->bufsize_cyclic)) == NULL) {
- ERRMSG("Can't allocate memory for the 1st-bitmap. %s\n",
- strerror(errno));
- return FALSE;
- }
- if ((info->partial_bitmap2 = (char *)malloc(info->bufsize_cyclic)) == NULL) {
- ERRMSG("Can't allocate memory for the 2nd-bitmap. %s\n",
- strerror(errno));
- return FALSE;
- }
- initialize_bitmap_cyclic(info->partial_bitmap1);
- initialize_bitmap_cyclic(info->partial_bitmap2);
-
- return TRUE;
-}
-
-int
prepare_bitmap1_buffer_cyclic(void)
{
/*
@@ -5132,32 +5083,18 @@ free_bitmap2_buffer_cyclic()
}
}
-void
-free_bitmap_buffer_cyclic()
-{
- free_bitmap1_buffer_cyclic();
- free_bitmap2_buffer_cyclic();
-}
-
int
create_dump_bitmap(void)
{
int ret = FALSE;
if (info->flag_cyclic) {
+ if (!prepare_bitmap2_buffer_cyclic())
+ goto out;
+ info->num_dumpable = get_num_dumpable_cyclic();
- if (info->flag_elf_dumpfile) {
- if (!prepare_bitmap_buffer_cyclic())
- goto out;
-
- info->num_dumpable = get_num_dumpable_cyclic();
- } else {
- if (!prepare_bitmap2_buffer_cyclic())
- goto out;
-
- info->num_dumpable = get_num_dumpable_cyclic();
+ if (!info->flag_elf_dumpfile)
free_bitmap2_buffer_cyclic();
- }
} else {
if (!prepare_bitmap_buffer())
@@ -6051,8 +5988,6 @@ write_elf_pages_cyclic(struct cache_data *cd_header, struct cache_data *cd_page)
/*
* Update target region and partial bitmap if necessary.
*/
- if (!create_1st_bitmap_cyclic(&cycle))
- return FALSE;
if (!exclude_unnecessary_pages_cyclic(&cycle))
return FALSE;
@@ -6198,7 +6133,7 @@ write_elf_pages_cyclic(struct cache_data *cd_header, struct cache_data *cd_page)
if (!write_cache_bufsz(cd_page))
return FALSE;
- free_bitmap_buffer_cyclic();
+ free_bitmap2_buffer_cyclic();
/*
* print [100 %]
@@ -9027,15 +8962,10 @@ calculate_cyclic_buffer_size(void) {
}
/*
- * free_size will be used to allocate 1st and 2nd bitmap, so it
- * should be 40% of free memory to keep the size of cyclic buffer
- * within 80% of free memory.
+ * We should keep the size of cyclic buffer within 80% of free memory
+ * for safety.
*/
- if (info->flag_elf_dumpfile) {
- limit_size = get_free_memory_size() * 0.4;
- } else {
- limit_size = get_free_memory_size() * 0.8;
- }
+ limit_size = get_free_memory_size() * 0.8;
bitmap_size = info->max_mapnr / BITPERBYTE;
/* if --split was specified cyclic buffer allocated per dump file */
diff --git a/print_info.c b/print_info.c
index 104ec1c..7592690 100644
--- a/makedumpfile-1.5.6/print_info.c
+++ b/makedumpfile-1.5.6/print_info.c
@@ -191,7 +191,6 @@ print_usage(void)
MSG("\n");
MSG(" [--cyclic-buffer BUFFER_SIZE]:\n");
MSG(" Specify the buffer size in kilo bytes for analysis in the cyclic mode.\n");
- MSG(" Actually, the double of BUFFER_SIZE kilo bytes will be allocated in memory.\n");
MSG(" In the cyclic mode, the number of cycles is represented as:\n");
MSG("\n");
MSG(" num_of_cycles = system_memory / \n");
--
1.8.5.3

2
kexec-tools.spec
View File

@ -78,6 +78,7 @@ Patch601: kexec-tools-2.0.3-disable-kexec-test.patch
Patch602: kexec-tools-2.0.4-makedumpfile-Fix-Makefile-for-eppic_makedumpfile.so-build.patch
Patch603: kexec-tools-2.0.4-makedumpfile-Introduce-the-mdf_pfn_t-type.patch
Patch604: kexec-tools-2.0.4-makedumpfile-Fix-free-bitmap_buffer_cyclic-error.patch
Patch605: kexec-tools-2.0.4-makedumpfile-Remove-the-1st-bitmap-buffer-from-the-ELF-.patch
%description
kexec-tools provides /sbin/kexec binary that facilitates a new
@ -117,6 +118,7 @@ tar -z -x -v -f %{SOURCE23}
%patch602 -p1
%patch603 -p1
%patch604 -p1
%patch605 -p1
tar -z -x -v -f %{SOURCE13}