Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

driver core: Fix test_async_driver_probe if NUMA is disabled

Since commit 57ea974fb871 ("driver core: Rewrite test_async_driver_probe
to cover serialization and NUMA affinity"), running the test with NUMA
disabled results in warning messages similar to the following.

test_async_driver test_async_driver.12: NUMA node mismatch -1 != 0

If CONFIG_NUMA=n, dev_to_node(dev) returns -1, and numa_node_id()
returns 0. Both are widely used, so it appears risky to change return
values. Augment the check with IS_ENABLED(CONFIG_NUMA) instead
to fix the problem.

Cc: Alexander Duyck <alexander.h.duyck@linux.intel.com>
Fixes: 57ea974fb871 ("driver core: Rewrite test_async_driver_probe to cover serialization and NUMA affinity")
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Cc: stable <stable@vger.kernel.org>
Acked-by: Alexander Duyck <alexander.h.duyck@linux.intel.com>
Link: https://lore.kernel.org/r/20191127202453.28087-1-linux@roeck-us.net
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Guenter Roeck and committed by
Greg Kroah-Hartman
264d2527 39cc539f

+2 -1
+2 -1
drivers/base/test/test_async_driver_probe.c
··· 44 44 * performing an async init on that node. 45 45 */ 46 46 if (dev->driver->probe_type == PROBE_PREFER_ASYNCHRONOUS) { 47 - if (dev_to_node(dev) != numa_node_id()) { 47 + if (IS_ENABLED(CONFIG_NUMA) && 48 + dev_to_node(dev) != numa_node_id()) { 48 49 dev_warn(dev, "NUMA node mismatch %d != %d\n", 49 50 dev_to_node(dev), numa_node_id()); 50 51 atomic_inc(&warnings);