* [PATCH v3 1/8] x86: Kill E820_RESERVED_KERN [not found] <1425775809-9373-1-git-send-email-yinghai@kernel.org> @ 2015-03-08 0:50 ` Yinghai Lu 0 siblings, 0 replies; 5+ messages in thread From: Yinghai Lu @ 2015-03-08 0:50 UTC (permalink / raw) To: Matt Fleming, H. Peter Anvin, Ingo Molnar, Borislav Petkov, Bjorn Helgaas Cc: Thomas Gleixner, Jiri Kosina, Chun-Yi Lee, linux-kernel, linux-efi, linux-pci, Yinghai Lu, stable Now we are using memblock to do early resource reserver/allocation instead of using e820 map directly, and setup_data is reserved in memblock early already. Also kexec generate setup_data and pass pointer to second kernel, so second kernel reserve setup_data by their own. (Now kexec-tools create SETUP_EFI and SETUP_E820_EXT). We can kill E820_RESERVED_KERN and not touch e820 map at all. That will fix bug in mark_nonsave_region that can not handle that case: E820_RAM and E820_RESERVED_KERN ranges are continuous and boundary is not page aligned. Bugzilla: https://bugzilla.opensuse.org/show_bug.cgi?id=913885 Reported-by: "Lee, Chun-Yi" <jlee@suse.com> Tested-by: "Lee, Chun-Yi" <jlee@suse.com> Cc: "Lee, Chun-Yi" <jlee@suse.com> Signed-off-by: Yinghai Lu <yinghai@kernel.org> Cc: stable@vger.kernel.org --- arch/x86/include/uapi/asm/e820.h | 9 --------- arch/x86/kernel/e820.c | 6 ++---- arch/x86/kernel/setup.c | 26 -------------------------- arch/x86/kernel/tboot.c | 3 +-- arch/x86/mm/init_64.c | 11 ++++------- 5 files changed, 7 insertions(+), 48 deletions(-) diff --git a/arch/x86/include/uapi/asm/e820.h b/arch/x86/include/uapi/asm/e820.h index d993e33..edc8a71 100644 --- a/arch/x86/include/uapi/asm/e820.h +++ b/arch/x86/include/uapi/asm/e820.h @@ -33,15 +33,6 @@ #define E820_NVS 4 #define E820_UNUSABLE 5 - -/* - * reserved RAM used by kernel itself - * if CONFIG_INTEL_TXT is enabled, memory of this type will be - * included in the S3 integrity calculation and so should not include - * any memory that BIOS might alter over the S3 transition - */ -#define E820_RESERVED_KERN 128 - #ifndef __ASSEMBLY__ #include <linux/types.h> struct e820entry { diff --git a/arch/x86/kernel/e820.c b/arch/x86/kernel/e820.c index 46201de..2a6bed9 100644 --- a/arch/x86/kernel/e820.c +++ b/arch/x86/kernel/e820.c @@ -134,7 +134,6 @@ static void __init e820_print_type(u32 type) { switch (type) { case E820_RAM: - case E820_RESERVED_KERN: printk(KERN_CONT "usable"); break; case E820_RESERVED: @@ -688,7 +687,7 @@ void __init e820_mark_nosave_regions(unsigned long limit_pfn) register_nosave_region(pfn, PFN_UP(ei->addr)); pfn = PFN_DOWN(ei->addr + ei->size); - if (ei->type != E820_RAM && ei->type != E820_RESERVED_KERN) + if (ei->type != E820_RAM) register_nosave_region(PFN_UP(ei->addr), pfn); if (pfn >= limit_pfn) @@ -902,7 +901,6 @@ void __init finish_e820_parsing(void) static inline const char *e820_type_to_string(int e820_type) { switch (e820_type) { - case E820_RESERVED_KERN: case E820_RAM: return "System RAM"; case E820_ACPI: return "ACPI Tables"; case E820_NVS: return "ACPI Non-volatile Storage"; @@ -1077,7 +1075,7 @@ void __init memblock_x86_fill(void) if (end != (resource_size_t)end) continue; - if (ei->type != E820_RAM && ei->type != E820_RESERVED_KERN) + if (ei->type != E820_RAM) continue; memblock_add(ei->addr, ei->size); diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c index 912f124..aed343b 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c @@ -478,30 +478,6 @@ static void __init parse_setup_data(void) } } -static void __init e820_reserve_setup_data(void) -{ - struct setup_data *data; - u64 pa_data; - int found = 0; - - pa_data = boot_params.hdr.setup_data; - while (pa_data) { - data = early_memremap(pa_data, sizeof(*data)); - e820_update_range(pa_data, sizeof(*data)+data->len, - E820_RAM, E820_RESERVED_KERN); - found = 1; - pa_data = data->next; - early_iounmap(data, sizeof(*data)); - } - if (!found) - return; - - sanitize_e820_map(e820.map, ARRAY_SIZE(e820.map), &e820.nr_map); - memcpy(&e820_saved, &e820, sizeof(struct e820map)); - printk(KERN_INFO "extended physical RAM map:\n"); - e820_print_map("reserve setup_data"); -} - static void __init memblock_x86_reserve_range_setup_data(void) { struct setup_data *data; @@ -1037,8 +1013,6 @@ void __init setup_arch(char **cmdline_p) early_dump_pci_devices(); #endif - /* update the e820_saved too */ - e820_reserve_setup_data(); finish_e820_parsing(); if (efi_enabled(EFI_BOOT)) diff --git a/arch/x86/kernel/tboot.c b/arch/x86/kernel/tboot.c index 91a4496..3c2752a 100644 --- a/arch/x86/kernel/tboot.c +++ b/arch/x86/kernel/tboot.c @@ -195,8 +195,7 @@ static int tboot_setup_sleep(void) tboot->num_mac_regions = 0; for (i = 0; i < e820.nr_map; i++) { - if ((e820.map[i].type != E820_RAM) - && (e820.map[i].type != E820_RESERVED_KERN)) + if (e820.map[i].type != E820_RAM) continue; add_mac_region(e820.map[i].addr, e820.map[i].size); diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c index c30efb6..63520ec 100644 --- a/arch/x86/mm/init_64.c +++ b/arch/x86/mm/init_64.c @@ -354,8 +354,7 @@ phys_pte_init(pte_t *pte_page, unsigned long addr, unsigned long end, next = (addr & PAGE_MASK) + PAGE_SIZE; if (addr >= end) { if (!after_bootmem && - !e820_any_mapped(addr & PAGE_MASK, next, E820_RAM) && - !e820_any_mapped(addr & PAGE_MASK, next, E820_RESERVED_KERN)) + !e820_any_mapped(addr & PAGE_MASK, next, E820_RAM)) set_pte(pte, __pte(0)); continue; } @@ -401,9 +400,8 @@ phys_pmd_init(pmd_t *pmd_page, unsigned long address, unsigned long end, next = (address & PMD_MASK) + PMD_SIZE; if (address >= end) { - if (!after_bootmem && - !e820_any_mapped(address & PMD_MASK, next, E820_RAM) && - !e820_any_mapped(address & PMD_MASK, next, E820_RESERVED_KERN)) + if (!after_bootmem && !e820_any_mapped( + address & PMD_MASK, next, E820_RAM)) set_pmd(pmd, __pmd(0)); continue; } @@ -476,8 +474,7 @@ phys_pud_init(pud_t *pud_page, unsigned long addr, unsigned long end, next = (addr & PUD_MASK) + PUD_SIZE; if (addr >= end) { if (!after_bootmem && - !e820_any_mapped(addr & PUD_MASK, next, E820_RAM) && - !e820_any_mapped(addr & PUD_MASK, next, E820_RESERVED_KERN)) + !e820_any_mapped(addr & PUD_MASK, next, E820_RAM)) set_pud(pud, __pud(0)); continue; } -- 1.8.4.5 ^ permalink raw reply related [flat|nested] 5+ messages in thread
[parent not found: <1425776181-10219-1-git-send-email-yinghai@kernel.org>]
* [PATCH v3 1/8] x86: Kill E820_RESERVED_KERN [not found] <1425776181-10219-1-git-send-email-yinghai@kernel.org> @ 2015-03-08 0:56 ` Yinghai Lu 2015-03-08 1:59 ` David Rientjes 0 siblings, 1 reply; 5+ messages in thread From: Yinghai Lu @ 2015-03-08 0:56 UTC (permalink / raw) To: Matt Fleming, H. Peter Anvin, Ingo Molnar, Borislav Petkov, Bjorn Helgaas Cc: Thomas Gleixner, Jiri Kosina, Chun-Yi Lee, linux-kernel, linux-efi, linux-pci, Yinghai Lu, stable Now we are using memblock to do early resource reserver/allocation instead of using e820 map directly, and setup_data is reserved in memblock early already. Also kexec generate setup_data and pass pointer to second kernel, so second kernel reserve setup_data by their own. (Now kexec-tools create SETUP_EFI and SETUP_E820_EXT). We can kill E820_RESERVED_KERN and not touch e820 map at all. That will fix bug in mark_nonsave_region that can not handle that case: E820_RAM and E820_RESERVED_KERN ranges are continuous and boundary is not page aligned. Bugzilla: https://bugzilla.opensuse.org/show_bug.cgi?id=913885 Reported-by: "Lee, Chun-Yi" <jlee@suse.com> Tested-by: "Lee, Chun-Yi" <jlee@suse.com> Cc: "Lee, Chun-Yi" <jlee@suse.com> Signed-off-by: Yinghai Lu <yinghai@kernel.org> Cc: stable@vger.kernel.org --- arch/x86/include/uapi/asm/e820.h | 9 --------- arch/x86/kernel/e820.c | 6 ++---- arch/x86/kernel/setup.c | 26 -------------------------- arch/x86/kernel/tboot.c | 3 +-- arch/x86/mm/init_64.c | 11 ++++------- 5 files changed, 7 insertions(+), 48 deletions(-) diff --git a/arch/x86/include/uapi/asm/e820.h b/arch/x86/include/uapi/asm/e820.h index d993e33..edc8a71 100644 --- a/arch/x86/include/uapi/asm/e820.h +++ b/arch/x86/include/uapi/asm/e820.h @@ -33,15 +33,6 @@ #define E820_NVS 4 #define E820_UNUSABLE 5 - -/* - * reserved RAM used by kernel itself - * if CONFIG_INTEL_TXT is enabled, memory of this type will be - * included in the S3 integrity calculation and so should not include - * any memory that BIOS might alter over the S3 transition - */ -#define E820_RESERVED_KERN 128 - #ifndef __ASSEMBLY__ #include <linux/types.h> struct e820entry { diff --git a/arch/x86/kernel/e820.c b/arch/x86/kernel/e820.c index 46201de..2a6bed9 100644 --- a/arch/x86/kernel/e820.c +++ b/arch/x86/kernel/e820.c @@ -134,7 +134,6 @@ static void __init e820_print_type(u32 type) { switch (type) { case E820_RAM: - case E820_RESERVED_KERN: printk(KERN_CONT "usable"); break; case E820_RESERVED: @@ -688,7 +687,7 @@ void __init e820_mark_nosave_regions(unsigned long limit_pfn) register_nosave_region(pfn, PFN_UP(ei->addr)); pfn = PFN_DOWN(ei->addr + ei->size); - if (ei->type != E820_RAM && ei->type != E820_RESERVED_KERN) + if (ei->type != E820_RAM) register_nosave_region(PFN_UP(ei->addr), pfn); if (pfn >= limit_pfn) @@ -902,7 +901,6 @@ void __init finish_e820_parsing(void) static inline const char *e820_type_to_string(int e820_type) { switch (e820_type) { - case E820_RESERVED_KERN: case E820_RAM: return "System RAM"; case E820_ACPI: return "ACPI Tables"; case E820_NVS: return "ACPI Non-volatile Storage"; @@ -1077,7 +1075,7 @@ void __init memblock_x86_fill(void) if (end != (resource_size_t)end) continue; - if (ei->type != E820_RAM && ei->type != E820_RESERVED_KERN) + if (ei->type != E820_RAM) continue; memblock_add(ei->addr, ei->size); diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c index 912f124..aed343b 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c @@ -478,30 +478,6 @@ static void __init parse_setup_data(void) } } -static void __init e820_reserve_setup_data(void) -{ - struct setup_data *data; - u64 pa_data; - int found = 0; - - pa_data = boot_params.hdr.setup_data; - while (pa_data) { - data = early_memremap(pa_data, sizeof(*data)); - e820_update_range(pa_data, sizeof(*data)+data->len, - E820_RAM, E820_RESERVED_KERN); - found = 1; - pa_data = data->next; - early_iounmap(data, sizeof(*data)); - } - if (!found) - return; - - sanitize_e820_map(e820.map, ARRAY_SIZE(e820.map), &e820.nr_map); - memcpy(&e820_saved, &e820, sizeof(struct e820map)); - printk(KERN_INFO "extended physical RAM map:\n"); - e820_print_map("reserve setup_data"); -} - static void __init memblock_x86_reserve_range_setup_data(void) { struct setup_data *data; @@ -1037,8 +1013,6 @@ void __init setup_arch(char **cmdline_p) early_dump_pci_devices(); #endif - /* update the e820_saved too */ - e820_reserve_setup_data(); finish_e820_parsing(); if (efi_enabled(EFI_BOOT)) diff --git a/arch/x86/kernel/tboot.c b/arch/x86/kernel/tboot.c index 91a4496..3c2752a 100644 --- a/arch/x86/kernel/tboot.c +++ b/arch/x86/kernel/tboot.c @@ -195,8 +195,7 @@ static int tboot_setup_sleep(void) tboot->num_mac_regions = 0; for (i = 0; i < e820.nr_map; i++) { - if ((e820.map[i].type != E820_RAM) - && (e820.map[i].type != E820_RESERVED_KERN)) + if (e820.map[i].type != E820_RAM) continue; add_mac_region(e820.map[i].addr, e820.map[i].size); diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c index c30efb6..63520ec 100644 --- a/arch/x86/mm/init_64.c +++ b/arch/x86/mm/init_64.c @@ -354,8 +354,7 @@ phys_pte_init(pte_t *pte_page, unsigned long addr, unsigned long end, next = (addr & PAGE_MASK) + PAGE_SIZE; if (addr >= end) { if (!after_bootmem && - !e820_any_mapped(addr & PAGE_MASK, next, E820_RAM) && - !e820_any_mapped(addr & PAGE_MASK, next, E820_RESERVED_KERN)) + !e820_any_mapped(addr & PAGE_MASK, next, E820_RAM)) set_pte(pte, __pte(0)); continue; } @@ -401,9 +400,8 @@ phys_pmd_init(pmd_t *pmd_page, unsigned long address, unsigned long end, next = (address & PMD_MASK) + PMD_SIZE; if (address >= end) { - if (!after_bootmem && - !e820_any_mapped(address & PMD_MASK, next, E820_RAM) && - !e820_any_mapped(address & PMD_MASK, next, E820_RESERVED_KERN)) + if (!after_bootmem && !e820_any_mapped( + address & PMD_MASK, next, E820_RAM)) set_pmd(pmd, __pmd(0)); continue; } @@ -476,8 +474,7 @@ phys_pud_init(pud_t *pud_page, unsigned long addr, unsigned long end, next = (addr & PUD_MASK) + PUD_SIZE; if (addr >= end) { if (!after_bootmem && - !e820_any_mapped(addr & PUD_MASK, next, E820_RAM) && - !e820_any_mapped(addr & PUD_MASK, next, E820_RESERVED_KERN)) + !e820_any_mapped(addr & PUD_MASK, next, E820_RAM)) set_pud(pud, __pud(0)); continue; } -- 1.8.4.5 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH v3 1/8] x86: Kill E820_RESERVED_KERN 2015-03-08 0:56 ` Yinghai Lu @ 2015-03-08 1:59 ` David Rientjes 2015-03-08 6:51 ` Yinghai Lu 2015-03-09 0:18 ` joeyli 0 siblings, 2 replies; 5+ messages in thread From: David Rientjes @ 2015-03-08 1:59 UTC (permalink / raw) To: Yinghai Lu Cc: Matt Fleming, H. Peter Anvin, Ingo Molnar, Borislav Petkov, Bjorn Helgaas, Thomas Gleixner, Jiri Kosina, Chun-Yi Lee, linux-kernel, linux-efi, linux-pci, stable On Sat, 7 Mar 2015, Yinghai Lu wrote: > Now we are using memblock to do early resource reserver/allocation > instead of using e820 map directly, and setup_data is reserved in > memblock early already. > Also kexec generate setup_data and pass pointer to second kernel, > so second kernel reserve setup_data by their own. > (Now kexec-tools create SETUP_EFI and SETUP_E820_EXT). > > We can kill E820_RESERVED_KERN and not touch e820 map at all. > > That will fix bug in mark_nonsave_region that can not handle that > case: E820_RAM and E820_RESERVED_KERN ranges are continuous and > boundary is not page aligned. > > Bugzilla: https://bugzilla.opensuse.org/show_bug.cgi?id=913885 Is this the bug referenced in the commit message that is fixed? If so, it's only a bug for resume, correct? I'm not sure if that's clear enough just from the commit message, I was looking at this patch for an e820 problem I'm currently facing on 3.3. > Reported-by: "Lee, Chun-Yi" <jlee@suse.com> > Tested-by: "Lee, Chun-Yi" <jlee@suse.com> > Cc: "Lee, Chun-Yi" <jlee@suse.com> > Signed-off-by: Yinghai Lu <yinghai@kernel.org> > Cc: stable@vger.kernel.org Hmm, although the bug is reported for a 3.12 kernel, I assume this is for stable 3.10+? If so, it should apply fine with the exception of removing e820_reserve_setup_data() from setup_arch() rather than memblock_x86_reserve_range_setup_data(). Or is it for 3.2 as well and needs to be completely rebased for that kernel? ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH v3 1/8] x86: Kill E820_RESERVED_KERN 2015-03-08 1:59 ` David Rientjes @ 2015-03-08 6:51 ` Yinghai Lu 2015-03-09 0:18 ` joeyli 1 sibling, 0 replies; 5+ messages in thread From: Yinghai Lu @ 2015-03-08 6:51 UTC (permalink / raw) To: David Rientjes Cc: Matt Fleming, H. Peter Anvin, Ingo Molnar, Borislav Petkov, Bjorn Helgaas, Thomas Gleixner, Jiri Kosina, Chun-Yi Lee, Linux Kernel Mailing List, linux-efi@vger.kernel.org, linux-pci@vger.kernel.org, stable@vger.kernel.org On Sat, Mar 7, 2015 at 5:59 PM, David Rientjes <rientjes@google.com> wrote: > > Hmm, although the bug is reported for a 3.12 kernel, I assume this is for > stable 3.10+? If so, it should apply fine with the exception of removing > e820_reserve_setup_data() from setup_arch() rather than > memblock_x86_reserve_range_setup_data(). Or is it for 3.2 as well and > needs to be completely rebased for that kernel? For 3.10+, we will need to following patches, otherwise will have warning for SETUP_PCI with ioremap. for 3.2 that does not SETUP_PCI, should be ok, but will need rebase. Thanks Yinghai ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH v3 1/8] x86: Kill E820_RESERVED_KERN 2015-03-08 1:59 ` David Rientjes 2015-03-08 6:51 ` Yinghai Lu @ 2015-03-09 0:18 ` joeyli 1 sibling, 0 replies; 5+ messages in thread From: joeyli @ 2015-03-09 0:18 UTC (permalink / raw) To: David Rientjes Cc: Yinghai Lu, Matt Fleming, H. Peter Anvin, Ingo Molnar, Borislav Petkov, Bjorn Helgaas, Thomas Gleixner, Jiri Kosina, linux-kernel, linux-efi, linux-pci, stable On Sat, Mar 07, 2015 at 05:59:14PM -0800, David Rientjes wrote: > On Sat, 7 Mar 2015, Yinghai Lu wrote: > > > Now we are using memblock to do early resource reserver/allocation > > instead of using e820 map directly, and setup_data is reserved in > > memblock early already. > > Also kexec generate setup_data and pass pointer to second kernel, > > so second kernel reserve setup_data by their own. > > (Now kexec-tools create SETUP_EFI and SETUP_E820_EXT). > > > > We can kill E820_RESERVED_KERN and not touch e820 map at all. > > > > That will fix bug in mark_nonsave_region that can not handle that > > case: E820_RAM and E820_RESERVED_KERN ranges are continuous and > > boundary is not page aligned. > > > > Bugzilla: https://bugzilla.opensuse.org/show_bug.cgi?id=913885 > > Is this the bug referenced in the commit message that is fixed? If so, > it's only a bug for resume, correct? I'm not sure if that's clear enough > just from the commit message, I was looking at this patch for an e820 > problem I'm currently facing on 3.3. Yinghai's patches fixed the e820 not page aligned issue that's one of the issues on bug reporter's machine. I found another issue of the BIOS that sometimes it doesn't really keep the e820 table unchanging for hibernate resuming, this BIOS issue causes the total available page number checking fail. I will file another openSUSE bug to separate those 2 issues. > > > Reported-by: "Lee, Chun-Yi" <jlee@suse.com> > > Tested-by: "Lee, Chun-Yi" <jlee@suse.com> > > Cc: "Lee, Chun-Yi" <jlee@suse.com> > > Signed-off-by: Yinghai Lu <yinghai@kernel.org> > > Cc: stable@vger.kernel.org > > Hmm, although the bug is reported for a 3.12 kernel, I assume this is for > stable 3.10+? If so, it should apply fine with the exception of removing > e820_reserve_setup_data() from setup_arch() rather than > memblock_x86_reserve_range_setup_data(). Or is it for 3.2 as well and > needs to be completely rebased for that kernel? Thanks a lot! Joey Lee ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2015-03-09 0:18 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <1425775809-9373-1-git-send-email-yinghai@kernel.org>
2015-03-08 0:50 ` [PATCH v3 1/8] x86: Kill E820_RESERVED_KERN Yinghai Lu
[not found] <1425776181-10219-1-git-send-email-yinghai@kernel.org>
2015-03-08 0:56 ` Yinghai Lu
2015-03-08 1:59 ` David Rientjes
2015-03-08 6:51 ` Yinghai Lu
2015-03-09 0:18 ` joeyli
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox