lkml.org 
[lkml]   [2009]   [Mar]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[tip:x86/mm] x86: ifdef 32-bit and 64-bit pfn setup in init_memory_mapping()
    Commit-ID:  c338d6f60fc29dfc74bd82b91526ef43ba992bab
    Gitweb: http://git.kernel.org/tip/c338d6f60fc29dfc74bd82b91526ef43ba992bab
    Author: "Pekka Enberg" <penberg@cs.helsinki.fi>
    AuthorDate: Thu, 5 Mar 2009 14:55:02 +0200
    Commit: Ingo Molnar <mingo@elte.hu>
    CommitDate: Thu, 5 Mar 2009 14:17:15 +0100

    x86: ifdef 32-bit and 64-bit pfn setup in init_memory_mapping()

    Impact: cleanup

    To reduce the diff between the 32-bit and 64-bit versions of
    init_memory_mapping(), ifdef configuration specific pfn setup
    code in the function.

    Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
    Cc: Yinghai Lu <yinghai@kernel.org>
    LKML-Reference: <1236257708-27269-11-git-send-email-penberg@cs.helsinki.fi>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>


    ---
    arch/x86/mm/init_32.c | 42 +++++++++++++++++++++++++++++++++++++++---
    arch/x86/mm/init_64.c | 21 +++++++++++++++++++++
    2 files changed, 60 insertions(+), 3 deletions(-)

    diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c
    index 3f91bdc..34760e4 100644
    --- a/arch/x86/mm/init_32.c
    +++ b/arch/x86/mm/init_32.c
    @@ -975,20 +975,25 @@ unsigned long __init_refok init_memory_mapping(unsigned long start,
    memset(mr, 0, sizeof(mr));
    nr_range = 0;

    + /* head if not big page alignment ? */
    + start_pfn = start >> PAGE_SHIFT;
    + pos = start_pfn << PAGE_SHIFT;
    +#ifdef CONFIG_X86_32
    /*
    * Don't use a large page for the first 2/4MB of memory
    * because there are often fixed size MTRRs in there
    * and overlapping MTRRs into large pages can cause
    * slowdowns.
    */
    - /* head if not big page alignment ? */
    - start_pfn = start >> PAGE_SHIFT;
    - pos = start_pfn << PAGE_SHIFT;
    if (pos == 0)
    end_pfn = 1<<(PMD_SHIFT - PAGE_SHIFT);
    else
    end_pfn = ((pos + (PMD_SIZE - 1))>>PMD_SHIFT)
    << (PMD_SHIFT - PAGE_SHIFT);
    +#else /* CONFIG_X86_64 */
    + end_pfn = ((pos + (PMD_SIZE - 1)) >> PMD_SHIFT)
    + << (PMD_SHIFT - PAGE_SHIFT);
    +#endif
    if (end_pfn > (end >> PAGE_SHIFT))
    end_pfn = end >> PAGE_SHIFT;
    if (start_pfn < end_pfn) {
    @@ -999,12 +1004,43 @@ unsigned long __init_refok init_memory_mapping(unsigned long start,
    /* big page (2M) range */
    start_pfn = ((pos + (PMD_SIZE - 1))>>PMD_SHIFT)
    << (PMD_SHIFT - PAGE_SHIFT);
    +#ifdef CONFIG_X86_32
    end_pfn = (end>>PMD_SHIFT) << (PMD_SHIFT - PAGE_SHIFT);
    +#else /* CONFIG_X86_64 */
    + end_pfn = ((pos + (PUD_SIZE - 1))>>PUD_SHIFT)
    + << (PUD_SHIFT - PAGE_SHIFT);
    + if (end_pfn > ((end>>PMD_SHIFT)<<(PMD_SHIFT - PAGE_SHIFT)))
    + end_pfn = ((end>>PMD_SHIFT)<<(PMD_SHIFT - PAGE_SHIFT));
    +#endif
    +
    + if (start_pfn < end_pfn) {
    + nr_range = save_mr(mr, nr_range, start_pfn, end_pfn,
    + page_size_mask & (1<<PG_LEVEL_2M));
    + pos = end_pfn << PAGE_SHIFT;
    + }
    +
    +#ifdef CONFIG_X86_64
    + /* big page (1G) range */
    + start_pfn = ((pos + (PUD_SIZE - 1))>>PUD_SHIFT)
    + << (PUD_SHIFT - PAGE_SHIFT);
    + end_pfn = (end >> PUD_SHIFT) << (PUD_SHIFT - PAGE_SHIFT);
    + if (start_pfn < end_pfn) {
    + nr_range = save_mr(mr, nr_range, start_pfn, end_pfn,
    + page_size_mask &
    + ((1<<PG_LEVEL_2M)|(1<<PG_LEVEL_1G)));
    + pos = end_pfn << PAGE_SHIFT;
    + }
    +
    + /* tail is not big page (1G) alignment */
    + start_pfn = ((pos + (PMD_SIZE - 1))>>PMD_SHIFT)
    + << (PMD_SHIFT - PAGE_SHIFT);
    + end_pfn = (end >> PMD_SHIFT) << (PMD_SHIFT - PAGE_SHIFT);
    if (start_pfn < end_pfn) {
    nr_range = save_mr(mr, nr_range, start_pfn, end_pfn,
    page_size_mask & (1<<PG_LEVEL_2M));
    pos = end_pfn << PAGE_SHIFT;
    }
    +#endif

    /* tail is not big page (2M) alignment */
    start_pfn = pos>>PAGE_SHIFT;
    diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c
    index 5ecb23a..d99bc6a 100644
    --- a/arch/x86/mm/init_64.c
    +++ b/arch/x86/mm/init_64.c
    @@ -741,8 +741,22 @@ unsigned long __init_refok init_memory_mapping(unsigned long start,
    /* head if not big page alignment ? */
    start_pfn = start >> PAGE_SHIFT;
    pos = start_pfn << PAGE_SHIFT;
    +#ifdef CONFIG_X86_32
    + /*
    + * Don't use a large page for the first 2/4MB of memory
    + * because there are often fixed size MTRRs in there
    + * and overlapping MTRRs into large pages can cause
    + * slowdowns.
    + */
    + if (pos == 0)
    + end_pfn = 1<<(PMD_SHIFT - PAGE_SHIFT);
    + else
    + end_pfn = ((pos + (PMD_SIZE - 1))>>PMD_SHIFT)
    + << (PMD_SHIFT - PAGE_SHIFT);
    +#else /* CONFIG_X86_64 */
    end_pfn = ((pos + (PMD_SIZE - 1)) >> PMD_SHIFT)
    << (PMD_SHIFT - PAGE_SHIFT);
    +#endif
    if (end_pfn > (end >> PAGE_SHIFT))
    end_pfn = end >> PAGE_SHIFT;
    if (start_pfn < end_pfn) {
    @@ -753,16 +767,22 @@ unsigned long __init_refok init_memory_mapping(unsigned long start,
    /* big page (2M) range */
    start_pfn = ((pos + (PMD_SIZE - 1))>>PMD_SHIFT)
    << (PMD_SHIFT - PAGE_SHIFT);
    +#ifdef CONFIG_X86_32
    + end_pfn = (end>>PMD_SHIFT) << (PMD_SHIFT - PAGE_SHIFT);
    +#else /* CONFIG_X86_64 */
    end_pfn = ((pos + (PUD_SIZE - 1))>>PUD_SHIFT)
    << (PUD_SHIFT - PAGE_SHIFT);
    if (end_pfn > ((end>>PMD_SHIFT)<<(PMD_SHIFT - PAGE_SHIFT)))
    end_pfn = ((end>>PMD_SHIFT)<<(PMD_SHIFT - PAGE_SHIFT));
    +#endif
    +
    if (start_pfn < end_pfn) {
    nr_range = save_mr(mr, nr_range, start_pfn, end_pfn,
    page_size_mask & (1<<PG_LEVEL_2M));
    pos = end_pfn << PAGE_SHIFT;
    }

    +#ifdef CONFIG_X86_64
    /* big page (1G) range */
    start_pfn = ((pos + (PUD_SIZE - 1))>>PUD_SHIFT)
    << (PUD_SHIFT - PAGE_SHIFT);
    @@ -783,6 +803,7 @@ unsigned long __init_refok init_memory_mapping(unsigned long start,
    page_size_mask & (1<<PG_LEVEL_2M));
    pos = end_pfn << PAGE_SHIFT;
    }
    +#endif

    /* tail is not big page (2M) alignment */
    start_pfn = pos>>PAGE_SHIFT;

    \
     
     \ /
      Last update: 2009-03-05 14:45    [W:0.028 / U:60.244 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site