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

makedumpfile: Revert "makedumpfile: disable mmap"

Browse Source 
This reverts commit 2dc9600ad1:

commit 2dc9600
Author: Dave Young <dyoung@redhat.com>
Date:   Thu Nov 14 10:51:47 2013 +0800

    makedumpfile: disable mmap

    There's a  kernel bug for mapping mem ranges which end with
    an address not aligned to page boundry. It's still not resolved
    in upstream, so let's disable mmap read for now as a workaround.

    Once upstream got a right fix we can revert this patch.

    Signed-off-by: Dave Young <dyoung@redhat.com>

Signed-off-by: WANG Chao <chaowang@redhat.com>
Acked-by: Vivek Goyal <vgoyal@redhat.com>
This commit is contained in:
WANG Chao 2014-01-07 16:19:31 +08:00
parent 9b0f728d92
commit bad556cf2e
2 changed files with 0 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
kexec-tools-2.0.4-makedumpfile-disable-mmap.patch
View File

@ -1,36 +0,0 @@
makedumpfile: disable mmap read
There's a kernel bug for mapping mem ranges which end with
an address not aligned to page boundry. It's still not resolved
in upstream, so let's disable mmap read for now as a workaround.
Once upstream got a right fix we can revert this patch.
Signed-off-by: Dave Young <dyoung@redhat.com>
---
makedumpfile.c | 7 +++++++
1 file changed, 7 insertions(+)
--- kexec-tools/makedumpfile-1.5.4/makedumpfile.c.orig
+++ kexec-tools/makedumpfile-1.5.4/makedumpfile.c
@@ -3144,6 +3144,12 @@ out:
if (info->dump_level & DL_EXCLUDE_FREE)
setup_page_is_buddy();
+ /* There's a kernel bug for mapping mem ranges which end with
+ * an address not aligned to page boundry. It's still not resolved
+ * in upstream, so let's disable mmap read for now.
+ */
+ info->flag_usemmap = FALSE;
+#if 0
if (!initialize_mmap()) {
/* this kernel does not support mmap of vmcore */
DEBUG_MSG("Kernel can't mmap vmcore, using reads.\n");
@@ -3152,6 +3158,7 @@ out:
DEBUG_MSG("read %s with mmap()\n", info->name_memory);
info->flag_usemmap = TRUE;
}
+#endif
return TRUE;
}

2
kexec-tools.spec
View File

@ -89,7 +89,6 @@ Patch607: kexec-tools-2.0.4-makedumpfile-Update-pfn_cyclic-when-the-cyclic-buffe
Patch608: kexec-tools-2.0.4-makedumpfile-Use-divideup-to-calculate-maximum-required-bit.patch
Patch609: kexec-tools-2.0.4-makedumpfile-cache-Allocate-buffers-at-initialization-t.patch
Patch610: kexec-tools-2.0.4-makedumpfile-cache-Reuse-entry-in-pending-list.patch
Patch611: kexec-tools-2.0.4-makedumpfile-disable-mmap.patch
Patch612: kexec-tools-2.0.4-makedumpfile-Understand-v3.11-rc4-dmesg.patch
%description
@ -129,7 +128,6 @@ tar -z -x -v -f %{SOURCE19}
%patch608 -p1
%patch609 -p1
%patch610 -p1
%patch611 -p1
%patch001 -p1
%patch002 -p1
%patch003 -p1