On 11/7/2022 8:01 AM, Jonathan Cameron wrote:
On Wed, 21 Sep 2022 08:33:15 -0700
Dave Jiang <dave.ji...@intel.com> wrote:
nfit_test overrode the security_show() sysfs attribute function in nvdimm
dimm_devs in order to allow testing of security unlock. With the
introduction of CXL security commands, the trick to override
security_show() becomes significantly more complicated. By introdcing a
security flag CONFIG_NVDIMM_SECURITY_TEST, libnvdimm can just toggle the
check via a compile option. In addition the original override can can be
removed from tools/testing/nvdimm/.
Signed-off-by: Dave Jiang <dave.ji...@intel.com>
---
drivers/nvdimm/Kconfig | 9 +++++++++
drivers/nvdimm/dimm_devs.c | 9 ++++++++-
drivers/nvdimm/security.c | 4 ++++
tools/testing/nvdimm/Kbuild | 1 -
tools/testing/nvdimm/dimm_devs.c | 30 ------------------------------
5 files changed, 21 insertions(+), 32 deletions(-)
delete mode 100644 tools/testing/nvdimm/dimm_devs.c
diff --git a/drivers/nvdimm/Kconfig b/drivers/nvdimm/Kconfig
index 5a29046e3319..fd336d138eda 100644
--- a/drivers/nvdimm/Kconfig
+++ b/drivers/nvdimm/Kconfig
@@ -114,4 +114,13 @@ config NVDIMM_TEST_BUILD
core devm_memremap_pages() implementation and other
infrastructure.
+config NVDIMM_SECURITY_TEST
+ bool "Nvdimm security test code toggle"
+ depends on NVDIMM_KEYS
+ help
+ Debug flag for security testing when using nfit_test or cxl_test
+ modules in tools/testing/.
+
+ Select Y if using nfit_test or cxl_test for security testing.
Probably want to say it if has any unfortunate side effects when not doing
such testing. Distros will want guidance on whether to enable.
Ok will add.
Jonathan
+
