tests: Bluetooth: Mesh: use psa secure storage in mesh bsim tests #82319

alxelax · 2024-11-29T08:37:08Z

PR:

Removes PSA ITS emulator in mesh bsim tests and enables secure storage
Changes dependencies in secure storage to avoid circular dependencies if secure storage users select the same features

tomi-font

Might also be worth a migration guide entry to indicate that it's now necessary to select the affected Kconfig options for the secure storage subsystem.

subsys/secure_storage/Kconfig.its_store

subsys/secure_storage/Kconfig

tomi-font · 2024-11-29T09:25:36Z

subsys/secure_storage/Kconfig.its_store

@@ -12,7 +12,7 @@ config SECURE_STORAGE_ITS_STORE_IMPLEMENTATION_SETTINGS
 		&& $(dt_node_has_compat,$(dt_node_parent,$(DT_STORAGE_PARTITION)),fixed-partitions)
 	imply FLASH_MAP
 	imply NVS
-	select SETTINGS
+	depends on SETTINGS


This will require changes to enable this (and FLASH) in the existing tests/samples under tests/subsys/secure_storage/ and samples/psa/.

I'd say rather add this as part of the already existing depends on, or split it into parts (e.g. putting FLASH_HAS_DRIVER_ENABLED separately), for consistency.

The Kconfig options still need to be enabled in the samples, I think.

Commit removes PSA ITS emulator and enables usage of the PSA crypto storage instead. Signed-off-by: Aleksandr Khromykh <[email protected]>

samples/psa/its/overlay-secure_storage.conf

tomi-font · 2024-12-03T13:24:36Z

subsys/secure_storage/Kconfig.its_store

@@ -12,7 +12,7 @@ config SECURE_STORAGE_ITS_STORE_IMPLEMENTATION_SETTINGS
 		&& $(dt_node_has_compat,$(dt_node_parent,$(DT_STORAGE_PARTITION)),fixed-partitions)
 	imply FLASH_MAP
 	imply NVS
-	select SETTINGS
+	depends on SETTINGS


I'd say rather add this as part of the already existing depends on, or split it into parts (e.g. putting FLASH_HAS_DRIVER_ENABLED separately), for consistency.

doc/releases/migration-guide-4.1.rst

tomi-font · 2024-12-03T13:35:33Z

doc/releases/migration-guide-4.1.rst

+* The :kconfig:option:`CONFIG_SECURE_STORAGE_ITS_STORE_IMPLEMENTATION_SETTINGS` symbol no longer implies the
+  :kconfig:option:`CONFIG_FLASH_MAP` and :kconfig:option:`CONFIG_NVS` Kconfig options.
+  It either no longer selects :kconfig:option:`CONFIG_SETTINGS` Kconfig option.
+  Platforms using Secure storage must explicitly enable :kconfig:option:`CONFIG_FLASH_MAP`,


Using Secure storage with the settings-based ITS store module.

didn't get this. How the final text should look like?

Actually I think it can be made as simple as the following as we previously refer to CONFIG_SECURE_STORAGE_ITS_STORE_IMPLEMENTATION_SETTINGS:

Suggested change

Platforms using Secure storage must explicitly enable :kconfig:option:`CONFIG_FLASH_MAP`,

Platforms using it must now explicitly enable :kconfig:option:`CONFIG_FLASH_MAP`,

doc/releases/release-notes-4.1.rst

The commit changes dependencies on SETTINGS and FLASH to avoid circular dependencies if security storage subsystem users select them too. Signed-off-by: Aleksandr Khromykh <[email protected]>

sjanc · 2024-12-06T13:41:25Z

#AutoPTS run zephyr nrf52 MESH/NODE/KR/BV-01-C DFUM/SR/FD/BV-01-C

codecoup-tester · 2024-12-06T13:42:32Z

Scheduled PR #82319 (comment), board: nrf52, estimated start time: 14:43:31, test case count: 2, estimated duration: 0:04:49

