From: Yinghai Lu <yinghai@kernel.org>
To: 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>
Cc: Stefano Stabellini <stefano.stabellini@eu.citrix.com>,
linux-kernel@vger.kernel.org, Yinghai Lu <yinghai@kernel.org>
Subject: [PATCH 10/10] x86, mm: Add early_pgt_buf_*
Date: Mon, 8 Oct 2012 21:39:18 -0700 [thread overview]
Message-ID: <1349757558-10856-11-git-send-email-yinghai@kernel.org> (raw)
In-Reply-To: <1349757558-10856-1-git-send-email-yinghai@kernel.org>
So we could use the left early pgt buf in BRK at first, then use new one.
We avoid wasting in _BRK.
Also we don't need to memblock_reserve that buf in brk again, because all
BRK is reserved before.
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
---
arch/x86/include/asm/init.h | 3 +++
arch/x86/mm/init.c | 24 +++++++++++-------------
arch/x86/mm/init_32.c | 8 ++++++--
arch/x86/mm/init_64.c | 8 ++++++--
4 files changed, 26 insertions(+), 17 deletions(-)
diff --git a/arch/x86/include/asm/init.h b/arch/x86/include/asm/init.h
index b69e537..6ce8718 100644
--- a/arch/x86/include/asm/init.h
+++ b/arch/x86/include/asm/init.h
@@ -15,6 +15,9 @@ kernel_physical_mapping_init(unsigned long start,
extern unsigned long __initdata pgt_buf_start;
extern unsigned long __meminitdata pgt_buf_end;
extern unsigned long __meminitdata pgt_buf_top;
+extern unsigned long __initdata early_pgt_buf_start;
+extern unsigned long __meminitdata early_pgt_buf_end;
+extern unsigned long __meminitdata early_pgt_buf_top;
bool is_pfn_in_early_pgt_buf(unsigned long pfn);
diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c
index 1becfbd..34d47c3 100644
--- a/arch/x86/mm/init.c
+++ b/arch/x86/mm/init.c
@@ -20,10 +20,14 @@
unsigned long __initdata pgt_buf_start;
unsigned long __meminitdata pgt_buf_end;
unsigned long __meminitdata pgt_buf_top;
+unsigned long __initdata early_pgt_buf_start;
+unsigned long __meminitdata early_pgt_buf_end;
+unsigned long __meminitdata early_pgt_buf_top;
bool __init is_pfn_in_early_pgt_buf(unsigned long pfn)
{
- return pfn >= pgt_buf_start && pfn < pgt_buf_top;
+ return (pfn >= early_pgt_buf_start && pfn < early_pgt_buf_top) ||
+ (pfn >= pgt_buf_start && pfn < pgt_buf_top);
}
int after_bootmem;
@@ -325,16 +329,10 @@ static void __init find_early_table_space(unsigned long start,
panic("Cannot find space for the kernel page tables");
init_memory_mapping(base, base + tables);
- if (pgt_buf_end > pgt_buf_start) {
+ if (early_pgt_buf_end > early_pgt_buf_start)
printk(KERN_DEBUG "kernel direct mapping tables from %#lx to %#lx @ [mem %#010lx-%#010lx]\n",
- base, base + tables - 1, pgt_buf_start << PAGE_SHIFT,
- (pgt_buf_end << PAGE_SHIFT) - 1);
-
- memblock_reserve(PFN_PHYS(pgt_buf_start),
- PFN_PHYS(pgt_buf_end) - PFN_PHYS(pgt_buf_start));
- }
- x86_init.mapping.make_range_readwrite(PFN_PHYS(pgt_buf_end),
- PFN_PHYS(pgt_buf_top));
+ base, base + tables - 1, early_pgt_buf_start << PAGE_SHIFT,
+ (early_pgt_buf_end << PAGE_SHIFT) - 1);
pgt_buf_start = base >> PAGE_SHIFT;
pgt_buf_end = pgt_buf_start;
@@ -493,9 +491,9 @@ void __init early_alloc_pgt_buf(void)
base = __pa(extend_brk(tables, PAGE_SIZE));
- pgt_buf_start = base >> PAGE_SHIFT;
- pgt_buf_end = pgt_buf_start;
- pgt_buf_top = pgt_buf_start + (tables >> PAGE_SHIFT);
+ early_pgt_buf_start = base >> PAGE_SHIFT;
+ early_pgt_buf_end = early_pgt_buf_start;
+ early_pgt_buf_top = early_pgt_buf_start + (tables >> PAGE_SHIFT);
}
/*
diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c
index 27f7fc6..70fa732 100644
--- a/arch/x86/mm/init_32.c
+++ b/arch/x86/mm/init_32.c
@@ -61,10 +61,14 @@ bool __read_mostly __vmalloc_start_set = false;
static __init void *alloc_low_page(void)
{
- unsigned long pfn = pgt_buf_end++;
+ unsigned long pfn;
void *adr;
- if (pfn >= pgt_buf_top)
+ if (early_pgt_buf_end < early_pgt_buf_top)
+ pfn = early_pgt_buf_end++;
+ else if (pgt_buf_end < pgt_buf_top)
+ pfn = pgt_buf_end++;
+ else
panic("alloc_low_page: ran out of memory");
adr = __va(pfn * PAGE_SIZE);
diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c
index aab1fc1..110c1e4 100644
--- a/arch/x86/mm/init_64.c
+++ b/arch/x86/mm/init_64.c
@@ -316,7 +316,7 @@ void __init cleanup_highmap(void)
static __ref void *alloc_low_page(unsigned long *phys)
{
- unsigned long pfn = pgt_buf_end++;
+ unsigned long pfn;
void *adr;
if (after_bootmem) {
@@ -326,7 +326,11 @@ static __ref void *alloc_low_page(unsigned long *phys)
return adr;
}
- if (pfn >= pgt_buf_top)
+ if (early_pgt_buf_end < early_pgt_buf_top)
+ pfn = early_pgt_buf_end++;
+ else if (pgt_buf_end < pgt_buf_top)
+ pfn = pgt_buf_end++;
+ else
panic("alloc_low_page: ran out of memory");
adr = __va(pfn * PAGE_SIZE);
--
1.7.7
next prev parent reply other threads:[~2012-10-09 4:41 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-09 4:39 [PATCH -v2 00/10] x86: Use BRK to pre mapping page table to make xen happy Yinghai Lu
2012-10-09 4:39 ` [PATCH 01/10] x86, mm: align start address to correct big page size Yinghai Lu
2012-10-09 4:39 ` [PATCH 02/10] x86, mm: Use big page size for small memory range Yinghai Lu
2012-10-09 4:39 ` [PATCH 03/10] x86, mm: get early page table from BRK Yinghai Lu
2012-10-09 16:01 ` Konrad Rzeszutek Wilk
2012-10-10 1:03 ` Yinghai Lu
2012-10-10 14:17 ` Konrad Rzeszutek Wilk
2012-10-10 15:49 ` Yinghai Lu
2012-10-11 14:41 ` Konrad Rzeszutek Wilk
2012-10-11 22:55 ` Yinghai Lu
2012-10-11 23:18 ` H. Peter Anvin
2012-10-09 4:39 ` [PATCH 04/10] x86, mm: Don't clear page table if next range is ram Yinghai Lu
2012-10-09 16:04 ` Konrad Rzeszutek Wilk
2012-10-10 1:08 ` Yinghai Lu
2012-10-09 4:39 ` [PATCH 05/10] x86, mm: Remove early_memremap workaround for page table accessing Yinghai Lu
2012-10-09 4:39 ` [PATCH 06/10] x86, mm: only keep initial mapping for ram Yinghai Lu
2012-10-09 4:39 ` [PATCH 07/10] x86, xen, mm: Do not need to check if page table is ioremap Yinghai Lu
2012-10-09 16:13 ` Konrad Rzeszutek Wilk
2012-10-09 4:39 ` [PATCH 08/10] x86, xen, mm: fix mapping_pagetable_reserve logic Yinghai Lu
2012-10-09 6:12 ` H. Peter Anvin
2012-10-09 6:33 ` Yinghai Lu
2012-10-09 7:22 ` H. Peter Anvin
2012-10-09 12:22 ` Stefano Stabellini
2012-10-09 14:15 ` H. Peter Anvin
2012-10-09 4:39 ` [PATCH 09/10] x86, mm: Hide pgt_buf_* into internal to xen Yinghai Lu
2012-10-09 4:39 ` Yinghai Lu [this message]
2012-10-09 6:07 ` [PATCH -v2 00/10] x86: Use BRK to pre mapping page table to make xen happy H. Peter Anvin
2012-10-09 6:21 ` Yinghai Lu
2012-10-09 6:25 ` H. Peter Anvin
2012-10-09 6:45 ` Yinghai Lu
2012-10-09 12:19 ` Stefano Stabellini
2012-10-09 18:27 ` Yinghai Lu
2012-10-10 0:00 ` 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=1349757558-10856-11-git-send-email-yinghai@kernel.org \
--to=yinghai@kernel.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=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
Powered by JetHome