From: Yinghai Lu <yinghai@kernel.org>
To: Konrad Rzeszutek Wilk <konrad@kernel.org>
Cc: Stefano Stabellini <stefano.stabellini@eu.citrix.com>,
Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@elte.hu>,
"H. Peter Anvin" <hpa@zytor.com>, Jacob Shin <jacob.shin@amd.com>,
Tejun Heo <tj@kernel.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH -v3 0/7] x86: Use BRK to pre mapping page table to make xen happy
Date: Tue, 30 Oct 2012 07:47:38 -0700 [thread overview]
Message-ID: <CAE9FiQVXzOQG2XmA5Y_DX1JCGg_-LdM9tG3Chq7-7rNvUseRhg@mail.gmail.com> (raw)
In-Reply-To: <20121030134442.GB27463@phenom.dumpdata.com>
[-- Attachment #1: Type: text/plain, Size: 596 bytes --]
On Tue, Oct 30, 2012 at 6:44 AM, Konrad Rzeszutek Wilk
<konrad@kernel.org> wrote:
> On Wed, Oct 10, 2012 at 11:13:45PM -0700, Yinghai Lu wrote:
> So which branch should I try out? Do you have one with all of the
> required patches so I can just do a 3.7-rc3 'git pull' and try it out?
add for-x86-mm-test branch, and it is based on 3.7-rc3, and merged
with for-x86-mm branch.
so you can try
git://git.kernel.org/pub/scm/linux/kernel/git/yinghai/linux-yinghai.git
for-x86-mm-test
there is conflicts between for-x86-mm and 3.7-rc3, and attached patch
could be used to fix them
Thanks
Yinghai
[-- Attachment #2: merge.patch --]
[-- Type: application/octet-stream, Size: 5512 bytes --]
---
arch/x86/kernel/setup.c | 29 ---------------------
arch/x86/mm/init.c | 59 --------------------------------------------
arch/x86/platform/efi/efi.c | 15 +----------
3 files changed, 2 insertions(+), 101 deletions(-)
Index: linux-yinghai/arch/x86/kernel/setup.c
===================================================================
--- linux-yinghai.orig/arch/x86/kernel/setup.c
+++ linux-yinghai/arch/x86/kernel/setup.c
@@ -921,35 +921,6 @@ void __init setup_arch(char **cmdline_p)
init_mem_mapping();
-<<<<<<< HEAD
- /* max_pfn_mapped is updated here */
- max_low_pfn_mapped = init_memory_mapping(0, max_low_pfn<<PAGE_SHIFT);
- max_pfn_mapped = max_low_pfn_mapped;
-
-#ifdef CONFIG_X86_64
- if (max_pfn > max_low_pfn) {
- int i;
- unsigned long start, end;
- unsigned long start_pfn, end_pfn;
-
- for_each_mem_pfn_range(i, MAX_NUMNODES, &start_pfn, &end_pfn,
- NULL) {
-
- end = PFN_PHYS(end_pfn);
- if (end <= (1UL<<32))
- continue;
-
- start = PFN_PHYS(start_pfn);
- max_pfn_mapped = init_memory_mapping(
- max((1UL<<32), start), end);
- }
-
- /* can we preseve max_low_pfn ?*/
- max_low_pfn = max_pfn;
- }
-#endif
-=======
->>>>>>> for-x86-mm
memblock.current_limit = get_max_mapped();
dma_contiguous_reserve(0);
Index: linux-yinghai/arch/x86/mm/init.c
===================================================================
--- linux-yinghai.orig/arch/x86/mm/init.c
+++ linux-yinghai/arch/x86/mm/init.c
@@ -26,46 +26,6 @@ static unsigned long __initdata pgt_buf_
static unsigned long min_pfn_mapped;
/*
-<<<<<<< HEAD
- * First calculate space needed for kernel direct mapping page tables to cover
- * mr[0].start to mr[nr_range - 1].end, while accounting for possible 2M and 1GB
- * pages. Then find enough contiguous space for those page tables.
- */
-static void __init find_early_table_space(struct map_range *mr, int nr_range)
-{
- int i;
- unsigned long puds = 0, pmds = 0, ptes = 0, tables;
- unsigned long start = 0, good_end;
- phys_addr_t base;
-
- for (i = 0; i < nr_range; i++) {
- unsigned long range, extra;
-
- range = mr[i].end - mr[i].start;
- puds += (range + PUD_SIZE - 1) >> PUD_SHIFT;
-
- if (mr[i].page_size_mask & (1 << PG_LEVEL_1G)) {
- extra = range - ((range >> PUD_SHIFT) << PUD_SHIFT);
- pmds += (extra + PMD_SIZE - 1) >> PMD_SHIFT;
- } else {
- pmds += (range + PMD_SIZE - 1) >> PMD_SHIFT;
- }
-
- if (mr[i].page_size_mask & (1 << PG_LEVEL_2M)) {
- extra = range - ((range >> PMD_SHIFT) << PMD_SHIFT);
-#ifdef CONFIG_X86_32
- extra += PMD_SIZE;
-#endif
- ptes += (extra + PAGE_SIZE - 1) >> PAGE_SHIFT;
- } else {
- ptes += (range + PAGE_SIZE - 1) >> PAGE_SHIFT;
- }
- }
-
- tables = roundup(puds * sizeof(pud_t), PAGE_SIZE);
- tables += roundup(pmds * sizeof(pmd_t), PAGE_SIZE);
- tables += roundup(ptes * sizeof(pte_t), PAGE_SIZE);
-=======
* Pages returned are already directly mapped.
*
* Changing that is likely to break Xen, see commit
@@ -110,7 +70,6 @@ __ref void *alloc_low_pages(unsigned int
return __va(pfn << PAGE_SHIFT);
}
->>>>>>> for-x86-mm
/* need 4 4k for initial PMD_SIZE, 4k for 0-ISA_END_ADDRESS */
#define INIT_PGT_BUF_SIZE (5 * PAGE_SIZE)
@@ -135,11 +94,6 @@ int direct_gbpages
#endif
;
-<<<<<<< HEAD
- printk(KERN_DEBUG "kernel direct mapping tables up to %#lx @ [mem %#010lx-%#010lx]\n",
- mr[nr_range - 1].end - 1, pgt_buf_start << PAGE_SHIFT,
- (pgt_buf_top << PAGE_SHIFT) - 1);
-=======
static void __init init_gbpages(void)
{
#ifdef CONFIG_X86_64
@@ -148,7 +102,6 @@ static void __init init_gbpages(void)
else
direct_gbpages = 0;
#endif
->>>>>>> for-x86-mm
}
struct map_range {
@@ -340,17 +293,6 @@ static int __meminit split_mem_range(str
(mr[i].page_size_mask & (1<<PG_LEVEL_1G))?"1G":(
(mr[i].page_size_mask & (1<<PG_LEVEL_2M))?"2M":"4k"));
-<<<<<<< HEAD
- /*
- * Find space for the kernel direct mapping tables.
- *
- * Later we should allocate these tables in the local node of the
- * memory mapped. Unfortunately this is done currently before the
- * nodes are discovered.
- */
- if (!after_bootmem)
- find_early_table_space(mr, nr_range);
-=======
return nr_range;
}
@@ -399,7 +341,6 @@ unsigned long __init_refok init_memory_m
memset(mr, 0, sizeof(mr));
nr_range = 0;
nr_range = split_mem_range(mr, nr_range, start, end);
->>>>>>> for-x86-mm
for (i = 0; i < nr_range; i++)
ret = kernel_physical_mapping_init(mr[i].start, mr[i].end,
Index: linux-yinghai/arch/x86/platform/efi/efi.c
===================================================================
--- linux-yinghai.orig/arch/x86/platform/efi/efi.c
+++ linux-yinghai/arch/x86/platform/efi/efi.c
@@ -835,11 +835,7 @@ void __init efi_enter_virtual_mode(void)
efi_memory_desc_t *md, *prev_md = NULL;
efi_status_t status;
unsigned long size;
-<<<<<<< HEAD
- u64 end, systab, end_pfn;
-=======
- u64 end, systab, addr, npages, start_pfn, end_pfn;
->>>>>>> for-x86-mm
+ u64 end, systab, start_pfn, end_pfn;
void *p, *va, *new_memmap = NULL;
int count = 0;
@@ -894,14 +890,7 @@ void __init efi_enter_virtual_mode(void)
start_pfn = PFN_DOWN(md->phys_addr);
end_pfn = PFN_UP(end);
-<<<<<<< HEAD
- if (end_pfn <= max_low_pfn_mapped
- || (end_pfn > (1UL << (32 - PAGE_SHIFT))
- && end_pfn <= max_pfn_mapped)) {
-=======
-
- if (pfn_range_is_mapped(start_pfn, end_pfn))
->>>>>>> for-x86-mm
+ if (pfn_range_is_mapped(start_pfn, end_pfn)) {
va = __va(md->phys_addr);
if (!(md->attribute & EFI_MEMORY_WB))
next prev parent reply other threads:[~2012-10-30 14:47 UTC|newest]
Thread overview: 112+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-09 23:58 [PATCH -v3 0/7] x86: Use BRK to pre mapping page table to make xen happy Yinghai Lu
2012-10-09 23:58 ` [PATCH 1/7] x86, mm: align start address to correct big page size Yinghai Lu
2012-10-09 23:58 ` [PATCH 2/7] x86, mm: Use big page size for small memory range Yinghai Lu
2012-10-09 23:58 ` [PATCH 3/7] x86, mm: Don't clear page table if next range is ram Yinghai Lu
2012-10-09 23:58 ` [PATCH 4/7] x86, mm: only keep initial mapping for ram Yinghai Lu
2012-10-10 13:48 ` Konrad Rzeszutek Wilk
2012-10-10 14:59 ` Yinghai Lu
2012-10-09 23:58 ` [PATCH 5/7] x86, mm: Break down init_all_memory_mapping Yinghai Lu
2012-10-10 13:55 ` Konrad Rzeszutek Wilk
2012-10-10 15:42 ` Yinghai Lu
2012-10-09 23:58 ` [PATCH 6/7] x86, mm: setup page table from top-down Yinghai Lu
2012-10-10 1:53 ` Yinghai Lu
2012-10-10 16:38 ` Stefano Stabellini
2012-10-10 17:07 ` Yinghai Lu
2012-10-10 17:26 ` Stefano Stabellini
2012-10-10 17:38 ` Yinghai Lu
2012-11-16 17:14 ` H. Peter Anvin
2012-11-16 17:16 ` Yinghai Lu
2012-10-09 23:58 ` [PATCH 7/7] x86, mm: Remove early_memremap workaround for page table accessing Yinghai Lu
2012-10-10 13:47 ` [PATCH -v3 0/7] x86: Use BRK to pre mapping page table to make xen happy Konrad Rzeszutek Wilk
2012-10-10 14:55 ` Yinghai Lu
2012-10-10 16:40 ` Stefano Stabellini
2012-10-11 6:13 ` Yinghai Lu
2012-10-11 23:04 ` Yinghai Lu
2012-10-18 16:17 ` Stefano Stabellini
2012-10-18 16:26 ` Jacob Shin
2012-10-18 16:57 ` Stefano Stabellini
2012-10-18 20:36 ` Yinghai Lu
2012-10-18 20:40 ` Yinghai Lu
2012-10-18 21:57 ` Jacob Shin
2012-10-18 20:43 ` Yinghai Lu
2012-10-30 13:44 ` Konrad Rzeszutek Wilk
2012-10-30 14:47 ` Yinghai Lu [this message]
2012-11-03 21:35 ` Yinghai Lu
2012-11-03 21:37 ` H. Peter Anvin
2012-11-05 20:25 ` Yinghai Lu
2012-11-05 20:27 ` [PATCH 39/42] x86, mm: kill numa_free_all_bootmem() Yinghai Lu
2012-11-05 20:27 ` [PATCH 40/42] x86, mm: kill numa_64.h Yinghai Lu
2012-11-05 20:27 ` [PATCH 41/42] sparc, mm: Remove calling of free_all_bootmem_node() Yinghai Lu
2012-11-06 17:44 ` David Miller
2012-11-05 20:27 ` [PATCH 42/42] mm: Kill NO_BOOTMEM version free_all_bootmem_node() Yinghai Lu
2012-11-07 16:11 ` [PATCH -v3 0/7] x86: Use BRK to pre mapping page table to make xen happy Konrad Rzeszutek Wilk
2012-11-08 1:40 ` Konrad Rzeszutek Wilk
2012-11-08 4:06 ` Yinghai Lu
2012-11-09 20:31 ` Yinghai Lu
2012-11-12 19:30 ` Konrad Rzeszutek Wilk
2012-11-12 21:17 ` [PATCH v7 00/46] x86, mm: map ram from top-down with BRK and memblock Yinghai Lu
2012-11-12 21:17 ` [PATCH 01/46] x86, mm: Add global page_size_mask and probe one time only Yinghai Lu
2012-11-12 21:17 ` [PATCH 02/46] x86, mm: Split out split_mem_range from init_memory_mapping Yinghai Lu
2012-11-13 5:51 ` Yasuaki Ishimatsu
2012-11-13 6:20 ` Yinghai Lu
2012-11-13 7:03 ` snakky.zhang
2012-11-13 18:34 ` Yinghai Lu
2012-11-12 21:17 ` [PATCH 03/46] x86, mm: Move down find_early_table_space() Yinghai Lu
2012-11-12 21:18 ` [PATCH 04/46] x86, mm: Move init_memory_mapping calling out of setup.c Yinghai Lu
2012-11-12 21:18 ` [PATCH 05/46] x86, mm: Revert back good_end setting for 64bit Yinghai Lu
2012-11-12 21:18 ` [PATCH 06/46] x86, mm: Change find_early_table_space() paramters Yinghai Lu
2012-11-12 21:18 ` [PATCH 07/46] x86, mm: Find early page table buffer together Yinghai Lu
2012-11-12 21:18 ` [PATCH 08/46] x86, mm: Separate out calculate_table_space_size() Yinghai Lu
2012-11-12 21:18 ` [PATCH 09/46] x86, mm: Set memblock initial limit to 1M Yinghai Lu
2012-11-12 21:18 ` [PATCH 10/46] x86, mm: if kernel .text .data .bss are not marked as E820_RAM, complain and fix Yinghai Lu
2012-11-12 21:18 ` [PATCH 11/46] x86, mm: Fixup code testing if a pfn is direct mapped Yinghai Lu
2012-11-12 21:18 ` [PATCH 12/46] x86, mm: use pfn_range_is_mapped() with CPA Yinghai Lu
2012-11-12 21:18 ` [PATCH 13/46] x86, mm: use pfn_range_is_mapped() with gart Yinghai Lu
2012-11-12 21:18 ` [PATCH 14/46] x86, mm: use pfn_range_is_mapped() with reserve_initrd Yinghai Lu
2012-11-12 21:18 ` [PATCH 15/46] x86, mm: Only direct map addresses that are marked as E820_RAM Yinghai Lu
2012-11-12 21:18 ` [PATCH 16/46] x86, mm: relocate initrd under all mem for 64bit Yinghai Lu
2012-11-12 21:18 ` [PATCH 17/46] x86, mm: Align start address to correct big page size Yinghai Lu
2012-11-12 21:18 ` [PATCH 18/46] x86, mm: Use big page size for small memory range Yinghai Lu
2012-11-12 21:18 ` [PATCH 19/46] x86, mm: Don't clear page table if range is ram Yinghai Lu
2012-11-12 21:18 ` [PATCH 20/46] x86, mm: Break down init_all_memory_mapping Yinghai Lu
2012-11-12 21:18 ` [PATCH 21/46] x86, mm: setup page table in top-down Yinghai Lu
2012-11-13 17:26 ` Stefano Stabellini
2012-11-13 19:59 ` Yinghai Lu
2012-11-13 20:01 ` H. Peter Anvin
2012-11-13 20:36 ` Yinghai Lu
2012-11-15 19:28 ` Yinghai Lu
2012-11-12 21:18 ` [PATCH 22/46] x86, mm: Remove early_memremap workaround for page table accessing on 64bit Yinghai Lu
2012-11-13 16:52 ` Stefano Stabellini
2012-11-12 21:18 ` [PATCH 23/46] x86, mm: Remove parameter in alloc_low_page for 64bit Yinghai Lu
2012-11-13 17:40 ` Stefano Stabellini
2012-11-12 21:18 ` [PATCH 24/46] x86, mm: Merge alloc_low_page between 64bit and 32bit Yinghai Lu
2012-11-12 21:18 ` [PATCH 25/46] x86, mm: Move min_pfn_mapped back to mm/init.c Yinghai Lu
2012-11-12 21:18 ` [PATCH 26/46] x86, mm, Xen: Remove mapping_pagetable_reserve() Yinghai Lu
2012-11-13 16:36 ` Stefano Stabellini
2012-11-13 18:51 ` Yinghai Lu
2012-11-14 11:19 ` Stefano Stabellini
2012-11-12 21:18 ` [PATCH 27/46] x86, mm: Add alloc_low_pages(num) Yinghai Lu
2012-11-13 16:37 ` Stefano Stabellini
2012-11-13 18:53 ` Yinghai Lu
2012-11-12 21:18 ` [PATCH 28/46] x86, mm: Add pointer about Xen mmu requirement for alloc_low_pages Yinghai Lu
2012-11-13 16:38 ` Stefano Stabellini
2012-11-13 17:56 ` H. Peter Anvin
2012-11-13 18:58 ` Yinghai Lu
2012-11-12 21:18 ` [PATCH 29/46] x86, mm: only call early_ioremap_page_table_range_init() once Yinghai Lu
2012-11-12 21:18 ` [PATCH 30/46] x86, mm: Move back pgt_buf_* to mm/init.c Yinghai Lu
2012-11-12 21:18 ` [PATCH 31/46] x86, mm: Move init_gbpages() out of setup.c Yinghai Lu
2012-11-12 21:18 ` [PATCH 32/46] x86, mm: change low/hignmem_pfn_init to static on 32bit Yinghai Lu
2012-11-12 21:18 ` [PATCH 33/46] x86, mm: Move function declaration into mm_internal.h Yinghai Lu
2012-11-12 21:18 ` [PATCH 34/46] x86, mm: Add check before clear pte above max_low_pfn on 32bit Yinghai Lu
2012-11-12 21:18 ` [PATCH 35/46] x86, mm: use round_up/down in split_mem_range() Yinghai Lu
2012-11-12 21:18 ` [PATCH 36/46] x86, mm: use PFN_DOWN " Yinghai Lu
2012-11-12 21:18 ` [PATCH 37/46] x86, mm: use pfn instead of pos in split_mem_range Yinghai Lu
2012-11-12 21:18 ` [PATCH 38/46] x86, mm: use limit_pfn for end pfn Yinghai Lu
2012-11-12 21:18 ` [PATCH 39/46] x86, mm: Unifying after_bootmem for 32bit and 64bit Yinghai Lu
2012-11-12 21:18 ` [PATCH 40/46] x86, mm: Move after_bootmem to mm_internel.h Yinghai Lu
2012-11-12 21:18 ` [PATCH 41/46] x86, mm: Use clamp_t() in init_range_memory_mapping Yinghai Lu
2012-11-12 21:18 ` [PATCH 42/46] x86, mm: kill numa_free_all_bootmem() Yinghai Lu
2012-11-12 21:18 ` [PATCH 43/46] x86, mm: kill numa_64.h Yinghai Lu
2012-11-12 21:18 ` [PATCH 44/46] sparc, mm: Remove calling of free_all_bootmem_node() Yinghai Lu
2012-11-12 21:18 ` [PATCH 45/46] mm: Kill NO_BOOTMEM version free_all_bootmem_node() Yinghai Lu
2012-11-12 21:18 ` [PATCH 46/46] x86, mm: Let "memmap=" take more entries one time 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=CAE9FiQVXzOQG2XmA5Y_DX1JCGg_-LdM9tG3Chq7-7rNvUseRhg@mail.gmail.com \
--to=yinghai@kernel.org \
--cc=hpa@zytor.com \
--cc=jacob.shin@amd.com \
--cc=konrad@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=stefano.stabellini@eu.citrix.com \
--cc=tglx@linutronix.de \
--cc=tj@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).