| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Date: Thu, 5 Mar 2009 13:36:40 GMT
From: Pekka Enberg <penberg@...helsinki.fi>
To: linux-tip-commits@...r.kernel.org
Cc: linux-kernel@...r.kernel.org, hpa@...or.com, mingo@...hat.com,
yinghai@...nel.org, penberg@...helsinki.fi, tglx@...utronix.de,
mingo@...e.hu
Subject: [tip:x86/mm] x86: add gbpages support to 32-bit init_memory_mapping()
Commit-ID: 4bbd4fa03832208f0e6e0b9e73a0ffa2620a626a
Gitweb: http://git.kernel.org/tip/4bbd4fa03832208f0e6e0b9e73a0ffa2620a626a
Author: "Pekka Enberg" <penberg@...helsinki.fi>
AuthorDate: Thu, 5 Mar 2009 14:54:53 +0200
Commit: Ingo Molnar <mingo@...e.hu>
CommitDate: Thu, 5 Mar 2009 14:17:11 +0100
x86: add gbpages support to 32-bit init_memory_mapping()
Impact: cleanup
To reduce the diff between the 32-bit and 64-bit versions of
init_memory_mapping(), add gbpages support to the 32-bit version.
Signed-off-by: Pekka Enberg <penberg@...helsinki.fi>
Cc: Yinghai Lu <yinghai@...nel.org>
LKML-Reference: <1236257708-27269-2-git-send-email-penberg@...helsinki.fi>
Signed-off-by: Ingo Molnar <mingo@...e.hu>
---
arch/x86/mm/init_32.c | 23 ++++++++++++++++++-----
1 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c
index ad4e03c..5fad0f9 100644
--- a/arch/x86/mm/init_32.c
+++ b/arch/x86/mm/init_32.c
@@ -65,6 +65,8 @@ static unsigned long __meminitdata table_top;
static int __initdata after_init_bootmem;
+int direct_gbpages;
+
static __init void *alloc_low_page(void)
{
unsigned long pfn = table_end++;
@@ -831,14 +833,22 @@ void __init setup_bootmem_allocator(void)
after_init_bootmem = 1;
}
-static void __init find_early_table_space(unsigned long end, int use_pse)
+static void __init find_early_table_space(unsigned long end, int use_pse,
+ int use_gbpages)
{
unsigned long puds, pmds, ptes, tables, start;
puds = (end + PUD_SIZE - 1) >> PUD_SHIFT;
tables = roundup(puds * sizeof(pud_t), PAGE_SIZE);
- pmds = (end + PMD_SIZE - 1) >> PMD_SHIFT;
+ if (use_gbpages) {
+ unsigned long extra;
+
+ extra = end - ((end>>PUD_SHIFT) << PUD_SHIFT);
+ pmds = (extra + PMD_SIZE - 1) >> PMD_SHIFT;
+ } else
+ pmds = (end + PMD_SIZE - 1) >> PMD_SHIFT;
+
tables += roundup(pmds * sizeof(pmd_t), PAGE_SIZE);
if (use_pse) {
@@ -913,7 +923,7 @@ unsigned long __init_refok init_memory_mapping(unsigned long start,
struct map_range mr[NR_RANGE_MR];
int nr_range, i;
- int use_pse;
+ int use_pse, use_gbpages;
printk(KERN_INFO "init_memory_mapping: %016lx-%016lx\n", start, end);
@@ -923,9 +933,10 @@ unsigned long __init_refok init_memory_mapping(unsigned long start,
* This will simplify cpa(), which otherwise needs to support splitting
* large pages into small in interrupt context, etc.
*/
- use_pse = 0;
+ use_pse = use_gbpages = 0;
#else
use_pse = cpu_has_pse;
+ use_gbpages = direct_gbpages;
#endif
#ifdef CONFIG_X86_PAE
@@ -944,6 +955,8 @@ unsigned long __init_refok init_memory_mapping(unsigned long start,
__supported_pte_mask |= _PAGE_GLOBAL;
}
+ if (use_gbpages)
+ page_size_mask |= 1 << PG_LEVEL_1G;
if (use_pse)
page_size_mask |= 1 << PG_LEVEL_2M;
@@ -1015,7 +1028,7 @@ unsigned long __init_refok init_memory_mapping(unsigned long start,
* nodes are discovered.
*/
if (!after_init_bootmem)
- find_early_table_space(end, use_pse);
+ find_early_table_space(end, use_pse, use_gbpages);
for (i = 0; i < nr_range; i++)
kernel_physical_mapping_init(pgd_base,
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists