• Yinghai Lu's avatar
    x86: Fix checking of SRAT when node 0 ram is not from 0 · 32996250
    Yinghai Lu authored
    Found one system that boot from socket1 instead of socket0, SRAT get rejected...
    
    [    0.000000] SRAT: Node 1 PXM 0 0-a0000
    [    0.000000] SRAT: Node 1 PXM 0 100000-80000000
    [    0.000000] SRAT: Node 1 PXM 0 100000000-2080000000
    [    0.000000] SRAT: Node 0 PXM 1 2080000000-4080000000
    [    0.000000] SRAT: Node 2 PXM 2 4080000000-6080000000
    [    0.000000] SRAT: Node 3 PXM 3 6080000000-8080000000
    [    0.000000] SRAT: Node 4 PXM 4 8080000000-a080000000
    [    0.000000] SRAT: Node 5 PXM 5 a080000000-c080000000
    [    0.000000] SRAT: Node 6 PXM 6 c080000000-e080000000
    [    0.000000] SRAT: Node 7 PXM 7 e080000000-10080000000
    ...
    [    0.000000] NUMA: Allocated memnodemap from 500000 - 701040
    [    0.000000] NUMA: Using 20 for the hash shift.
    [    0.000000] Adding active range (0, 0x2080000, 0x4080000) 0 entries of 3200 used
    [    0.000000] Adding active range (1, 0x0, 0x96) 1 entries of 3200 used
    [    0.000000] Adding active range (1, 0x100, 0x7f750) 2 entries of 3200 used
    [    0.000000] Adding active range (1, 0x100000, 0x2080000) 3 entries of 3200 used
    [    0.000000] Adding active range (2, 0x4080000, 0x6080000) 4 entries of 3200 used
    [    0.000000] Adding active range (3, 0x6080000, 0x8080000) 5 entries of 3200 used
    [    0.000000] Adding active range (4, 0x8080000, 0xa080000) 6 entries of 3200 used
    [    0.000000] Adding active range (5, 0xa080000, 0xc080000) 7 entries of 3200 used
    [    0.000000] Adding active range (6, 0xc080000, 0xe080000) 8 entries of 3200 used
    [    0.000000] Adding active range (7, 0xe080000, 0x10080000) 9 entries of 3200 used
    [    0.000000] SRAT: PXMs only cover 917504MB of your 1048566MB e820 RAM. Not used.
    [    0.000000] SRAT: SRAT not used.
    
    the early_node_map is not sorted because node0 with non zero start come first.
    
    so try to sort it right away after all regions are registered.
    
    also fixs refression by 8716273c (x86: Export srat physical topology)
    
    -v2: make it more solid to handle cross node case like node0 [0,4g), [8,12g) and node1 [4g, 8g), [12g, 16g)
    -v3: update comments.
    Reported-and-tested-by: default avatarJens Axboe <jens.axboe@oracle.com>
    Signed-off-by: default avatarYinghai Lu <yinghai@kernel.org>
    LKML-Reference: <4B2579D2.3010201@kernel.org>
    Signed-off-by: default avatarH. Peter Anvin <hpa@zytor.com>
    32996250
srat_64.c 12.7 KB