From: Yinghai Lu <yinghai@kernel.org>
To: "H. Peter Anvin" <hpa@zytor.com>
Cc: Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@elte.hu>,
Andrew Morton <akpm@linux-foundation.org>,
Tejun Heo <tj@kernel.org>, Thomas Renninger <trenn@suse.de>,
Tang Chen <tangchen@cn.fujitsu.com>,
linux-kernel@vger.kernel.org, Yinghai Lu <yinghai@kernel.org>
Subject: [PATCH v5 20/22] x86, mm: Add comments for step_size shift
Date: Fri, 14 Jun 2013 17:56:38 -0700 [thread overview]
Message-ID: <1371257800-11720-21-git-send-email-yinghai@kernel.org> (raw)
In-Reply-To: <1371257800-11720-1-git-send-email-yinghai@kernel.org>
As request by hpa, add comments for why we choose 5 for
step size shift.
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Reviewed-by: Tang Chen <tangchen@cn.fujitsu.com>
Tested-by: Tang Chen <tangchen@cn.fujitsu.com>
---
arch/x86/mm/init.c | 21 ++++++++++++++++++---
1 file changed, 18 insertions(+), 3 deletions(-)
diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c
index 3c21f16..5f38e72 100644
--- a/arch/x86/mm/init.c
+++ b/arch/x86/mm/init.c
@@ -395,8 +395,23 @@ static unsigned long __init init_range_memory_mapping(
return mapped_ram_size;
}
-/* (PUD_SHIFT-PMD_SHIFT)/2 */
-#define STEP_SIZE_SHIFT 5
+static unsigned long __init get_new_step_size(unsigned long step_size)
+{
+ /*
+ * initial mapped size is PMD_SIZE, aka 2M.
+ * We can not set step_size to be PUD_SIZE aka 1G yet.
+ * In worse case, when 1G is cross the 1G boundary, and
+ * PG_LEVEL_2M is not set, we will need 1+1+512 pages (aka 2M + 8k)
+ * to map 1G range with PTE. Use 5 as shift for now.
+ */
+ unsigned long new_step_size = step_size << 5;
+
+ if (new_step_size > step_size)
+ step_size = new_step_size;
+
+ return step_size;
+}
+
void __init init_mem_mapping(void)
{
unsigned long end, real_end, start, last_start;
@@ -445,7 +460,7 @@ void __init init_mem_mapping(void)
min_pfn_mapped = last_start >> PAGE_SHIFT;
/* only increase step_size after big range get mapped */
if (new_mapped_ram_size > mapped_ram_size)
- step_size <<= STEP_SIZE_SHIFT;
+ step_size = get_new_step_size(step_size);
mapped_ram_size += new_mapped_ram_size;
}
--
1.8.1.4
next prev parent reply other threads:[~2013-06-15 0:58 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-15 0:56 [PATCH v5 00/22] x86, ACPI, numa: Parse numa info early Yinghai Lu
2013-06-15 0:56 ` [PATCH v5 01/22] x86: Change get_ramdisk_image() to global Yinghai Lu
2013-06-15 0:56 ` [PATCH v5 02/22] x86, microcode: Use common get_ramdisk_image() Yinghai Lu
2013-06-15 0:56 ` [PATCH v5 03/22] x86, ACPI, mm: Kill max_low_pfn_mapped Yinghai Lu
2013-06-17 23:19 ` Toshi Kani
2013-06-17 23:36 ` Yinghai Lu
2013-06-17 23:55 ` Toshi Kani
2013-06-15 0:56 ` [PATCH v5 04/22] x86, ACPI: Search buffer above 4G in second try for acpi override tables Yinghai Lu
2013-06-17 23:22 ` Toshi Kani
2013-06-17 23:38 ` Yinghai Lu
2013-06-17 23:56 ` Toshi Kani
2013-06-15 0:56 ` [PATCH v5 05/22] x86, ACPI: Increase override tables number limit Yinghai Lu
2013-06-17 23:35 ` Toshi Kani
2013-06-15 0:56 ` [PATCH v5 06/22] x86, ACPI: Split acpi_initrd_override to find/copy two functions Yinghai Lu
2013-06-18 0:24 ` Toshi Kani
2013-06-15 0:56 ` [PATCH v5 07/22] x86, ACPI: Store override acpi tables phys addr in cpio files info array Yinghai Lu
2013-06-15 0:56 ` [PATCH v5 08/22] x86, ACPI: Make acpi_initrd_override_find work with 32bit flat mode Yinghai Lu
2013-06-15 0:56 ` [PATCH v5 09/22] x86, ACPI: Find acpi tables in initrd early from head_32.S/head64.c Yinghai Lu
2013-06-15 0:56 ` [PATCH v5 10/22] x86, mm, numa: Move two functions calling on successful path later Yinghai Lu
2013-06-15 0:56 ` [PATCH v5 11/22] x86, mm, numa: Call numa_meminfo_cover_memory() checking early Yinghai Lu
2013-06-15 0:56 ` [PATCH v5 12/22] x86, mm, numa: Move node_map_pfn alignment() to x86 Yinghai Lu
2013-06-15 0:56 ` [PATCH v5 13/22] x86, mm, numa: Use numa_meminfo to check node_map_pfn alignment Yinghai Lu
2013-06-15 0:56 ` [PATCH v5 14/22] x86, mm, numa: Set memblock nid later Yinghai Lu
2013-06-15 0:56 ` [PATCH v5 15/22] x86, mm, numa: Move node_possible_map setting later Yinghai Lu
2013-06-15 0:56 ` [PATCH v5 16/22] x86, mm, numa: Move emulation handling down Yinghai Lu
2013-06-15 0:56 ` [PATCH v5 17/22] x86, ACPI, numa, ia64: split SLIT handling out Yinghai Lu
2013-06-15 0:56 ` [PATCH v5 18/22] x86, mm, numa: Add early_initmem_init() stub Yinghai Lu
2013-06-15 0:56 ` [PATCH v5 19/22] x86, mm: Parse numa info early Yinghai Lu
2013-06-15 0:56 ` Yinghai Lu [this message]
2013-06-15 0:56 ` [PATCH v5 21/22] x86, mm: Make init_mem_mapping be able to be called several times Yinghai Lu
2013-06-15 0:56 ` [PATCH v5 22/22] x86, mm, numa: Put pagetable on local node ram for 64bit 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=1371257800-11720-21-git-send-email-yinghai@kernel.org \
--to=yinghai@kernel.org \
--cc=akpm@linux-foundation.org \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=tangchen@cn.fujitsu.com \
--cc=tglx@linutronix.de \
--cc=tj@kernel.org \
--cc=trenn@suse.de \
/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
all inboxes | Powered by JetHome®