Commit 876ee61a authored Oct 04, 2012 by Jan Beulich Committed by Ingo Molnar Oct 24, 2012

x86-64: Fix page table accounting



Commit 20167d34 ("x86-64: Fix
accounting in kernel_physical_mapping_init()") went a little too
far by entirely removing the counting of pre-populated page
tables: this should be done at boot time (to cover the page
tables set up in early boot code), but shouldn't be done during
memory hot add.

Hence, re-add the removed increments of "pages", but make them
and the one in phys_pte_init() conditional upon !after_bootmem.

Reported-Acked-and-Tested-by: Hugh Dickins <hughd@google.com>
Signed-off-by: Jan Beulich <jbeulich@suse.com>
Cc: <stable@kernel.org>
Link: http://lkml.kernel.org/r/506DAFBA020000780009FA8C@nat28.tlf.novell.com


Signed-off-by: Ingo Molnar <mingo@kernel.org>

parent 7b16bbf9

arch/x86/mm/init_64.c

+6 −1

Original line number	Diff line number	Diff line
		@@ -386,6 +386,7 @@ phys_pte_init(pte_t *pte_page, unsigned long addr, unsigned long end,
		* these mappings are more intelligent.
		*/
		if (pte_val(*pte)) {
		if (!after_bootmem)
		pages++;
		continue;
		}
		@@ -451,6 +452,8 @@ phys_pmd_init(pmd_t *pmd_page, unsigned long address, unsigned long end,
		* attributes.
		*/
		if (page_size_mask & (1 << PG_LEVEL_2M)) {
		if (!after_bootmem)
		pages++;
		last_map_addr = next;
		continue;
		}
		@@ -526,6 +529,8 @@ phys_pud_init(pud_t *pud_page, unsigned long addr, unsigned long end,
		* attributes.
		*/
		if (page_size_mask & (1 << PG_LEVEL_1G)) {
		if (!after_bootmem)
		pages++;
		last_map_addr = next;
		continue;
		}

Admin message