FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2024-12-15 13:22:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

acpi, numa: fix pxm to online numa node associations

Browse Source 
Commit 99759869fa "acpi: Add acpi_map_pxm_to_online_node()" added
support for mapping a given proximity to its nearest, by SLIT distance,
online node. However, it sometimes returns unexpected results due to the
fact that it switches from comparing the PXM node to the last node that
was closer than the current max.

    for_each_online_node(n) {
            dist = node_distance(node, n);
            if (dist < min_dist) {
                    min_dist = dist;
                    node = n;	<---- from this point we're using the
				      wrong node for node_distance()


Fixes: 99759869fa ("acpi: Add acpi_map_pxm_to_online_node()")
Cc: <stable@vger.kernel.org>
Reviewed-by: Toshi Kani <toshi.kani@hp.com>
Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
This commit is contained in:
Dan Williams 2018-03-15 19:49:14 -07:00
parent a7e6c7015b
commit dc9e0a9347
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/acpi/numa.c
View File

@ -103,25 +103,27 @@ int acpi_map_pxm_to_node(int pxm)
*/ */
int acpi_map_pxm_to_online_node(int pxm) int acpi_map_pxm_to_online_node(int pxm)
{ {
int node, n, dist, min_dist; int node, min_node;
node = acpi_map_pxm_to_node(pxm); node = acpi_map_pxm_to_node(pxm);
if (node == NUMA_NO_NODE) if (node == NUMA_NO_NODE)
node = 0; node = 0;
min_node = node;
if (!node_online(node)) { if (!node_online(node)) {
min_dist = INT_MAX; int min_dist = INT_MAX, dist, n;
for_each_online_node(n) { for_each_online_node(n) {
dist = node_distance(node, n); dist = node_distance(node, n);
if (dist < min_dist) { if (dist < min_dist) {
min_dist = dist; min_dist = dist;
node = n; min_node = n;
} }
} }
} }
return node; return min_node;
} }
EXPORT_SYMBOL(acpi_map_pxm_to_online_node); EXPORT_SYMBOL(acpi_map_pxm_to_online_node);