driver core: Fix test_async_driver_probe if NUMA is disabled
PATCH 1/1 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.
--- drivers/base/test/test_async_driver_probe.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/base/test/test_async_driver_probe.c +2 -1
@@ -44,7 +44,8 @@ static int test_probe(struct platform_device *pdev)* performing an async init on that node. */ if (dev->driver->probe_type ==PROBE_PREFER_ASYNCHRONOUS ) { -if (dev_to_node (dev) !=numa_node_id ()) { +if (IS_ENABLED (CONFIG_NUMA ) && +dev_to_node (dev) !=numa_node_id ()) {dev_warn (dev,"NUMA node mismatch %d != %d\n" ,dev_to_node (dev),numa_node_id ());atomic_inc (&warnings);
Signature · 1 line
2.17.1
Quoted 23 lines · Guenter Roeck
Since commit
57ea974fb871("driver core: Rewritetest_async_driver_probeto cover serialization and NUMA affinity"), running the test with NUMA disabled results in warning messages similar to the following.
test_async_drivertest_async_driver.12: NUMA node mismatch -1 != 0If
CONFIG_NUMA=n,dev_to_node(dev)returns -1, andnuma_node_id()returns 0. Both are widely used, so it appears risky to change return values. Augment the check withIS_ENABLED(CONFIG_NUMA)instead to fix the problem.Cc Alexander Duyck <[email protected]>Fixes 57ea974fb871 ("driver core: Rewrite test_async_driver_probe to cover serialization and NUMA affinity")Signed-off-by Guenter Roeck <[email protected]>--- drivers/base/test/test_async_driver_probe.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)drivers/base/test/test_async_driver_probe.c +0
-0
drivers/base/test/test_async_driver_probe.c static int test_probe(struct platform_device *pdev) · line 51
Quoted 9 lines
drivers/base/test/test_async_driver_probe.c +2
-1@@ -44,7 +44,8 @@ static int test_probe(struct platform_device *pdev)* performing an async init on that node. */ if (dev->driver->probe_type ==PROBE_PREFER_ASYNCHRONOUS ) { -if (dev_to_node (dev) !=numa_node_id ()) { +if (IS_ENABLED (CONFIG_NUMA ) && +dev_to_node (dev) !=numa_node_id ()) {dev_warn (dev,"NUMA node mismatch %d != %d\n" ,dev_to_node (dev),numa_node_id ());atomic_inc (&warnings);
I'm not sure that is really the correct fix. It might be better to test it against NUMA_NO_NODE and then if it is not that make sure that it matches the node ID. Adding the check against NUMA_NO_NODE would resolve the issue for cases where the device might be assigned to multiple NUMA nodes.
Quoted 30 lines · Alexander Duyck
Quoted 29 lines · Guenter Roeck
Since commit
57ea974fb871("driver core: Rewritetest_async_driver_probeto cover serialization and NUMA affinity"), running the test with NUMA disabled results in warning messages similar to the following.
test_async_drivertest_async_driver.12: NUMA node mismatch -1 != 0If
CONFIG_NUMA=n,dev_to_node(dev)returns -1, andnuma_node_id()returns 0. Both are widely used, so it appears risky to change return values. Augment the check withIS_ENABLED(CONFIG_NUMA)instead to fix the problem.Cc Alexander Duyck <[email protected]>Fixes 57ea974fb871 ("driver core: Rewrite test_async_driver_probe to cover serialization and NUMA affinity")Signed-off-by Guenter Roeck <[email protected]>--- drivers/base/test/test_async_driver_probe.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)drivers/base/test/test_async_driver_probe.c +2
-1@@ -44,7 +44,8 @@ static int test_probe(struct platform_device *pdev)* performing an async init on that node. */ if (dev->driver->probe_type ==PROBE_PREFER_ASYNCHRONOUS ) { -if (dev_to_node (dev) !=numa_node_id ()) { +if (IS_ENABLED (CONFIG_NUMA ) && +dev_to_node (dev) !=numa_node_id ()) {
Quoted 9 lines
drivers/base/test/test_async_driver_probe.c static int test_probe(struct platform_device *pdev) · line 51
Quoted 3 lines
drivers/base/test/test_async_driver_probe.c +0
-0dev_warn (dev,"NUMA node mismatch %d != %d\n" ,dev_to_node (dev),numa_node_id ());atomic_inc (&warnings);I'm not sure that is really the correct fix. It might be better to test it against
NUMA_NO_NODEand then if it is not that make sure that it matches the node ID. Adding the check againstNUMA_NO_NODEwould resolve the issue for cases where the device might be assigned to multiple NUMA nodes.
I think you are suggesting that dev_to_node(dev) might return NUMA_NO_NODE even on systems with CONFIG_NUMA enabled. I have no idea if that can happen. The code in test_async_probe_init() seems to suggest that the node is set to a valid node id for all asynchronous nodes, so I don't immediately see how that could be the case. I may be missing something, of course.
Thanks,
Guenter
Quoted 40 lines · Guenter Roeck
Quoted 30 lines · Alexander Duyck
Quoted 29 lines · Guenter Roeck
Since commit
57ea974fb871("driver core: Rewritetest_async_driver_probeto cover serialization and NUMA affinity"), running the test with NUMA disabled results in warning messages similar to the following.
test_async_drivertest_async_driver.12: NUMA node mismatch -1 != 0If
CONFIG_NUMA=n,dev_to_node(dev)returns -1, andnuma_node_id()returns 0. Both are widely used, so it appears risky to change return values. Augment the check withIS_ENABLED(CONFIG_NUMA)instead to fix the problem.Cc Alexander Duyck <[email protected]>Fixes 57ea974fb871 ("driver core: Rewrite test_async_driver_probe to cover serialization and NUMA affinity")Signed-off-by Guenter Roeck <[email protected]>--- drivers/base/test/test_async_driver_probe.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)drivers/base/test/test_async_driver_probe.c +2
-1@@ -44,7 +44,8 @@ static int test_probe(struct platform_device *pdev)* performing an async init on that node. */ if (dev->driver->probe_type ==PROBE_PREFER_ASYNCHRONOUS ) { -if (dev_to_node (dev) !=numa_node_id ()) { +if (IS_ENABLED (CONFIG_NUMA ) && +dev_to_node (dev) !=numa_node_id ()) {Quoted 9 lines
drivers/base/test/test_async_driver_probe.c static int test_probe(struct platform_device *pdev) · line 51
Quoted 3 lines
drivers/base/test/test_async_driver_probe.c +0
-0dev_warn (dev,"NUMA node mismatch %d != %d\n" ,dev_to_node (dev),numa_node_id ());atomic_inc (&warnings);I'm not sure that is really the correct fix. It might be better to test it against
NUMA_NO_NODEand then if it is not that make sure that it matches the node ID. Adding the check againstNUMA_NO_NODEwould resolve the issue for cases where the device might be assigned to multiple NUMA nodes.
Quoted 5 lines
I think you are suggesting that
dev_to_node(dev)might returnNUMA_NO_NODEeven on systems withCONFIG_NUMAenabled. I have no idea if that can happen. The code intest_async_probe_init()seems to suggest that the node is set to a valid node id for all asynchronous nodes, so I don't immediately see how that could be the case. I may be missing something, of course.
Well thinking back to the Nehalem architecture I seem to recall that there were devices that were connected to a shared IOH that was accessible across both nodes. I thought that they might have a node ID of NUMA_NO_NODE since they didn't really belong to either of the two nodes in the sytem.
It would effectively work out the same as your patch compiler wise since dev_to_node would be NUMA_NO_NODE in the non-NUMA case so it would compile out the warning since it would fail the first check, and in the NUMA case it would add an extra check to make sure that dev_to_node is actually indicating the device needs a specific node in the NUMA enabled case.
Quoted 53 lines · Alexander Duyck
Quoted 40 lines · Guenter Roeck
Quoted 30 lines · Alexander Duyck
Quoted 29 lines · Guenter Roeck
Since commit
57ea974fb871("driver core: Rewritetest_async_driver_probeto cover serialization and NUMA affinity"), running the test with NUMA disabled results in warning messages similar to the following.
test_async_drivertest_async_driver.12: NUMA node mismatch -1 != 0If
CONFIG_NUMA=n,dev_to_node(dev)returns -1, andnuma_node_id()returns 0. Both are widely used, so it appears risky to change return values. Augment the check withIS_ENABLED(CONFIG_NUMA)instead to fix the problem.Cc Alexander Duyck <[email protected]>Fixes 57ea974fb871 ("driver core: Rewrite test_async_driver_probe to cover serialization and NUMA affinity")Signed-off-by Guenter Roeck <[email protected]>--- drivers/base/test/test_async_driver_probe.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)drivers/base/test/test_async_driver_probe.c +2
-1@@ -44,7 +44,8 @@ static int test_probe(struct platform_device *pdev)* performing an async init on that node. */ if (dev->driver->probe_type ==PROBE_PREFER_ASYNCHRONOUS ) { -if (dev_to_node (dev) !=numa_node_id ()) { +if (IS_ENABLED (CONFIG_NUMA ) && +dev_to_node (dev) !=numa_node_id ()) {Quoted 9 lines
drivers/base/test/test_async_driver_probe.c static int test_probe(struct platform_device *pdev) · line 51
Quoted 3 lines
drivers/base/test/test_async_driver_probe.c +0
-0dev_warn (dev,"NUMA node mismatch %d != %d\n" ,dev_to_node (dev),numa_node_id ());atomic_inc (&warnings);I'm not sure that is really the correct fix. It might be better to test it against
NUMA_NO_NODEand then if it is not that make sure that it matches the node ID. Adding the check againstNUMA_NO_NODEwould resolve the issue for cases where the device might be assigned to multiple NUMA nodes.Quoted 5 lines
I think you are suggesting that
dev_to_node(dev)might returnNUMA_NO_NODEeven on systems withCONFIG_NUMAenabled. I have no idea if that can happen. The code intest_async_probe_init()seems to suggest that the node is set to a valid node id for all asynchronous nodes, so I don't immediately see how that could be the case. I may be missing something, of course.Well thinking back to the Nehalem architecture I seem to recall that there were devices that were connected to a shared IOH that was accessible across both nodes. I thought that they might have a node ID of
NUMA_NO_NODEsince they didn't really belong to either of the two nodes in the sytem.
Quoted 6 lines
It would effectively work out the same as your patch compiler wise since
dev_to_nodewould beNUMA_NO_NODEin the non-NUMA case so it would compile out the warning since it would fail the first check, and in the NUMA case it would add an extra check to make sure thatdev_to_nodeis actually indicating the device needs a specific node in the NUMA enabled case.
I thought the code is specifically checking devices which it previously created, which are well defined and understood test devices. After all, the check is in the test driver's probe function. Guess I really don't understand the code. Please take my patch as bug report, and submit whatever fix you think is correct.
Thanks,
Guenter
Quoted 61 lines · Guenter Roeck
Quoted 53 lines · Alexander Duyck
Quoted 40 lines · Guenter Roeck
Quoted 30 lines · Alexander Duyck
Quoted 29 lines · Guenter Roeck
Since commit
57ea974fb871("driver core: Rewritetest_async_driver_probeto cover serialization and NUMA affinity"), running the test with NUMA disabled results in warning messages similar to the following.
test_async_drivertest_async_driver.12: NUMA node mismatch -1 != 0If
CONFIG_NUMA=n,dev_to_node(dev)returns -1, andnuma_node_id()returns 0. Both are widely used, so it appears risky to change return values. Augment the check withIS_ENABLED(CONFIG_NUMA)instead to fix the problem.Cc Alexander Duyck <[email protected]>Fixes 57ea974fb871 ("driver core: Rewrite test_async_driver_probe to cover serialization and NUMA affinity")Signed-off-by Guenter Roeck <[email protected]>--- drivers/base/test/test_async_driver_probe.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)drivers/base/test/test_async_driver_probe.c +2
-1@@ -44,7 +44,8 @@ static int test_probe(struct platform_device *pdev)* performing an async init on that node. */ if (dev->driver->probe_type ==PROBE_PREFER_ASYNCHRONOUS ) { -if (dev_to_node (dev) !=numa_node_id ()) { +if (IS_ENABLED (CONFIG_NUMA ) && +dev_to_node (dev) !=numa_node_id ()) {Quoted 9 lines
drivers/base/test/test_async_driver_probe.c static int test_probe(struct platform_device *pdev) · line 51
Quoted 3 lines
drivers/base/test/test_async_driver_probe.c +0
-0dev_warn (dev,"NUMA node mismatch %d != %d\n" ,dev_to_node (dev),numa_node_id ());atomic_inc (&warnings);I'm not sure that is really the correct fix. It might be better to test it against
NUMA_NO_NODEand then if it is not that make sure that it matches the node ID. Adding the check againstNUMA_NO_NODEwould resolve the issue for cases where the device might be assigned to multiple NUMA nodes.Quoted 5 lines
I think you are suggesting that
dev_to_node(dev)might returnNUMA_NO_NODEeven on systems withCONFIG_NUMAenabled. I have no idea if that can happen. The code intest_async_probe_init()seems to suggest that the node is set to a valid node id for all asynchronous nodes, so I don't immediately see how that could be the case. I may be missing something, of course.Well thinking back to the Nehalem architecture I seem to recall that there were devices that were connected to a shared IOH that was accessible across both nodes. I thought that they might have a node ID of
NUMA_NO_NODEsince they didn't really belong to either of the two nodes in the sytem.Quoted 6 lines
It would effectively work out the same as your patch compiler wise since
dev_to_nodewould beNUMA_NO_NODEin the non-NUMA case so it would compile out the warning since it would fail the first check, and in the NUMA case it would add an extra check to make sure thatdev_to_nodeis actually indicating the device needs a specific node in the NUMA enabled case.
Quoted 5 lines
I thought the code is specifically checking devices which it previously created, which are well defined and understood test devices. After all, the check is in the test driver's probe function. Guess I really don't understand the code. Please take my patch as bug report, and submit whatever fix you think is correct.
Sorry I had overlooked that this is the test code.
I suppose it should be fine since we specify the node ID for all instances where we register an asychronous test device.
Thanks.
- Alex
Quoted 7 lines · Alexander Duyck
Quoted 6 lines
I thought the code is specifically checking devices which it previously created, which are well defined and understood test devices. After all, the check is in the test driver's probe function. Guess I really don't understand the code. Please take my patch as bug report, and submit whatever fix you think is correct.
Quoted 5 lines
Sorry I had overlooked that this is the test code.
I suppose it should be fine since we specify the node ID for all instances where we register an asychronous test device.
That isn't exacly an endorsement. Would you mind submitting a patch that is acceptable for you ? I'll be more than happy to test it.
Thanks,
Guenter
Alexander Duyck
Acked-byQuoted 13 lines · Guenter Roeck
Quoted 11 lines · Alexander Duyck
Quoted 5 lines
I thought the code is specifically checking devices which it previously created, which are well defined and understood test devices. After all, the check is in the test driver's probe function. Guess I really don't understand the code. Please take my patch as bug report, and submit whatever fix you think is correct.
Sorry I had overlooked that this is the test code.
I suppose it should be fine since we specify the node ID for all instances where we register an asychronous test device.
Quoted 5 lines
That isn't exacly an endorsement. Would you mind submitting a patch that is acceptable for you ? I'll be more than happy to test it.
Thanks,
Guenter
It isn't really worth the trouble.
I would have been concerned if the patch was in something other than test code, and I hasn't paid close attention to the specific file being edited.
Your patch is more than enough to address the original issue you reported.
Thanks.