lkml.org 
[lkml]   [2008]   [Jan]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH 2/3] x86: Change NR_CPUS arrays in numa_64 fixup
    Change the following static arrays sized by NR_CPUS to
    per_cpu data variables:

    char cpu_to_node_map[NR_CPUS];


    Signed-off-by: Mike Travis <travis@sgi.com>
    Reviewed-by: Christoph Lameter <clameter@sgi.com>
    ---
    fixup:

    Split cpu_to_node function into "early" and "late" versions
    so that x86_cpu_to_node_map_{init,early_ptr} are not EXPORT'ed.
    This also involves setting up the percpu maps as early as possible.

    V2->V3:
    - add early_cpu_to_node function to keep cpu_to_node efficient
    - move and rename smp_set_apicids() to setup_percpu_maps()
    - call setup_percpu_maps() as early as possible

    V1->V2:
    - Removed extraneous casts
    - Fix !NUMA builds with '#ifdef CONFIG_NUMA"
    ---
    arch/x86/kernel/setup64.c | 37 +++++++++++++++++++++++++++++++++++--
    arch/x86/kernel/smpboot_64.c | 38 ++------------------------------------
    arch/x86/mm/numa_64.c | 2 --
    arch/x86/mm/srat_64.c | 5 +++--
    include/asm-x86/numa_64.h | 7 -------
    include/asm-x86/topology.h | 10 +++++++++-
    mm/page_alloc.c | 2 +-
    7 files changed, 50 insertions(+), 51 deletions(-)

    --- a/arch/x86/kernel/setup64.c
    +++ b/arch/x86/kernel/setup64.c
    @@ -84,6 +84,36 @@ static int __init nonx32_setup(char *str
    __setup("noexec32=", nonx32_setup);

    /*
    + * Copy data used in early init routines from the initial arrays to the
    + * per cpu data areas. These arrays then become expendable and the *_ptrs
    + * are zeroed indicating that the static arrays are gone.
    + */
    +void __init setup_percpu_maps(void)
    +{
    + int cpu;
    +
    + for_each_possible_cpu(cpu) {
    + if (per_cpu_offset(cpu)) {
    + per_cpu(x86_cpu_to_apicid, cpu) =
    + x86_cpu_to_apicid_init[cpu];
    +#ifdef CONFIG_NUMA
    + per_cpu(x86_cpu_to_node_map, cpu) =
    + x86_cpu_to_node_map_init[cpu];
    +#endif
    + }
    + else
    + printk(KERN_NOTICE "per_cpu_offset zero for cpu %d\n",
    + cpu);
    + }
    +
    + /* indicate the early static arrays are gone */
    + x86_cpu_to_apicid_early_ptr = NULL;
    +#ifdef CONFIG_NUMA
    + x86_cpu_to_node_map_early_ptr = NULL;
    +#endif
    +}
    +
    +/*
    * Great future plan:
    * Declare PDA itself and support (irqstack,tss,pgd) as per cpu data.
    * Always point %gs to its beginning
    @@ -104,18 +134,21 @@ void __init setup_per_cpu_areas(void)
    for_each_cpu_mask (i, cpu_possible_map) {
    char *ptr;

    - if (!NODE_DATA(cpu_to_node(i))) {
    + if (!NODE_DATA(early_cpu_to_node(i))) {
    printk("cpu with no node %d, num_online_nodes %d\n",
    i, num_online_nodes());
    ptr = alloc_bootmem_pages(size);
    } else {
    - ptr = alloc_bootmem_pages_node(NODE_DATA(cpu_to_node(i)), size);
    + ptr = alloc_bootmem_pages_node(NODE_DATA(early_cpu_to_node(i)), size);
    }
    if (!ptr)
    panic("Cannot allocate cpu data for CPU %d\n", i);
    cpu_pda(i)->data_offset = ptr - __per_cpu_start;
    memcpy(ptr, __per_cpu_start, __per_cpu_end - __per_cpu_start);
    }
    +
    + /* setup percpu data maps early */
    + setup_percpu_maps();
    }

    void pda_init(int cpu)
    --- a/arch/x86/kernel/smpboot_64.c
    +++ b/arch/x86/kernel/smpboot_64.c
    @@ -702,7 +702,7 @@ do_rest:
    if (boot_error) {
    cpu_clear(cpu, cpu_callout_map); /* was set here (do_boot_cpu()) */
    clear_bit(cpu, (unsigned long *)&cpu_initialized); /* was set by cpu_init() */
    - clear_node_cpumask(cpu); /* was set by numa_add_cpu */
    + clear_bit(cpu, (unsigned long *)&node_to_cpumask_map[cpu_to_node(cpu)]);
    cpu_clear(cpu, cpu_present_map);
    cpu_clear(cpu, cpu_possible_map);
    per_cpu(x86_cpu_to_apicid, cpu) = BAD_APICID;
    @@ -851,39 +851,6 @@ static int __init smp_sanity_check(unsig
    return 0;
    }

    -/*
    - * Copy data used in early init routines from the initial arrays to the
    - * per cpu data areas. These arrays then become expendable and the
    - * *_ptrs are zeroed indicating that the static arrays are gone.
    - */
    -void __init smp_set_apicids(void)
    -{
    - int cpu;
    -
    - for_each_possible_cpu(cpu) {
    - if (per_cpu_offset(cpu)) {
    - per_cpu(x86_cpu_to_apicid, cpu) =
    - x86_cpu_to_apicid_init[cpu];
    -#ifdef CONFIG_NUMA
    - per_cpu(x86_cpu_to_node_map, cpu) =
    - x86_cpu_to_node_map_init[cpu];
    -#endif
    - per_cpu(x86_bios_cpu_apicid, cpu) =
    - x86_bios_cpu_apicid_init[cpu];
    - }
    - else
    - printk(KERN_NOTICE "per_cpu_offset zero for cpu %d\n",
    - cpu);
    - }
    -
    - /* indicate the early static arrays are gone */
    - x86_cpu_to_apicid_early_ptr = NULL;
    -#ifdef CONFIG_NUMA
    - x86_cpu_to_node_map_early_ptr = NULL;
    -#endif
    - x86_bios_cpu_apicid_early_ptr = NULL;
    -}
    -
    static void __init smp_cpu_index_default(void)
    {
    int i;
    @@ -906,7 +873,6 @@ void __init smp_prepare_cpus(unsigned in
    smp_cpu_index_default();
    current_cpu_data = boot_cpu_data;
    current_thread_info()->cpu = 0; /* needed? */
    - smp_set_apicids();
    set_cpu_sibling_map(0);

    if (smp_sanity_check(max_cpus) < 0) {
    @@ -1060,7 +1026,7 @@ void remove_cpu_from_maps(void)
    cpu_clear(cpu, cpu_callout_map);
    cpu_clear(cpu, cpu_callin_map);
    clear_bit(cpu, (unsigned long *)&cpu_initialized); /* was set by cpu_init() */
    - clear_node_cpumask(cpu);
    + clear_bit(cpu, (unsigned long *)&node_to_cpumask_map[cpu_to_node(cpu)]);
    }

    int __cpu_disable(void)
    --- a/arch/x86/mm/numa_64.c
    +++ b/arch/x86/mm/numa_64.c
    @@ -35,8 +35,6 @@ u16 x86_cpu_to_node_map_init[NR_CPUS] =
    [0 ... NR_CPUS-1] = NUMA_NO_NODE
    };
    void *x86_cpu_to_node_map_early_ptr;
    -EXPORT_SYMBOL(x86_cpu_to_node_map_init);
    -EXPORT_SYMBOL(x86_cpu_to_node_map_early_ptr);
    DEFINE_PER_CPU(u16, x86_cpu_to_node_map) = NUMA_NO_NODE;
    EXPORT_PER_CPU_SYMBOL(x86_cpu_to_node_map);

    --- a/arch/x86/mm/srat_64.c
    +++ b/arch/x86/mm/srat_64.c
    @@ -382,9 +382,10 @@ int __init acpi_scan_nodes(unsigned long
    setup_node_bootmem(i, nodes[i].start, nodes[i].end);

    for (i = 0; i < NR_CPUS; i++) {
    - if (cpu_to_node(i) == NUMA_NO_NODE)
    + int node = cpu_to_node(i);
    + if (node == NUMA_NO_NODE)
    continue;
    - if (!node_isset(cpu_to_node(i), node_possible_map))
    + if (!node_isset(node, node_possible_map))
    numa_set_node(i, NUMA_NO_NODE);
    }
    numa_init_array();
    --- a/include/asm-x86/numa_64.h
    +++ b/include/asm-x86/numa_64.h
    @@ -29,15 +29,8 @@ extern void setup_node_bootmem(int nodei

    #ifdef CONFIG_NUMA
    extern void __init init_cpu_to_node(void);
    -
    -static inline void clear_node_cpumask(int cpu)
    -{
    - clear_bit(cpu, (unsigned long *)&node_to_cpumask_map[cpu_to_node(cpu)]);
    -}
    -
    #else
    #define init_cpu_to_node() do {} while (0)
    -#define clear_node_cpumask(cpu) do {} while (0)
    #endif

    #endif
    --- a/include/asm-x86/topology.h
    +++ b/include/asm-x86/topology.h
    @@ -38,7 +38,7 @@ extern cpumask_t node_to_cpumask_map[];
    #define NUMA_NO_NODE ((u16)(~0))

    /* Returns the number of the node containing CPU 'cpu' */
    -static inline int cpu_to_node(int cpu)
    +static inline int early_cpu_to_node(int cpu)
    {
    u16 *cpu_to_node_map = x86_cpu_to_node_map_early_ptr;

    @@ -50,6 +50,14 @@ static inline int cpu_to_node(int cpu)
    return NUMA_NO_NODE;
    }

    +static inline int cpu_to_node(int cpu)
    +{
    + if(per_cpu_offset(cpu))
    + return per_cpu(x86_cpu_to_node_map, cpu);
    + else
    + return NUMA_NO_NODE;
    +}
    +
    /*
    * Returns the number of the node containing Node 'node'. This
    * architecture is flat, so it is a pretty simple function!
    --- a/mm/page_alloc.c
    +++ b/mm/page_alloc.c
    @@ -1783,7 +1783,7 @@ EXPORT_SYMBOL(free_pages);
    static unsigned int nr_free_zone_pages(int offset)
    {
    /* Just pick one node, since fallback list is circular */
    - pg_data_t *pgdat = NODE_DATA(numa_node_id());
    + pg_data_t *pgdat = NODE_DATA(cpu_to_node(raw_smp_processor_id()));
    unsigned int sum = 0;

    struct zonelist *zonelist = pgdat->node_zonelists + offset;
    --


    \
     
     \ /
      Last update: 2008-01-17 23:41    [W:0.034 / U:121.180 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site