Test cases to be run

DFUM/SR/FD/BV-01-C
MESH/NODE/KR/BV-01-C

codecoup-tester · 2024-12-06T14:02:23Z

AutoPTS Bot results:

Failed tests (1)

MESH MESH/NODE/KR/BV-01-C FAIL

Successful tests (1)

DFUM DFUM/SR/FD/BV-01-C PASS

tomi-font · 2024-12-09T11:46:45Z

tests/subsys/secure_storage/psa/its/testcase.yaml

+    filter: CONFIG_SECURE_STORAGE and CONFIG_SECURE_STORAGE_ITS_STORE_IMPLEMENTATION_SETTINGS
+            and CONFIG_FLASH_HAS_DRIVER_ENABLED


CONFIG_SECURE_STORAGE_ITS_STORE_IMPLEMENTATION_SETTINGS takes care of CONFIG_FLASH_HAS_DRIVER_ENABLED:

Suggested change

filter: CONFIG_SECURE_STORAGE and CONFIG_SECURE_STORAGE_ITS_STORE_IMPLEMENTATION_SETTINGS

and CONFIG_FLASH_HAS_DRIVER_ENABLED

filter: CONFIG_SECURE_STORAGE and CONFIG_SECURE_STORAGE_ITS_STORE_IMPLEMENTATION_SETTINGS

Also, why change this at all?

tomi-font · 2024-12-09T12:14:29Z

tests/subsys/secure_storage/psa/crypto/testcase.yaml

+  secure_storage.psa.crypto.secure_storage.settings:
+    filter: CONFIG_SECURE_STORAGE and CONFIG_SECURE_STORAGE_ITS_STORE_IMPLEMENTATION_SETTINGS
+            and CONFIG_FLASH_HAS_DRIVER_ENABLED
+    extra_args: EXTRA_CONF_FILE=overlay-secure_storage.conf;overlay-settings.conf
+    integration_platforms:
+      - native_sim
+      - nrf54l15dk/nrf54l15/cpuapp
+  secure_storage.psa.crypto.secure_storage.custom:
+    filter: CONFIG_SECURE_STORAGE and CONFIG_SECURE_STORAGE_ITS_STORE_IMPLEMENTATION_CUSTOM
+            and CONFIG_FLASH_HAS_DRIVER_ENABLED


This is a copy/paste fail right?

tomi-font · 2024-12-09T12:15:22Z

subsys/secure_storage/Kconfig.its_store

@@ -12,7 +12,7 @@ config SECURE_STORAGE_ITS_STORE_IMPLEMENTATION_SETTINGS
 		&& $(dt_node_has_compat,$(dt_node_parent,$(DT_STORAGE_PARTITION)),fixed-partitions)
 	imply FLASH_MAP
 	imply NVS
-	select SETTINGS
+	depends on SETTINGS


The Kconfig options still need to be enabled in the samples, I think.

tomi-font · 2024-12-09T12:16:02Z

tests/subsys/secure_storage/psa/crypto/overlay-secure_storage.conf

+CONFIG_FLASH=y
+CONFIG_FLASH_MAP=y
+CONFIG_NVS=y
+CONFIG_SETTINGS=y


This shouldn't be here? Only in overlay-settings.conf.

zephyrbot added area: mbedTLS / PSA Crypto area: Bluetooth Mesh area: Secure Storage Secure Storage area: Bluetooth labels Nov 29, 2024

zephyrbot requested review from akredalen, Andrewpini, ceolin, d3zd3z, HaavardRei, ithinuel, jhedberg, KyraLengfeld, LingaoM, omkar3141, PavelVPV, tomi-font and valeriosetti November 29, 2024 08:37

zephyrbot assigned PavelVPV Nov 29, 2024

tomi-font requested changes Nov 29, 2024

View reviewed changes

