2022-12-19 20:18:23

by Luis Chamberlain

Subject: [PATCH] cxl_test: remove nvdimm requirement

There is no need for NVDIMM to test CXL, so remove this
requirement.

Signed-off-by: Luis Chamberlain <[email protected]>
---
tools/testing/cxl/config_check.c | 2 --
tools/testing/cxl/test/mock.c | 2 ++
2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/testing/cxl/config_check.c b/tools/testing/cxl/config_check.c
index 99b56b5f6edf..cef5f1159ba7 100644
--- a/tools/testing/cxl/config_check.c
+++ b/tools/testing/cxl/config_check.c
@@ -10,7 +10,5 @@ void check(void)
BUILD_BUG_ON(!IS_ENABLED(CONFIG_64BIT));
BUILD_BUG_ON(!IS_MODULE(CONFIG_CXL_BUS));
BUILD_BUG_ON(!IS_MODULE(CONFIG_CXL_ACPI));
- BUILD_BUG_ON(!IS_MODULE(CONFIG_CXL_PMEM));
BUILD_BUG_ON(!IS_ENABLED(CONFIG_CXL_REGION_INVALIDATION_TEST));
- BUILD_BUG_ON(!IS_ENABLED(CONFIG_NVDIMM_SECURITY_TEST));
}
diff --git a/tools/testing/cxl/test/mock.c b/tools/testing/cxl/test/mock.c
index 5dface08e0de..7c71826f1aac 100644
--- a/tools/testing/cxl/test/mock.c
+++ b/tools/testing/cxl/test/mock.c
@@ -116,6 +116,7 @@ struct acpi_pci_root *__wrap_acpi_pci_find_root(acpi_handle handle)
}
EXPORT_SYMBOL_GPL(__wrap_acpi_pci_find_root);

+#ifdef CONFIG_CXL_PMEM
struct nvdimm_bus *
__wrap_nvdimm_bus_register(struct device *dev,
struct nvdimm_bus_descriptor *nd_desc)
@@ -130,6 +131,7 @@ __wrap_nvdimm_bus_register(struct device *dev,
return nvdimm_bus_register(dev, nd_desc);
}
EXPORT_SYMBOL_GPL(__wrap_nvdimm_bus_register);
+#endif

struct cxl_hdm *__wrap_devm_cxl_setup_hdm(struct cxl_port *port)
{
--
2.35.1

2022-12-20 20:48:23

by Dan Williams

Subject: RE: [PATCH] cxl_test: remove nvdimm requirement

Luis Chamberlain wrote:
> There is no need for NVDIMM to test CXL, so remove this
> requirement.

Are you perhaps running without the new nvdimm pmem security test?

http://lore.kernel.org/r/167105505204.3034751.8113387624258581781.stgit@djiang5-desk3.ch.intel.com/

...again these types of mismatches are expected in and around the merge
window when linux.git and ndctl.git get out of sync. I would skip
running cxl_test for regression purposes until around -rc2 timeframe
when all of the new code has settled in both repositories.

2023-01-04 20:06:22

by Luis Chamberlain

Subject: Re: [PATCH] cxl_test: remove nvdimm requirement

On Tue, Dec 20, 2022 at 12:13:40PM -0800, Dan Williams wrote:
> Luis Chamberlain wrote:
> > There is no need for NVDIMM to test CXL, so remove this
> > requirement.
>
> Are you perhaps running without the new nvdimm pmem security test?
>
> http://lore.kernel.org/r/167105505204.3034751.8113387624258581781.stgit@djiang5-desk3.ch.intel.com/
>
> ...again these types of mismatches are expected in and around the merge
> window when linux.git and ndctl.git get out of sync. I would skip
> running cxl_test for regression purposes until around -rc2 timeframe
> when all of the new code has settled in both repositories.

No, since one can build CXL without NVDIMM it seems this is a fair
change as well.

Luis