lkml.org 
[lkml]   [2008]   [Apr]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH 2/4] x86: restore pda nodenumber field
      * Restore the nodenumber field in the x86_64 pda.  This field is slightly
    different than the x86_cpu_to_node_map mainly because it's a static
    indication of which node the cpu is on while the cpu to node map is a
    dyanamic mapping that may get reset if the cpu goes offline. This also
    simplifies the numa_node_id() macro.

    For inclusion into sched-devel/latest tree.

    Based on:
    git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
    + sched-devel/latest .../mingo/linux-2.6-sched-devel.git

    Signed-off-by: Mike Travis <travis@sgi.com>
    ---
    arch/x86/kernel/setup.c | 3 +++
    include/asm-x86/pda.h | 1 +
    include/asm-x86/topology.h | 2 +-
    3 files changed, 5 insertions(+), 1 deletion(-)

    --- linux-2.6.sched.orig/arch/x86/kernel/setup.c
    +++ linux-2.6.sched/arch/x86/kernel/setup.c
    @@ -155,6 +155,9 @@ void __cpuinit numa_set_node(int cpu, in
    {
    int *cpu_to_node_map = early_per_cpu_ptr(x86_cpu_to_node_map);

    + if (node != NUMA_NO_NODE)
    + cpu_pda(cpu)->nodenumber = node;
    +
    if (cpu_to_node_map)
    cpu_to_node_map[cpu] = node;

    --- linux-2.6.sched.orig/include/asm-x86/pda.h
    +++ linux-2.6.sched/include/asm-x86/pda.h
    @@ -20,6 +20,7 @@ struct x8664_pda {
    /* gcc-ABI: this canary MUST be at
    offset 40!!! */
    char *irqstackptr;
    + int nodenumber; /* number of current node */
    unsigned int __softirq_pending;
    unsigned int __nmi_count; /* number of NMI on this CPUs */
    short mmu_state;
    --- linux-2.6.sched.orig/include/asm-x86/topology.h
    +++ linux-2.6.sched/include/asm-x86/topology.h
    @@ -56,7 +56,7 @@ extern cpumask_t node_to_cpumask_map[];
    DECLARE_EARLY_PER_CPU(int, x86_cpu_to_node_map);

    /* Returns the number of the current Node. */
    -#define numa_node_id() (per_cpu(x86_cpu_to_node_map, raw_smp_processor_id()))
    +#define numa_node_id() read_pda(nodenumber)

    #ifdef CONFIG_DEBUG_PER_CPU_MAPS
    extern int cpu_to_node(int cpu);
    --


    \
     
     \ /
      Last update: 2008-04-22 03:37    [W:0.025 / U:1.688 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site