[nrf noup] zms: Fix undeclared variable error #3219
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
nordic-piks
approved these changes
Aug 22, 2025
ArekBalysNordic
approved these changes
Aug 22, 2025
This reverts commit 8ccb986. To be re-applied after cherry-picks with a fix for a recent mistake. Signed-off-by: Grzegorz Swiderski <[email protected]>
This reverts commit fb385d5. Signed-off-by: Grzegorz Swiderski <[email protected]>
This reverts commit 73fe1ee. Signed-off-by: Grzegorz Swiderski <[email protected]>
Upstream PR #: 94330 Allow the ZMS API to optionally accept 64 bit IDs. A typedef `zms_id_t` is added, so that the maximum ID width can be controlled using Kconfig. The current ATE structure is already large enough that it is possible to reserve 64 bits for IDs without increasing its total size (128 bits). This makes the feature a natural, low footprint alternative to Settings, for cases where the supported key namespace must be larger than 32 bit but not arbitrarily large. The ATE format does have to be altered to accommodate larger IDs, but the default "32 bit" format is left as is. Now, the `struct zms_ate` describes one of two supported formats, selected by an `#if` condition. In the future, it may be possible to support multiple ATE formats at runtime, in which case the structure can be turned into a union. In the new, "64 bit" ATEs, the `offset` and `metadata` fields are moved into a union, because they are found to be mutually exclusive. With the old format, the same fields are in different locations, but one of them always gets filled with a dummy value, depending on the given ATE type. To cover both cases, a `memset` is used, which should be optimized away by the compiler when appropriate. The only limitation is that the new ATE format has no room for data CRC, but an alternative integrity check can be implemented by the caller. Signed-off-by: Grzegorz Swiderski <[email protected]> (cherry picked from commit ec7a4ad199b0a87e5d604cbea20c8e2f4f741303)
Upstream PR #: 94330 * Update the "corrupt ATE" tests to work with the new ATE format. * Add a basic test to verify support to 64 bit ZMS IDs. * Add a `testcase.yaml` entry to cover the above points and also run lookup cache tests to evaluate the 64 bit hash function. Signed-off-by: Grzegorz Swiderski <[email protected]> (cherry picked from commit d9e38a9c4521e9b4423526e2c8e91b64f15928c7)
ZMS legacy enabled by CONFIG_SETTINGS_ZMS_LEGACY uses a different lookup cache function that is optimized for Settings subsystem. Signed-off-by: Riadh Ghaddab <[email protected]> (cherry picked from commit 491354b) (cherry picked from commit 15cd2f6) (cherry picked from commit 8ccb986)
57300
force-pushed
the
fix-mistake-when-reapplying-noup
branch
from
0e598a1 to
800e53f
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes undeclared
uint32_t hashin:[nrf noup] zms: add lookup cache hash function for legacy ZMSAlso includes a re-cherry-pick of upstream PR 94330 to stabilize the ZMS ABI.