From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> To: Yinghai Lu <yinghai@kernel.org> Cc: Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@elte.hu>, "H. Peter Anvin" <hpa@zytor.com>, Jacob Shin <jacob.shin@amd.com>, Andrew Morton <akpm@linux-foundation.org>, Stefano Stabellini <stefano.stabellini@eu.citrix.com>, linux-kernel@vger.kernel.org Subject: Re: [PATCH v8 29/46] x86, mm: only call early_ioremap_page_table_range_init() once Date: Wed, 28 Nov 2012 14:02:49 -0500 Message-ID: <20121128190249.GR21266@phenom.dumpdata.com> (raw) In-Reply-To: <1353123563-3103-30-git-send-email-yinghai@kernel.org> On Fri, Nov 16, 2012 at 07:39:06PM -0800, Yinghai Lu wrote: > On 32bit, before patcheset that only set page table for ram, we only > call that one time. Um.. Which patchset? x86, mm: Only direct map addresses that are marked as E820_RAM? > > Now, we are calling that during every init_memory_mapping if we have holes > under max_low_pfn. > > We should only call it one time after all ranges under max_low_page get > mapped just like we did before. > > Also that could avoid the risk to run out of pgt_buf in BRK. ^^- 'of running out of pgt_buf in BRK.' > > Need to update page_table_range_init() to count the pages for kmap page table > at first, and use new added alloc_low_pages() to get pages in sequence. > That will conform to the requirement that pages need to be in low to high order. > > Signed-off-by: Yinghai Lu <yinghai@kernel.org> > --- > arch/x86/mm/init.c | 13 +++++-------- > arch/x86/mm/init_32.c | 47 +++++++++++++++++++++++++++++++++++++++++------ > 2 files changed, 46 insertions(+), 14 deletions(-) > > diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c > index cb4f8ba..bed4888 100644 > --- a/arch/x86/mm/init.c > +++ b/arch/x86/mm/init.c > @@ -343,14 +343,6 @@ unsigned long __init_refok init_memory_mapping(unsigned long start, > ret = kernel_physical_mapping_init(mr[i].start, mr[i].end, > mr[i].page_size_mask); > > -#ifdef CONFIG_X86_32 > - early_ioremap_page_table_range_init(); > - > - load_cr3(swapper_pg_dir); > -#endif > - > - __flush_tlb_all(); > - > add_pfn_range_mapped(start >> PAGE_SHIFT, ret >> PAGE_SHIFT); > > return ret >> PAGE_SHIFT; > @@ -447,7 +439,12 @@ void __init init_mem_mapping(void) > /* can we preseve max_low_pfn ?*/ > max_low_pfn = max_pfn; > } > +#else > + early_ioremap_page_table_range_init(); > + load_cr3(swapper_pg_dir); > + __flush_tlb_all(); > #endif > + > early_memtest(0, max_pfn_mapped << PAGE_SHIFT); > } > > diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c > index a7f2df1..0ae1ba8 100644 > --- a/arch/x86/mm/init_32.c > +++ b/arch/x86/mm/init_32.c > @@ -135,8 +135,39 @@ pte_t * __init populate_extra_pte(unsigned long vaddr) > return one_page_table_init(pmd) + pte_idx; > } > > +static unsigned long __init > +page_table_range_init_count(unsigned long start, unsigned long end) > +{ > + unsigned long count = 0; > +#ifdef CONFIG_HIGHMEM > + int pmd_idx_kmap_begin = fix_to_virt(FIX_KMAP_END) >> PMD_SHIFT; > + int pmd_idx_kmap_end = fix_to_virt(FIX_KMAP_BEGIN) >> PMD_SHIFT; > + int pgd_idx, pmd_idx; > + unsigned long vaddr; > + > + if (pmd_idx_kmap_begin == pmd_idx_kmap_end) > + return 0; > + > + vaddr = start; > + pgd_idx = pgd_index(vaddr); > + > + for ( ; (pgd_idx < PTRS_PER_PGD) && (vaddr != end); pgd_idx++) { > + for (; (pmd_idx < PTRS_PER_PMD) && (vaddr != end); > + pmd_idx++) { > + if ((vaddr >> PMD_SHIFT) >= pmd_idx_kmap_begin && > + (vaddr >> PMD_SHIFT) <= pmd_idx_kmap_end) > + count++; > + vaddr += PMD_SIZE; > + } > + pmd_idx = 0; > + } > +#endif > + return count; > +} > + > static pte_t *__init page_table_kmap_check(pte_t *pte, pmd_t *pmd, > - unsigned long vaddr, pte_t *lastpte) > + unsigned long vaddr, pte_t *lastpte, > + void **adr) > { > #ifdef CONFIG_HIGHMEM > /* > @@ -150,16 +181,15 @@ static pte_t *__init page_table_kmap_check(pte_t *pte, pmd_t *pmd, > > if (pmd_idx_kmap_begin != pmd_idx_kmap_end > && (vaddr >> PMD_SHIFT) >= pmd_idx_kmap_begin > - && (vaddr >> PMD_SHIFT) <= pmd_idx_kmap_end > - && ((__pa(pte) >> PAGE_SHIFT) < pgt_buf_start > - || (__pa(pte) >> PAGE_SHIFT) >= pgt_buf_end)) { > + && (vaddr >> PMD_SHIFT) <= pmd_idx_kmap_end) { > pte_t *newpte; > int i; > > BUG_ON(after_bootmem); > - newpte = alloc_low_page(); > + newpte = *adr; > for (i = 0; i < PTRS_PER_PTE; i++) > set_pte(newpte + i, pte[i]); > + *adr = (void *)(((unsigned long)(*adr)) + PAGE_SIZE); > > paravirt_alloc_pte(&init_mm, __pa(newpte) >> PAGE_SHIFT); > set_pmd(pmd, __pmd(__pa(newpte)|_PAGE_TABLE)); > @@ -193,6 +223,11 @@ page_table_range_init(unsigned long start, unsigned long end, pgd_t *pgd_base) > pgd_t *pgd; > pmd_t *pmd; > pte_t *pte = NULL; > + unsigned long count = page_table_range_init_count(start, end); > + void *adr = NULL; > + > + if (count) > + adr = alloc_low_pages(count); > > vaddr = start; > pgd_idx = pgd_index(vaddr); > @@ -205,7 +240,7 @@ page_table_range_init(unsigned long start, unsigned long end, pgd_t *pgd_base) > for (; (pmd_idx < PTRS_PER_PMD) && (vaddr != end); > pmd++, pmd_idx++) { > pte = page_table_kmap_check(one_page_table_init(pmd), > - pmd, vaddr, pte); > + pmd, vaddr, pte, &adr); > > vaddr += PMD_SIZE; > } > -- > 1.7.7
next prev parent reply index Thread overview: 119+ messages / expand[flat|nested] mbox.gz Atom feed top 2012-11-17 3:38 [PATCH v8 00/46] x86, mm: map ram from top-down with BRK and memblock Yinghai Lu 2012-11-17 3:38 ` [PATCH v8 01/46] x86, mm: Add global page_size_mask and probe one time only Yinghai Lu 2012-11-22 1:38 ` [tip:x86/mm2] " tip-bot for Yinghai Lu 2012-11-17 3:38 ` [PATCH v8 02/46] x86, mm: Split out split_mem_range from init_memory_mapping Yinghai Lu 2012-11-22 1:39 ` [tip:x86/mm2] " tip-bot for Yinghai Lu 2012-11-17 3:38 ` [PATCH v8 03/46] x86, mm: Move down find_early_table_space() Yinghai Lu 2012-11-22 1:40 ` [tip:x86/mm2] " tip-bot for Yinghai Lu 2012-11-28 16:50 ` [PATCH v8 03/46] " Konrad Rzeszutek Wilk 2012-11-17 3:38 ` [PATCH v8 04/46] x86, mm: Move init_memory_mapping calling out of setup.c Yinghai Lu 2012-11-22 1:41 ` [tip:x86/mm2] " tip-bot for Yinghai Lu 2012-11-28 16:50 ` [PATCH v8 04/46] " Konrad Rzeszutek Wilk 2012-11-17 3:38 ` [PATCH v8 05/46] x86, mm: Revert back good_end setting for 64bit Yinghai Lu 2012-11-22 1:42 ` [tip:x86/mm2] " tip-bot for Yinghai Lu 2012-11-17 3:38 ` [PATCH v8 06/46] x86, mm: Change find_early_table_space() paramters Yinghai Lu 2012-11-22 1:43 ` [tip:x86/mm2] " tip-bot for Yinghai Lu 2012-11-28 16:50 ` [PATCH v8 06/46] " Konrad Rzeszutek Wilk 2012-11-17 3:38 ` [PATCH v8 07/46] x86, mm: Find early page table buffer together Yinghai Lu 2012-11-22 1:44 ` [tip:x86/mm2] " tip-bot for Yinghai Lu 2012-11-28 16:50 ` [PATCH v8 07/46] " Konrad Rzeszutek Wilk 2012-11-17 3:38 ` [PATCH v8 08/46] x86, mm: Separate out calculate_table_space_size() Yinghai Lu 2012-11-22 1:45 ` [tip:x86/mm2] " tip-bot for Yinghai Lu 2012-11-28 16:59 ` [PATCH v8 08/46] " Konrad Rzeszutek Wilk 2012-11-17 3:38 ` [PATCH v8 09/46] x86, mm: Set memblock initial limit to 1M Yinghai Lu 2012-11-22 1:46 ` [tip:x86/mm2] " tip-bot for Yinghai Lu 2012-11-17 3:38 ` [PATCH v8 10/46] x86, mm: if kernel .text .data .bss are not marked as E820_RAM, complain and fix Yinghai Lu 2012-11-22 1:47 ` [tip:x86/mm2] " tip-bot for Jacob Shin 2012-11-17 3:38 ` [PATCH v8 11/46] x86, mm: Fixup code testing if a pfn is direct mapped Yinghai Lu 2012-11-22 1:48 ` [tip:x86/mm2] " tip-bot for Jacob Shin 2012-11-17 3:38 ` [PATCH v8 12/46] x86, mm: use pfn_range_is_mapped() with CPA Yinghai Lu 2012-11-22 1:49 ` [tip:x86/mm2] " tip-bot for Yinghai Lu 2012-11-28 17:06 ` [PATCH v8 12/46] " Konrad Rzeszutek Wilk 2012-11-28 19:33 ` Yinghai Lu 2012-11-17 3:38 ` [PATCH v8 13/46] x86, mm: use pfn_range_is_mapped() with gart Yinghai Lu 2012-11-22 1:50 ` [tip:x86/mm2] " tip-bot for Yinghai Lu 2012-11-28 17:07 ` [PATCH v8 13/46] " Konrad Rzeszutek Wilk 2012-11-17 3:38 ` [PATCH v8 14/46] x86, mm: use pfn_range_is_mapped() with reserve_initrd Yinghai Lu 2012-11-22 1:51 ` [tip:x86/mm2] " tip-bot for Yinghai Lu 2012-11-28 17:08 ` [PATCH v8 14/46] " Konrad Rzeszutek Wilk 2012-11-28 19:40 ` Yinghai Lu 2012-11-17 3:38 ` [PATCH v8 15/46] x86, mm: Only direct map addresses that are marked as E820_RAM Yinghai Lu 2012-11-22 1:53 ` [tip:x86/mm2] " tip-bot for Jacob Shin 2012-11-28 17:15 ` [PATCH v8 15/46] " Konrad Rzeszutek Wilk 2012-11-28 19:43 ` Yinghai Lu 2012-11-17 3:38 ` [PATCH v8 16/46] x86, mm: relocate initrd under all mem for 64bit Yinghai Lu 2012-11-22 1:54 ` [tip:x86/mm2] " tip-bot for Yinghai Lu 2012-11-17 3:38 ` [PATCH v8 17/46] x86, mm: Align start address to correct big page size Yinghai Lu 2012-11-22 1:55 ` [tip:x86/mm2] " tip-bot for Yinghai Lu 2012-11-17 3:38 ` [PATCH v8 18/46] x86, mm: Use big page size for small memory range Yinghai Lu 2012-11-22 1:56 ` [tip:x86/mm2] " tip-bot for Yinghai Lu 2012-11-17 3:38 ` [PATCH v8 19/46] x86, mm: Don't clear page table if range is ram Yinghai Lu 2012-11-22 1:57 ` [tip:x86/mm2] " tip-bot for Yinghai Lu 2012-11-17 3:38 ` [PATCH v8 20/46] x86, mm: Break down init_all_memory_mapping Yinghai Lu 2012-11-22 1:58 ` [tip:x86/mm2] " tip-bot for Yinghai Lu 2012-11-17 3:38 ` [PATCH v8 21/46] x86, mm: setup page table in top-down Yinghai Lu 2012-11-22 1:59 ` [tip:x86/mm2] " tip-bot for Yinghai Lu 2012-11-28 17:50 ` [PATCH v8 21/46] " Konrad Rzeszutek Wilk 2012-11-28 20:16 ` Yinghai Lu 2012-12-05 21:53 ` Konrad Rzeszutek Wilk 2012-11-17 3:38 ` [PATCH v8 22/46] x86, mm: Remove early_memremap workaround for page table accessing on 64bit Yinghai Lu 2012-11-22 2:00 ` [tip:x86/mm2] " tip-bot for Yinghai Lu 2012-11-28 18:57 ` [PATCH v8 22/46] " Konrad Rzeszutek Wilk 2012-11-17 3:39 ` [PATCH v8 23/46] x86, mm: Remove parameter in alloc_low_page for 64bit Yinghai Lu 2012-11-22 2:01 ` [tip:x86/mm2] " tip-bot for Yinghai Lu 2012-11-28 18:57 ` [PATCH v8 23/46] " Konrad Rzeszutek Wilk 2012-11-17 3:39 ` [PATCH v8 24/46] x86, mm: Merge alloc_low_page between 64bit and 32bit Yinghai Lu 2012-11-22 2:02 ` [tip:x86/mm2] " tip-bot for Yinghai Lu 2012-11-17 3:39 ` [PATCH v8 25/46] x86, mm: Move min_pfn_mapped back to mm/init.c Yinghai Lu 2012-11-22 2:03 ` [tip:x86/mm2] " tip-bot for Yinghai Lu 2012-11-17 3:39 ` [PATCH v8 26/46] x86, mm, Xen: Remove mapping_pagetable_reserve() Yinghai Lu 2012-11-22 2:04 ` [tip:x86/mm2] " tip-bot for Yinghai Lu 2012-11-17 3:39 ` [PATCH v8 27/46] x86, mm: Add alloc_low_pages(num) Yinghai Lu 2012-11-22 2:05 ` [tip:x86/mm2] " tip-bot for Yinghai Lu 2012-11-17 3:39 ` [PATCH v8 28/46] x86, mm: Add pointer about Xen mmu requirement for alloc_low_pages Yinghai Lu 2012-11-22 2:06 ` [tip:x86/mm2] " tip-bot for Stefano Stabellini 2012-11-17 3:39 ` [PATCH v8 29/46] x86, mm: only call early_ioremap_page_table_range_init() once Yinghai Lu 2012-11-22 2:07 ` [tip:x86/mm2] " tip-bot for Yinghai Lu 2012-11-28 19:02 ` Konrad Rzeszutek Wilk [this message] 2012-11-17 3:39 ` [PATCH v8 30/46] x86, mm: Move back pgt_buf_* to mm/init.c Yinghai Lu 2012-11-22 2:08 ` [tip:x86/mm2] " tip-bot for Yinghai Lu 2012-11-17 3:39 ` [PATCH v8 31/46] x86, mm: Move init_gbpages() out of setup.c Yinghai Lu 2012-11-22 2:09 ` [tip:x86/mm2] " tip-bot for Yinghai Lu 2012-11-17 3:39 ` [PATCH v8 32/46] x86, mm: change low/hignmem_pfn_init to static on 32bit Yinghai Lu 2012-11-22 2:10 ` [tip:x86/mm2] x86, mm: change low/ hignmem_pfn_init " tip-bot for Yinghai Lu 2012-11-17 3:39 ` [PATCH v8 33/46] x86, mm: Move function declaration into mm_internal.h Yinghai Lu 2012-11-22 2:11 ` [tip:x86/mm2] " tip-bot for Yinghai Lu 2012-11-17 3:39 ` [PATCH v8 34/46] x86, mm: Add check before clear pte above max_low_pfn on 32bit Yinghai Lu 2012-11-22 2:13 ` [tip:x86/mm2] " tip-bot for Yinghai Lu 2012-11-28 19:09 ` [PATCH v8 34/46] " Konrad Rzeszutek Wilk 2012-11-28 20:38 ` Yinghai Lu 2012-11-17 3:39 ` [PATCH v8 35/46] x86, mm: use round_up/down in split_mem_range() Yinghai Lu 2012-11-22 2:14 ` [tip:x86/mm2] " tip-bot for Yinghai Lu 2012-11-17 3:39 ` [PATCH v8 36/46] x86, mm: use PFN_DOWN " Yinghai Lu 2012-11-22 2:15 ` [tip:x86/mm2] " tip-bot for Yinghai Lu 2012-11-17 3:39 ` [PATCH v8 37/46] x86, mm: use pfn instead of pos in split_mem_range Yinghai Lu 2012-11-22 2:16 ` [tip:x86/mm2] " tip-bot for Yinghai Lu 2012-11-17 3:39 ` [PATCH v8 38/46] x86, mm: use limit_pfn for end pfn Yinghai Lu 2012-11-22 2:17 ` [tip:x86/mm2] " tip-bot for Yinghai Lu 2012-11-17 3:39 ` [PATCH v8 39/46] x86, mm: Unifying after_bootmem for 32bit and 64bit Yinghai Lu 2012-11-22 2:18 ` [tip:x86/mm2] " tip-bot for Yinghai Lu 2012-11-17 3:39 ` [PATCH v8 40/46] x86, mm: Move after_bootmem to mm_internel.h Yinghai Lu 2012-11-22 2:19 ` [tip:x86/mm2] " tip-bot for Yinghai Lu 2012-11-17 3:39 ` [PATCH v8 41/46] x86, mm: Use clamp_t() in init_range_memory_mapping Yinghai Lu 2012-11-22 2:20 ` [tip:x86/mm2] " tip-bot for Yinghai Lu 2012-11-17 3:39 ` [PATCH v8 42/46] x86, mm: kill numa_free_all_bootmem() Yinghai Lu 2012-11-22 2:21 ` [tip:x86/mm2] " tip-bot for Yinghai Lu 2012-11-17 3:39 ` [PATCH v8 43/46] x86, mm: kill numa_64.h Yinghai Lu 2012-11-22 2:22 ` [tip:x86/mm2] " tip-bot for Yinghai Lu 2012-11-17 3:39 ` [PATCH v8 44/46] sparc, mm: Remove calling of free_all_bootmem_node() Yinghai Lu 2012-11-22 2:23 ` [tip:x86/mm2] sparc, mm: Remove calling of free_all_bootmem_node( ) tip-bot for Yinghai Lu 2012-11-17 3:39 ` [PATCH v8 45/46] mm: Kill NO_BOOTMEM version free_all_bootmem_node() Yinghai Lu 2012-11-22 2:24 ` [tip:x86/mm2] " tip-bot for Yinghai Lu 2012-11-17 3:39 ` [PATCH v8 46/46] x86, mm: Let "memmap=" take more entries one time Yinghai Lu 2012-11-22 2:25 ` [tip:x86/mm2] " tip-bot for Yinghai Lu 2012-11-28 19:12 ` [PATCH v8 46/46] " Konrad Rzeszutek Wilk 2012-11-27 21:17 ` [PATCH v8 00/46] x86, mm: map ram from top-down with BRK and memblock Konrad Rzeszutek Wilk 2012-11-28 19:35 ` Konrad Rzeszutek Wilk 2012-11-28 19:47 ` Yinghai Lu 2012-11-28 20:57 ` Konrad Rzeszutek Wilk 2012-11-28 21:06 ` Yinghai Lu
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20121128190249.GR21266@phenom.dumpdata.com \ --to=konrad.wilk@oracle.com \ --cc=akpm@linux-foundation.org \ --cc=hpa@zytor.com \ --cc=jacob.shin@amd.com \ --cc=linux-kernel@vger.kernel.org \ --cc=mingo@elte.hu \ --cc=stefano.stabellini@eu.citrix.com \ --cc=tglx@linutronix.de \ --cc=yinghai@kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
LKML Archive on lore.kernel.org Archives are clonable: git clone --mirror https://lore.kernel.org/lkml/0 lkml/git/0.git git clone --mirror https://lore.kernel.org/lkml/1 lkml/git/1.git git clone --mirror https://lore.kernel.org/lkml/2 lkml/git/2.git git clone --mirror https://lore.kernel.org/lkml/3 lkml/git/3.git git clone --mirror https://lore.kernel.org/lkml/4 lkml/git/4.git git clone --mirror https://lore.kernel.org/lkml/5 lkml/git/5.git git clone --mirror https://lore.kernel.org/lkml/6 lkml/git/6.git git clone --mirror https://lore.kernel.org/lkml/7 lkml/git/7.git git clone --mirror https://lore.kernel.org/lkml/8 lkml/git/8.git git clone --mirror https://lore.kernel.org/lkml/9 lkml/git/9.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 lkml lkml/ https://lore.kernel.org/lkml \ linux-kernel@vger.kernel.org public-inbox-index lkml Example config snippet for mirrors Newsgroup available over NNTP: nntp://nntp.lore.kernel.org/org.kernel.vger.linux-kernel AGPL code for this site: git clone https://public-inbox.org/public-inbox.git