• Yasuaki Ishimatsu's avatar
    x86/numa: Set numa_nodes_parsed at acpi_numa_memory_affinity_init() · 4af463d2
    Yasuaki Ishimatsu authored
    When hot-adding a CPU, the system outputs following messages
    since node_to_cpumask_map[2] was not allocated memory.
    
    Booting Node 2 Processor 32 APIC 0xc0
    node_to_cpumask_map[2] NULL
    Pid: 0, comm: swapper/32 Tainted: G       A     3.3.5-acd #21
    Call Trace:
     [<ffffffff81048845>] debug_cpumask_set_cpu+0x155/0x160
     [<ffffffff8105e28a>] ? add_timer_on+0xaa/0x120
     [<ffffffff8150665f>] numa_add_cpu+0x1e/0x22
     [<ffffffff815020bb>] identify_cpu+0x1df/0x1e4
     [<ffffffff815020d6>] identify_econdary_cpu+0x16/0x1d
     [<ffffffff81504614>] smp_store_cpu_info+0x3c/0x3e
     [<ffffffff81505263>] smp_callin+0x139/0x1be
     [<ffffffff815052fb>] start_secondary+0x13/0xeb
    
    The reason is that the bit of node 2 was not set at
    numa_nodes_parsed. numa_nodes_parsed is set by only
    acpi_numa_processor_affinity_init /
    acpi_numa_x2apic_affinity_init. Thus even if hot-added memory
    which is same PXM as hot-added CPU is written in ACPI SRAT
    Table, if the hot-added CPU is not written in ACPI SRAT table,
    numa_nodes_parsed is not set.
    
    But according to ACPI Spec Rev 5.0, it says about ACPI SRAT
    table as follows: This optional table provides information that
    allows OSPM to associate processors and memory ranges, including
    ranges of memory provided by hot-added memory devices, with
    system localities / proximity domains and clock domains.
    
    It means that ACPI SRAT table only provides information for CPUs
    present at boot time and for memory including hot-added memory.
    So hot-added memory is written in ACPI SRAT table, but hot-added
    CPU is not written in it. Thus numa_nodes_parsed should be set
    by not only acpi_numa_processor_affinity_init /
    acpi_numa_x2apic_affinity_init but also
    acpi_numa_memory_affinity_init for the case.
    
    Additionally, if system has cpuless memory node,
    acpi_numa_processor_affinity_init /
    acpi_numa_x2apic_affinity_init cannot set numa_nodes_parseds
    since these functions cannot find cpu description for the node.
    In this case, numa_nodes_parsed needs to be set by
    acpi_numa_memory_affinity_init.
    Signed-off-by: default avatarYasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com>
    Acked-by: default avatarDavid Rientjes <rientjes@google.com>
    Acked-by: default avatarKOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
    Cc: liuj97@gmail.com
    Cc: kosaki.motohiro@gmail.com
    Link: http://lkml.kernel.org/r/4FCC2098.4030007@jp.fujitsu.com
    [ merged it ]
    Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
    4af463d2
srat.c 4.59 KB