lkml.org 
[lkml]   [2005]   [Dec]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[patch 1/3] x86_64: Node local pda take 2 -- early cpu_to_node
    Here is take 2 on x86_64 node local pda allocation.

    This patchset does away with the extra memory reference for non CONFIG_NUMA
    case. The early cpu_to_node helps AMD and EM64T systems which work well
    with CONFIG_ACPI_NUMA. cpu_to_node is not inited early for AMD systems
    which work only with old style K8_NUMA. (Tested on EM64 NUMA and Tyan K8
    dual core 4 cpu boxes)

    Andi, I could not eliminate the need for a initial static pda array, since
    sched_init needs the static per-cpu offset array for NR_CPUS early. Hope
    this is OK.

    Thanks,
    Kiran

    ---

    Patch enables early intialization of cpu_to_node. apicid_to_node is built by reading
    the SRAT table, from acpi_numa_init, and x86_cpu_to_apicid is built by parsing the ACPI
    MADT table, from acpi_boot_init. We combine these two tables and setup cpu_to_node.

    Early intialization helps the static per_cpu_areas in getting pages from correct node.

    Tested on EM64T NUMA and Tyan K8 dual core board (with CONFIG_ACPI_NUMA + K8)

    Signed-off-by: Alok N Kataria <alokk@calsoftinc.com>
    Signed-off-by: Ravikiran Thirumalai <kiran@scalex86.org>

    Index: linux-2.6.15-rc4/arch/x86_64/kernel/setup.c
    ===================================================================
    --- linux-2.6.15-rc4.orig/arch/x86_64/kernel/setup.c 2005-12-02 16:25:19.000000000 -0800
    +++ linux-2.6.15-rc4/arch/x86_64/kernel/setup.c 2005-12-12 01:49:00.000000000 -0800
    @@ -669,6 +669,8 @@
    acpi_boot_init();
    #endif

    + init_cpu_to_node();
    +
    #ifdef CONFIG_X86_LOCAL_APIC
    /*
    * get boot-time SMP configuration:
    Index: linux-2.6.15-rc4/arch/x86_64/mm/srat.c
    ===================================================================
    --- linux-2.6.15-rc4.orig/arch/x86_64/mm/srat.c 2005-12-01 17:09:51.000000000 -0800
    +++ linux-2.6.15-rc4/arch/x86_64/mm/srat.c 2005-12-12 01:19:00.000000000 -0800
    @@ -226,4 +226,15 @@
    return acpi_slit->entry[index + node_to_pxm(b)];
    }

    +/*
    + * Setup cpu_to_node using the SRAT lapcis & ACPI MADT table
    + * info.
    + */
    +void __init init_cpu_to_node(void)
    +{
    + int i;
    + for (i = 0; i < NR_CPUS; i++)
    + cpu_to_node[i] = apicid_to_node[x86_cpu_to_apicid[i]];
    +}
    +
    EXPORT_SYMBOL(__node_distance);
    Index: linux-2.6.15-rc4/include/linux/acpi.h
    ===================================================================
    --- linux-2.6.15-rc4.orig/include/linux/acpi.h 2005-10-27 17:02:08.000000000 -0700
    +++ linux-2.6.15-rc4/include/linux/acpi.h 2005-12-12 01:52:28.000000000 -0800
    @@ -519,11 +519,16 @@

    #ifdef CONFIG_ACPI_NUMA
    int acpi_get_pxm(acpi_handle handle);
    +void __init init_cpu_to_node();
    #else
    static inline int acpi_get_pxm(acpi_handle handle)
    {
    return 0;
    }
    +
    +static inline void init_cpu_to_node(void)
    +{
    +}
    #endif

    extern int pnpacpi_disabled;
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/
    \
     
     \ /
      Last update: 2005-12-15 03:36    [W:0.024 / U:1.976 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site