cxl/test: Update mock dev array before calling platform_device_add()
Li Ming
reviewerPATCH v2 1/1 cxl/test: Update mock dev array before calling platform_device_add()
CXL test environment hits the following error sometimes.
cxl_mem mem9: endpoint7 failed probe
All mock memdevs are platform firmware devices added by cxl_test module, and cxl_test module also provides a platform device driver for them to create a memdev device to CXL subsystem. cxl_test module uses cxl_rcd/mem_single/mem arrays to store different types of mock memdevs. CXL drivers calls registered mock functions for a mock memdev by checking if a given memdev is in these arrays.
When cxl_test module adds these mock memdevs, it always calls platform_device_add() before adding them to a suitable mock memdev array. However, there is a small window where CXL drivers calls mock function for a added memdev before it added to a mock memdev array. In above case, cxl endpoint driver considers a added memdev was not a mock memdev, then calling devm_cxl_endpoint_decoders_setup() for it rather than mock_endpoint_decoders_setup().
An appropriate solution is that adding a new mock device to a mock device array before calling platform_device_add() for it. It can guarantee the new mock device is visible to CXL subsystem.
This patch introduces a new helped called cxl_mock_platform_device_add() to handle the issue, and uses the function for all mock devices addition.
---
Changes from v1:
- Rebase to v7.1-rc4.
- Introduce a new helper to handle the issue. (Alison)
- Use new helper for all mock device addition.
--- tools/testing/cxl/test/cxl.c | 105 ++++++++++++++--------------------- 1 file changed, 43 insertions(+), 62 deletions(-)
tools/testing/cxl/test/cxl.c +43 -62
@@ -1523,6 +1523,23 @@ static void mock_companion(struct acpi_device *adev, struct device *dev)#define SZ_64G (SZ_32G * 2)#endif +static int cxl_mock_platform_device_add (struct platform_device *pdev, +struct platform_device **ppdev) +{ +int rc; + +if (ppdev) + *ppdev = pdev; + rc =platform_device_add (pdev); +if (rc) { +platform_device_put (pdev); +if (ppdev) + *ppdev =NULL ; + } + +return rc; +} +static __init int cxl_rch_topo_init (void ) {int rc, i;
@@ -1537,13 +1554,10 @@ static __init int cxl_rch_topo_init(void) goto err_bridge;mock_companion (adev, &pdev->dev); - rc =platform_device_add (pdev); -if (rc) { -platform_device_put (pdev); + rc =cxl_mock_platform_device_add (pdev, &cxl_rch[i]); +if (rc) goto err_bridge; - } - cxl_rch[i] = pdev; mock_pci_bus[idx].bridge = &pdev->dev; rc =sysfs_create_link (&pdev->dev.kobj, &pdev->dev.kobj,"firmware_node" );
@@ -1595,13 +1609,10 @@ static __init int cxl_single_topo_init(void) goto err_bridge;mock_companion (adev, &pdev->dev); - rc =platform_device_add (pdev); -if (rc) { -platform_device_put (pdev); + rc =cxl_mock_platform_device_add (pdev, &cxl_hb_single[i]); +if (rc) goto err_bridge; - } - cxl_hb_single[i] = pdev; mock_pci_bus[i +NR_CXL_HOST_BRIDGES ].bridge = &pdev->dev; rc =sysfs_create_link (&pdev->dev.kobj, &pdev->dev.kobj,"physical_node" );
@@ -1620,12 +1631,9 @@ static __init int cxl_single_topo_init(void) goto err_port; pdev->dev.parent = &bridge->dev; - rc =platform_device_add (pdev); -if (rc) { -platform_device_put (pdev); + rc =cxl_mock_platform_device_add (pdev, &cxl_root_single[i]); +if (rc) goto err_port; - } - cxl_root_single[i] = pdev; }for (i =0 ; i <ARRAY_SIZE (cxl_swu_single); i++) {
@@ -1638,12 +1646,9 @@ static __init int cxl_single_topo_init(void) goto err_uport; pdev->dev.parent = &root_port->dev; - rc =platform_device_add (pdev); -if (rc) { -platform_device_put (pdev); + rc =cxl_mock_platform_device_add (pdev, &cxl_swu_single[i]); +if (rc) goto err_uport; - } - cxl_swu_single[i] = pdev; }for (i =0 ; i <ARRAY_SIZE (cxl_swd_single); i++) {
@@ -1657,12 +1662,9 @@ static __init int cxl_single_topo_init(void) goto err_dport; pdev->dev.parent = &uport->dev; - rc =platform_device_add (pdev); -if (rc) { -platform_device_put (pdev); + rc =cxl_mock_platform_device_add (pdev, &cxl_swd_single[i]); +if (rc) goto err_dport; - } - cxl_swd_single[i] = pdev; }return 0 ;
@@ -1735,12 +1737,9 @@ static int cxl_mem_init(void) pdev->dev.parent = &dport->dev;set_dev_node (&pdev->dev, i %2 ); - rc =platform_device_add (pdev); -if (rc) { -platform_device_put (pdev); + rc =cxl_mock_platform_device_add (pdev, &cxl_mem[i]); +if (rc) goto err_mem; - } - cxl_mem[i] = pdev; }for (i =0 ; i <ARRAY_SIZE (cxl_mem_single); i++) {
@@ -1753,12 +1752,9 @@ static int cxl_mem_init(void) pdev->dev.parent = &dport->dev;set_dev_node (&pdev->dev, i %2 ); - rc =platform_device_add (pdev); -if (rc) { -platform_device_put (pdev); + rc =cxl_mock_platform_device_add (pdev, &cxl_mem_single[i]); +if (rc) goto err_single; - } - cxl_mem_single[i] = pdev; }for (i =0 ; i <ARRAY_SIZE (cxl_rcd); i++) {
@@ -1772,12 +1768,9 @@ static int cxl_mem_init(void) pdev->dev.parent = &rch->dev;set_dev_node (&pdev->dev, i %2 ); - rc =platform_device_add (pdev); -if (rc) { -platform_device_put (pdev); + rc =cxl_mock_platform_device_add (pdev, &cxl_rcd[i]); +if (rc) goto err_rcd; - } - cxl_rcd[i] = pdev; }return 0 ;
@@ -1869,13 +1862,10 @@ static __init int cxl_test_init(void) goto err_bridge;mock_companion (adev, &pdev->dev); - rc =platform_device_add (pdev); -if (rc) { -platform_device_put (pdev); + rc =cxl_mock_platform_device_add (pdev, &cxl_host_bridge[i]); +if (rc) goto err_bridge; - } - cxl_host_bridge[i] = pdev; mock_pci_bus[i].bridge = &pdev->dev; rc =sysfs_create_link (&pdev->dev.kobj, &pdev->dev.kobj,"physical_node" );
@@ -1893,12 +1883,9 @@ static __init int cxl_test_init(void) goto err_port; pdev->dev.parent = &bridge->dev; - rc =platform_device_add (pdev); -if (rc) { -platform_device_put (pdev); + rc =cxl_mock_platform_device_add (pdev, &cxl_root_port[i]); +if (rc) goto err_port; - } - cxl_root_port[i] = pdev; }BUILD_BUG_ON (ARRAY_SIZE (cxl_switch_uport) !=ARRAY_SIZE (cxl_root_port));
@@ -1911,12 +1898,9 @@ static __init int cxl_test_init(void) goto err_uport; pdev->dev.parent = &root_port->dev; - rc =platform_device_add (pdev); -if (rc) { -platform_device_put (pdev); + rc =cxl_mock_platform_device_add (pdev, &cxl_switch_uport[i]); +if (rc) goto err_uport; - } - cxl_switch_uport[i] = pdev; }for (i =0 ; i <ARRAY_SIZE (cxl_switch_dport); i++) {
@@ -1929,12 +1913,9 @@ static __init int cxl_test_init(void) goto err_dport; pdev->dev.parent = &uport->dev; - rc =platform_device_add (pdev); -if (rc) { -platform_device_put (pdev); + rc =cxl_mock_platform_device_add (pdev, &cxl_switch_dport[i]); +if (rc) goto err_dport; - } - cxl_switch_dport[i] = pdev; } rc =cxl_single_topo_init ();
@@ -1953,9 +1934,9 @@ static __init int cxl_test_init(void) acpi0017_mock.dev.bus = &platform_bus_type; cxl_acpi->dev.groups = cxl_acpi_groups; - rc =platform_device_add (cxl_acpi); + rc =cxl_mock_platform_device_add (cxl_acpi,NULL );if (rc) - goto err_root; + goto err_rch; rc =cxl_mem_init ();if (rc)
Signature · 1 line
2.43.0
Quoted 19 lines · Li Ming
CXL test environment hits the following error sometimes.
cxl_memmem9: endpoint7 failed probeAll mock memdevs are platform firmware devices added by
cxl_testmodule, andcxl_testmodule also provides a platform device driver for them to create a memdev device to CXL subsystem.cxl_testmodule uses cxl_rcd/mem_single/mem arrays to store different types of mock memdevs. CXL drivers calls registered mock functions for a mock memdev by checking if a given memdev is in these arrays.When
cxl_testmodule adds these mock memdevs, it always callsplatform_device_add()before adding them to a suitable mock memdev array. However, there is a small window where CXL drivers calls mock function for a added memdev before it added to a mock memdev array. In above case, cxl endpoint driver considers a added memdev was not a mock memdev, then callingdevm_cxl_endpoint_decoders_setup()for it rather thanmock_endpoint_decoders_setup().
Quoted 7 lines
An appropriate solution is that adding a new mock device to a mock device array before calling
platform_device_add()for it. It can guarantee the new mock device is visible to CXL subsystem.This patch introduces a new helped called
cxl_mock_platform_device_add()to handle the issue, and uses the function for all mock devices addition.
Quoted 11 lines
Fixes 3a2b97b3210b ("cxl/test: Improve init-order fidelity relative to real-world systems")Signed-off-by Li Ming <[email protected]>---
Changes from v1:
- Rebase to v7.1-rc4.
- Introduce a new helper to handle the issue. (Alison)
- Use new helper for all mock device addition.--- tools/testing/cxl/test/cxl.c | 105 ++++++++++++++--------------------- 1 file changed, 43 insertions(+), 62 deletions(-)
Li Ming
reviewerQuoted 20 lines · Alison Schofield
Quoted 19 lines · Li Ming
CXL test environment hits the following error sometimes.
cxl_memmem9: endpoint7 failed probeAll mock memdevs are platform firmware devices added by
cxl_testmodule, andcxl_testmodule also provides a platform device driver for them to create a memdev device to CXL subsystem.cxl_testmodule uses cxl_rcd/mem_single/mem arrays to store different types of mock memdevs. CXL drivers calls registered mock functions for a mock memdev by checking if a given memdev is in these arrays.When
cxl_testmodule adds these mock memdevs, it always callsplatform_device_add()before adding them to a suitable mock memdev array. However, there is a small window where CXL drivers calls mock function for a added memdev before it added to a mock memdev array. In above case, cxl endpoint driver considers a added memdev was not a mock memdev, then callingdevm_cxl_endpoint_decoders_setup()for it rather thanmock_endpoint_decoders_setup().
Quoted 8 lines
Quoted 7 lines
An appropriate solution is that adding a new mock device to a mock device array before calling
platform_device_add()for it. It can guarantee the new mock device is visible to CXL subsystem.This patch introduces a new helped called
cxl_mock_platform_device_add()to handle the issue, and uses the function for all mock devices addition.Reviewed-by Alison Schofield <[email protected]>
Hi Alison,
I missed that you mentioned putting platform_device_alloc() into the helper. I will send out v3 for that.
Ming
Quoted 13 lines
Quoted 13 lines
Fixes 3a2b97b3210b ("cxl/test: Improve init-order fidelity relative to real-world systems")Signed-off-by Li Ming <[email protected]>---
Changes from v1:
- Rebase to v7.1-rc4.
- Introduce a new helper to handle the issue. (Alison)
- Use new helper for all mock device addition.--- tools/testing/cxl/test/cxl.c | 105 ++++++++++++++--------------------- 1 file changed, 43 insertions(+), 62 deletions(-)
Li Ming
reviewerQuoted 29 lines · Li Ming
Quoted 27 lines · Alison Schofield
Quoted 26 lines · Li Ming
CXL test environment hits the following error sometimes.
cxl_memmem9: endpoint7 failed probeAll mock memdevs are platform firmware devices added by
cxl_testmodule, andcxl_testmodule also provides a platform device driver for them to create a memdev device to CXL subsystem.cxl_testmodule uses cxl_rcd/mem_single/mem arrays to store different types of mock memdevs. CXL drivers calls registered mock functions for a mock memdev by checking if a given memdev is in these arrays.When
cxl_testmodule adds these mock memdevs, it always callsplatform_device_add()before adding them to a suitable mock memdev array. However, there is a small window where CXL drivers calls mock function for a added memdev before it added to a mock memdev array. In above case, cxl endpoint driver considers a added memdev was not a mock memdev, then callingdevm_cxl_endpoint_decoders_setup()for it rather thanmock_endpoint_decoders_setup().An appropriate solution is that adding a new mock device to a mock device array before calling
platform_device_add()for it. It can guarantee the new mock device is visible to CXL subsystem.This patch introduces a new helped called
cxl_mock_platform_device_add()to handle the issue, and uses the function for all mock devices addition.
Quoted 8 lines
Quoted 1 line
Reviewed-by Alison Schofield <[email protected]>Hi Alison,
I missed that you mentioned putting
platform_device_alloc()into the helper. I will send out v3 for that.
After taking a look into the implementation, maybe keep current implementation would be better.
This helper is responsible for performing the platform_device_add() operation for all mock devices. However, each type of mock device has its own specific logic between platform_device_alloc() and platform_device_add().
If I move platform_device_alloc() into this helper,I will also have to incorporate all these device-specific implementations.
Ming
Quoted 16 lines
Ming
Quoted 14 lines
Quoted 14 lines
Fixes 3a2b97b3210b ("cxl/test: Improve init-order fidelity relative to real-world systems")Signed-off-by Li Ming <[email protected]>---
Changes from v1:
- Rebase to v7.1-rc4.
- Introduce a new helper to handle the issue. (Alison)
- Use new helper for all mock device addition.
---
tools/testing/cxl/test/cxl.c| 105
++++++++++++++---------------------1 file changed, 43 insertions(+), 62 deletions(-)
Quoted 46 lines · Li Ming
Quoted 32 lines · Li Ming
Quoted 30 lines · Alison Schofield
Quoted 29 lines · Li Ming
CXL test environment hits the following error sometimes.
cxl_memmem9: endpoint7 failed probeAll mock memdevs are platform firmware devices added by
cxl_testmodule,
andcxl_testmodule also provides a platform device driver for them to create a memdev device to CXL subsystem.cxl_testmodule uses cxl_rcd/mem_single/mem arrays to store different types of mock memdevs. CXL drivers calls registered mock functions for a mock memdev by checking if a given memdev is in these arrays.When
cxl_testmodule adds these mock memdevs, it always callsplatform_device_add()before adding them to a suitable mock memdev array. However, there is a small window where CXL drivers calls mock function for a added memdev before it added to a mock memdev array. In above case, cxl endpoint driver considers a added memdev was not a mock memdev, then callingdevm_cxl_endpoint_decoders_setup()for it rather thanmock_endpoint_decoders_setup().An appropriate solution is that adding a new mock device to a mock device array before calling
platform_device_add()for it. It can guarantee the new mock device is visible to CXL subsystem.This patch introduces a new helped called
cxl_mock_platform_device_add()
to handle the issue, and uses the function for all mock devices addition.Quoted 9 lines
Quoted 1 line
Reviewed-by Alison Schofield <[email protected]>Hi Alison,
I missed that you mentioned putting
platform_device_alloc()into the helper. I will send out v3 for that.After taking a look into the implementation, maybe keep current implementation would be better.
Quoted 7 lines
This helper is responsible for performing the
platform_device_add()operation for all mock devices. However, each type of mock device has its own specific logic betweenplatform_device_alloc()andplatform_device_add().If I move
platform_device_alloc()into this helper,I will also have to incorporate all these device-specific implementations.
That makes sense Ming. Thanks for trying it out.
I'll add to my previous tag,
Quoted 5 lines
Ming
Quoted 2 lines
Ming
snip
Quoted 23 lines · Li Ming
CXL test environment hits the following error sometimes.
cxl_memmem9: endpoint7 failed probeAll mock memdevs are platform firmware devices added by
cxl_testmodule, andcxl_testmodule also provides a platform device driver for them to create a memdev device to CXL subsystem.cxl_testmodule uses cxl_rcd/mem_single/mem arrays to store different types of mock memdevs. CXL drivers calls registered mock functions for a mock memdev by checking if a given memdev is in these arrays.When
cxl_testmodule adds these mock memdevs, it always callsplatform_device_add()before adding them to a suitable mock memdev array. However, there is a small window where CXL drivers calls mock function for a added memdev before it added to a mock memdev array. In above case, cxl endpoint driver considers a added memdev was not a mock memdev, then callingdevm_cxl_endpoint_decoders_setup()for it rather thanmock_endpoint_decoders_setup().An appropriate solution is that adding a new mock device to a mock device array before calling
platform_device_add()for it. It can guarantee the new mock device is visible to CXL subsystem.
Quoted 5 lines
This patch introduces a new helped called
cxl_mock_platform_device_add()to handle the issue, and uses the function for all mock devices addition.Fixes 3a2b97b3210b ("cxl/test: Improve init-order fidelity relative to real-world systems")Signed-off-by Li Ming <[email protected]>
Applied to cxl/fixesd90f236f8b9e354848bd226f581db27755ab901d
Quoted 232 lines
---
Changes from v1:
- Rebase to v7.1-rc4.
- Introduce a new helper to handle the issue. (Alison)
- Use new helper for all mock device addition.--- tools/testing/cxl/test/cxl.c | 105 ++++++++++++++--------------------- 1 file changed, 43 insertions(+), 62 deletions(-)tools/testing/cxl/test/cxl.c +43
-62@@ -1523,6 +1523,23 @@ static void mock_companion(struct acpi_device *adev, struct device *dev)#define SZ_64G (SZ_32G * 2)#endif +static int cxl_mock_platform_device_add (struct platform_device *pdev, +struct platform_device **ppdev) +{ +int rc; + +if (ppdev) + *ppdev = pdev; + rc =platform_device_add (pdev); +if (rc) { +platform_device_put (pdev); +if (ppdev) + *ppdev =NULL ; + } + +return rc; +} +static __init int cxl_rch_topo_init (void ) {int rc, i;@@ -1537,13 +1554,10 @@ static __init int cxl_rch_topo_init(void) goto err_bridge;mock_companion (adev, &pdev->dev); - rc =platform_device_add (pdev); -if (rc) { -platform_device_put (pdev); + rc =cxl_mock_platform_device_add (pdev, &cxl_rch[i]); +if (rc) goto err_bridge; - } - cxl_rch[i] = pdev; mock_pci_bus[idx].bridge = &pdev->dev; rc =sysfs_create_link (&pdev->dev.kobj, &pdev->dev.kobj,"firmware_node" );@@ -1595,13 +1609,10 @@ static __init int cxl_single_topo_init(void) goto err_bridge;mock_companion (adev, &pdev->dev); - rc =platform_device_add (pdev); -if (rc) { -platform_device_put (pdev); + rc =cxl_mock_platform_device_add (pdev, &cxl_hb_single[i]); +if (rc) goto err_bridge; - } - cxl_hb_single[i] = pdev; mock_pci_bus[i +NR_CXL_HOST_BRIDGES ].bridge = &pdev->dev; rc =sysfs_create_link (&pdev->dev.kobj, &pdev->dev.kobj,"physical_node" );@@ -1620,12 +1631,9 @@ static __init int cxl_single_topo_init(void) goto err_port; pdev->dev.parent = &bridge->dev; - rc =platform_device_add (pdev); -if (rc) { -platform_device_put (pdev); + rc =cxl_mock_platform_device_add (pdev, &cxl_root_single[i]); +if (rc) goto err_port; - } - cxl_root_single[i] = pdev; }for (i =0 ; i <ARRAY_SIZE (cxl_swu_single); i++) {@@ -1638,12 +1646,9 @@ static __init int cxl_single_topo_init(void) goto err_uport; pdev->dev.parent = &root_port->dev; - rc =platform_device_add (pdev); -if (rc) { -platform_device_put (pdev); + rc =cxl_mock_platform_device_add (pdev, &cxl_swu_single[i]); +if (rc) goto err_uport; - } - cxl_swu_single[i] = pdev; }for (i =0 ; i <ARRAY_SIZE (cxl_swd_single); i++) {@@ -1657,12 +1662,9 @@ static __init int cxl_single_topo_init(void) goto err_dport; pdev->dev.parent = &uport->dev; - rc =platform_device_add (pdev); -if (rc) { -platform_device_put (pdev); + rc =cxl_mock_platform_device_add (pdev, &cxl_swd_single[i]); +if (rc) goto err_dport; - } - cxl_swd_single[i] = pdev; }return 0 ;@@ -1735,12 +1737,9 @@ static int cxl_mem_init(void) pdev->dev.parent = &dport->dev;set_dev_node (&pdev->dev, i %2 ); - rc =platform_device_add (pdev); -if (rc) { -platform_device_put (pdev); + rc =cxl_mock_platform_device_add (pdev, &cxl_mem[i]); +if (rc) goto err_mem; - } - cxl_mem[i] = pdev; }for (i =0 ; i <ARRAY_SIZE (cxl_mem_single); i++) {@@ -1753,12 +1752,9 @@ static int cxl_mem_init(void) pdev->dev.parent = &dport->dev;set_dev_node (&pdev->dev, i %2 ); - rc =platform_device_add (pdev); -if (rc) { -platform_device_put (pdev); + rc =cxl_mock_platform_device_add (pdev, &cxl_mem_single[i]); +if (rc) goto err_single; - } - cxl_mem_single[i] = pdev; }for (i =0 ; i <ARRAY_SIZE (cxl_rcd); i++) {@@ -1772,12 +1768,9 @@ static int cxl_mem_init(void) pdev->dev.parent = &rch->dev;set_dev_node (&pdev->dev, i %2 ); - rc =platform_device_add (pdev); -if (rc) { -platform_device_put (pdev); + rc =cxl_mock_platform_device_add (pdev, &cxl_rcd[i]); +if (rc) goto err_rcd; - } - cxl_rcd[i] = pdev; }return 0 ;@@ -1869,13 +1862,10 @@ static __init int cxl_test_init(void) goto err_bridge;mock_companion (adev, &pdev->dev); - rc =platform_device_add (pdev); -if (rc) { -platform_device_put (pdev); + rc =cxl_mock_platform_device_add (pdev, &cxl_host_bridge[i]); +if (rc) goto err_bridge; - } - cxl_host_bridge[i] = pdev; mock_pci_bus[i].bridge = &pdev->dev; rc =sysfs_create_link (&pdev->dev.kobj, &pdev->dev.kobj,"physical_node" );@@ -1893,12 +1883,9 @@ static __init int cxl_test_init(void) goto err_port; pdev->dev.parent = &bridge->dev; - rc =platform_device_add (pdev); -if (rc) { -platform_device_put (pdev); + rc =cxl_mock_platform_device_add (pdev, &cxl_root_port[i]); +if (rc) goto err_port; - } - cxl_root_port[i] = pdev; }BUILD_BUG_ON (ARRAY_SIZE (cxl_switch_uport) !=ARRAY_SIZE (cxl_root_port));@@ -1911,12 +1898,9 @@ static __init int cxl_test_init(void) goto err_uport; pdev->dev.parent = &root_port->dev; - rc =platform_device_add (pdev); -if (rc) { -platform_device_put (pdev); + rc =cxl_mock_platform_device_add (pdev, &cxl_switch_uport[i]); +if (rc) goto err_uport; - } - cxl_switch_uport[i] = pdev; }for (i =0 ; i <ARRAY_SIZE (cxl_switch_dport); i++) {@@ -1929,12 +1913,9 @@ static __init int cxl_test_init(void) goto err_dport; pdev->dev.parent = &uport->dev; - rc =platform_device_add (pdev); -if (rc) { -platform_device_put (pdev); + rc =cxl_mock_platform_device_add (pdev, &cxl_switch_dport[i]); +if (rc) goto err_dport; - } - cxl_switch_dport[i] = pdev; } rc =cxl_single_topo_init ();@@ -1953,9 +1934,9 @@ static __init int cxl_test_init(void) acpi0017_mock.dev.bus = &platform_bus_type; cxl_acpi->dev.groups = cxl_acpi_groups; - rc =platform_device_add (cxl_acpi); + rc =cxl_mock_platform_device_add (cxl_acpi,NULL );if (rc) - goto err_root; + goto err_rch; rc =cxl_mem_init ();if (rc)