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 22/46] x86, mm: Remove early_memremap workaround for page table accessing on 64bit
Date: Wed, 28 Nov 2012 13:57:27 -0500 [thread overview]
Message-ID: <20121128185727.GP21266@phenom.dumpdata.com> (raw)
In-Reply-To: <1353123563-3103-23-git-send-email-yinghai@kernel.org>
On Fri, Nov 16, 2012 at 07:38:59PM -0800, Yinghai Lu wrote:
> We try to put page table high to make room for kdump, and at that time
> those ranges are not mapped yet, and have to use ioremap to access it.
^^^ -> were ^^^^ -> had
>
> Now after patch that pre-map page table top down.
> x86, mm: setup page table in top-down
> We do not need that workaround anymore.
>
> Just use __va to return directly mapping address.
>
> Signed-off-by: Yinghai Lu <yinghai@kernel.org>
> Acked-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
> ---
> arch/x86/mm/init_64.c | 38 ++++----------------------------------
> 1 files changed, 4 insertions(+), 34 deletions(-)
>
> diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c
> index eefaea6..5ee9242 100644
> --- a/arch/x86/mm/init_64.c
> +++ b/arch/x86/mm/init_64.c
> @@ -340,36 +340,12 @@ static __ref void *alloc_low_page(unsigned long *phys)
> } else
> pfn = pgt_buf_end++;
>
> - adr = early_memremap(pfn * PAGE_SIZE, PAGE_SIZE);
> + adr = __va(pfn * PAGE_SIZE);
> clear_page(adr);
> *phys = pfn * PAGE_SIZE;
> return adr;
> }
>
> -static __ref void *map_low_page(void *virt)
> -{
> - void *adr;
> - unsigned long phys, left;
> -
> - if (after_bootmem)
> - return virt;
> -
> - phys = __pa(virt);
> - left = phys & (PAGE_SIZE - 1);
> - adr = early_memremap(phys & PAGE_MASK, PAGE_SIZE);
> - adr = (void *)(((unsigned long)adr) | left);
> -
> - return adr;
> -}
> -
> -static __ref void unmap_low_page(void *adr)
> -{
> - if (after_bootmem)
> - return;
> -
> - early_iounmap((void *)((unsigned long)adr & PAGE_MASK), PAGE_SIZE);
> -}
> -
> static unsigned long __meminit
> phys_pte_init(pte_t *pte_page, unsigned long addr, unsigned long end,
> pgprot_t prot)
> @@ -442,10 +418,9 @@ phys_pmd_init(pmd_t *pmd_page, unsigned long address, unsigned long end,
> if (pmd_val(*pmd)) {
> if (!pmd_large(*pmd)) {
> spin_lock(&init_mm.page_table_lock);
> - pte = map_low_page((pte_t *)pmd_page_vaddr(*pmd));
> + pte = (pte_t *)pmd_page_vaddr(*pmd);
> last_map_addr = phys_pte_init(pte, address,
> end, prot);
> - unmap_low_page(pte);
> spin_unlock(&init_mm.page_table_lock);
> continue;
> }
> @@ -483,7 +458,6 @@ phys_pmd_init(pmd_t *pmd_page, unsigned long address, unsigned long end,
>
> pte = alloc_low_page(&pte_phys);
> last_map_addr = phys_pte_init(pte, address, end, new_prot);
> - unmap_low_page(pte);
>
> spin_lock(&init_mm.page_table_lock);
> pmd_populate_kernel(&init_mm, pmd, __va(pte_phys));
> @@ -518,10 +492,9 @@ phys_pud_init(pud_t *pud_page, unsigned long addr, unsigned long end,
>
> if (pud_val(*pud)) {
> if (!pud_large(*pud)) {
> - pmd = map_low_page(pmd_offset(pud, 0));
> + pmd = pmd_offset(pud, 0);
> last_map_addr = phys_pmd_init(pmd, addr, end,
> page_size_mask, prot);
> - unmap_low_page(pmd);
> __flush_tlb_all();
> continue;
> }
> @@ -560,7 +533,6 @@ phys_pud_init(pud_t *pud_page, unsigned long addr, unsigned long end,
> pmd = alloc_low_page(&pmd_phys);
> last_map_addr = phys_pmd_init(pmd, addr, end, page_size_mask,
> prot);
> - unmap_low_page(pmd);
>
> spin_lock(&init_mm.page_table_lock);
> pud_populate(&init_mm, pud, __va(pmd_phys));
> @@ -596,17 +568,15 @@ kernel_physical_mapping_init(unsigned long start,
> next = end;
>
> if (pgd_val(*pgd)) {
> - pud = map_low_page((pud_t *)pgd_page_vaddr(*pgd));
> + pud = (pud_t *)pgd_page_vaddr(*pgd);
> last_map_addr = phys_pud_init(pud, __pa(start),
> __pa(end), page_size_mask);
> - unmap_low_page(pud);
> continue;
> }
>
> pud = alloc_low_page(&pud_phys);
> last_map_addr = phys_pud_init(pud, __pa(start), __pa(next),
> page_size_mask);
> - unmap_low_page(pud);
>
> spin_lock(&init_mm.page_table_lock);
> pgd_populate(&init_mm, pgd, __va(pud_phys));
> --
> 1.7.7
next prev parent reply other threads:[~2012-11-28 18:58 UTC|newest]
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 ` Konrad Rzeszutek Wilk [this message]
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 ` [PATCH v8 29/46] " Konrad Rzeszutek Wilk
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=20121128185727.GP21266@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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).