tests: Bluetooth: Mesh: use psa crypto storage in mesh bsim

869d297

Commit removes PSA ITS emulator and enables usage of the PSA crypto storage instead. Signed-off-by: Aleksandr Khromykh <[email protected]>

alxelax force-pushed the remove_psa_its_emulator branch from 63bf345 to 8321d0b Compare December 3, 2024 10:51

zephyrbot added the area: Samples Samples label Dec 3, 2024

zephyrbot requested review from kartben and nashif December 3, 2024 10:52

alxelax force-pushed the remove_psa_its_emulator branch from 8321d0b to 1bb8e85 Compare December 3, 2024 11:30

zephyrbot added the Release Notes To be mentioned in the release notes label Dec 3, 2024

alxelax force-pushed the remove_psa_its_emulator branch from 1bb8e85 to a1685a0 Compare December 3, 2024 11:46

Balaklaka reviewed Dec 3, 2024

View reviewed changes

samples/psa/its/overlay-secure_storage.conf Show resolved Hide resolved

tomi-font reviewed Dec 3, 2024

View reviewed changes

alxelax force-pushed the remove_psa_its_emulator branch from a1685a0 to e3ee4e9 Compare December 3, 2024 15:07

Balaklaka approved these changes Dec 4, 2024

View reviewed changes

alxelax force-pushed the remove_psa_its_emulator branch 3 times, most recently from e0c5700 to 30d9af5 Compare December 4, 2024 15:21

alxelax mentioned this pull request Dec 4, 2024

Bluetooth: mesh: provisionor cdb failure #82449

Open

secure_storage: change dependencies on settings and flash

d2ffd41

The commit changes dependencies on SETTINGS and FLASH to avoid circular dependencies if security storage subsystem users select them too. Signed-off-by: Aleksandr Khromykh <[email protected]>

alxelax force-pushed the remove_psa_its_emulator branch from 30d9af5 to d2ffd41 Compare December 5, 2024 12:44

valeriosetti mentioned this pull request Dec 6, 2024

Bluetooth MESH qualification tests regressions due to Tinycrypt deprecation #82645

Open

tomi-font reviewed Dec 9, 2024

View reviewed changes

tomi-font requested changes Dec 9, 2024

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

tests: Bluetooth: Mesh: use psa secure storage in mesh bsim tests #82319

tests: Bluetooth: Mesh: use psa secure storage in mesh bsim tests #82319

alxelax commented Nov 29, 2024

tomi-font left a comment

tomi-font Nov 29, 2024

tomi-font Dec 3, 2024

tomi-font Dec 9, 2024

tomi-font Dec 3, 2024

tomi-font Dec 3, 2024

alxelax Dec 3, 2024

tomi-font Dec 9, 2024

sjanc commented Dec 6, 2024

codecoup-tester commented Dec 6, 2024

codecoup-tester commented Dec 6, 2024

tomi-font Dec 9, 2024

tomi-font Dec 9, 2024

tomi-font Dec 9, 2024

tomi-font Dec 9, 2024

	Platforms using Secure storage must explicitly enable :kconfig:option:`CONFIG_FLASH_MAP`,
	Platforms using it must now explicitly enable :kconfig:option:`CONFIG_FLASH_MAP`,

		filter: CONFIG_SECURE_STORAGE and CONFIG_SECURE_STORAGE_ITS_STORE_IMPLEMENTATION_SETTINGS
		and CONFIG_FLASH_HAS_DRIVER_ENABLED

tests: Bluetooth: Mesh: use psa secure storage in mesh bsim tests #82319

Are you sure you want to change the base?

tests: Bluetooth: Mesh: use psa secure storage in mesh bsim tests #82319

Conversation

alxelax commented Nov 29, 2024

tomi-font left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

sjanc commented Dec 6, 2024

codecoup-tester commented Dec 6, 2024

codecoup-tester commented Dec 6, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment