makedumpfile/makedumpfile-always-use-bigger-SECTION_MAP_MASK.patch
Petr Tesařík 68172f3fda Accepting request 570628 from home:ptesarik:branches:Kernel:kdump
- makedumpfile-always-use-bigger-SECTION_MAP_MASK.patch: Always use
  bigger SECTION_MAP_MASK (bsc#1066811, bsc#1067703).
- Update to 1.6.3
  * Support kernels up to 4.14.8 (bsc#1068864).
  * 86_64: handle renamed init_level4_pgt -> init_top_pgt
  * Fix SECTION_MAP_MASK for kernel >= v.13
  * book3s/ppc64: Lower the max real address to 53 bits for
    kernels >= v4.11
  * Support symbol __cpu_online_mask
  * ppc64: update hash page table geometry
- Drop upstreamed patches:
  * makedumpfile-Fix-SECTION_MAP_MASK-for-kernel-v.13.patch
  * makedumpfile-handle-renamed-init_level4_pgt-init_top_pgt.patch
  * makedumpfile-ppc64-update-hash-page-table-geometry.patch
  * makedumpfile-book3s-ppc64-Lower-the-max-real-address-to-53-bits.patch
  * makedumpfile-__cpu_online_mask-symbol.patch
  * makedumpfile-vtop4_x86_64_pagetable.patch
  * makedumpfile-fix-KASLR-for-sadump.patch
  * makedumpfile-fix-KASLR-for-sadump-while-kdump.patch
  * makedumpfile-support-4.12.patch

OBS-URL: https://build.opensuse.org/request/show/570628
OBS-URL: https://build.opensuse.org/package/show/Kernel:kdump/makedumpfile?expand=0&rev=115
2018-01-29 14:09:29 +00:00

42 lines
1.3 KiB
Diff

From: Petr Tesarik <ptesarik@suse.com>
Date: Mon, 29 Jan 2018 14:59:28 +0200
Subject: Always use bigger SECTION_MAP_MASK
References: bsc#1066811, bsc#1067703
Upstream: not yet
Since kernel commit 2d070eab2e82 merely reused a previously unused bit, it
is safe to mask it off for all kernel versions, because it had always been
zero (even in kernels < 4.13).
Signed-off-by: Petr Tesarik <ptesarik@suse.com>
---
makedumpfile.c | 5 +----
makedumpfile.h | 1 -
2 files changed, 1 insertion(+), 5 deletions(-)
--- a/makedumpfile.c
+++ b/makedumpfile.c
@@ -3337,10 +3337,7 @@ section_mem_map_addr(unsigned long addr)
return NOT_KV_ADDR;
}
map = ULONG(mem_section + OFFSET(mem_section.section_mem_map));
- if (info->kernel_version < KERNEL_VERSION(4, 13, 0))
- map &= SECTION_MAP_MASK_4_12;
- else
- map &= SECTION_MAP_MASK;
+ map &= SECTION_MAP_MASK;
free(mem_section);
return map;
--- a/makedumpfile.h
+++ b/makedumpfile.h
@@ -186,7 +186,6 @@ isAnon(unsigned long mapping)
#define SECTION_NR_TO_ROOT(sec) ((sec) / SECTIONS_PER_ROOT())
#define SECTION_IS_ONLINE (1UL<<2)
#define SECTION_MAP_LAST_BIT (1UL<<3)
-#define SECTION_MAP_MASK_4_12 (~(SECTION_IS_ONLINE-1))
#define SECTION_MAP_MASK (~(SECTION_MAP_LAST_BIT-1))
#define NR_SECTION_ROOTS() divideup(num_section, SECTIONS_PER_ROOT())
#define SECTION_NR_TO_PFN(sec) ((sec) << PFN_SECTION_SHIFT())