Bluetooth: Mesh: Add full virtual addresses support #57878

PavelVPV · 2023-05-15T07:40:18Z

This PR adds the following features related to virtual addresses
support:

Allows to store Label UUIDs which virtual addresses collide;
Allows to decrypt messages encrypted with a virtual address with
collision;
Allows to publish a message to a specific Label UUID to avoid virtual
addresses collision by adding a pointer to Label UUID to
struct bt_mesh_msg_ctx and struct bt_mesh_model_pub;
Allows to differentiate Label UUIDs in the model's Subscription List
by storing all subscribed UUIDs in struct bt_mesh_model.uuids field.

This PR adds BabbleSim test to cover new functionality.

This PR also fixes an issue where an LPN will unnecessarily poll Friend when sending a message over loopback.

Andrewpini

LGTM 👍 I have a couple of minor comments

Andrewpini · 2023-05-23T07:23:12Z

include/zephyr/bluetooth/mesh/msg.h

@@ -102,6 +105,8 @@ struct bt_mesh_msg_ctx {
 /**
 * @brief Helper for bt_mesh_msg_ctx structure initialization.
 *
+ * @note If @c dst is a Virtual Address, Label UUID shall initialized separately.


Suggested change

* @note If @c dst is a Virtual Address, Label UUID shall initialized separately.

* @note If @c dst is a Virtual Address, Label UUID shall be initialized separately.

Andrewpini · 2023-05-23T13:38:01Z

subsys/bluetooth/mesh/va.h

+ *
+ * @param uuid pointer to momry with Label UUID to be found.
+ *
+ * @return Pointer to an valid entry, NULL otherwise.


Suggested change

* @return Pointer to an valid entry, NULL otherwise.

* @return Pointer to a valid entry, NULL otherwise.

Andrewpini · 2023-05-23T13:38:46Z

subsys/bluetooth/mesh/va.h

+ *
+ * @c uuid can be a user data.
+ *
+ * @param uuid pointer to momry with Label UUID to be found.


Suggested change

* @param uuid pointer to momry with Label UUID to be found.

* @param uuid pointer to memory with Label UUID to be found.

Andrewpini · 2023-05-23T13:40:15Z

subsys/bluetooth/mesh/va.h

+ *
+ * @param addr Virtual address to check
+ *
+ * @return true if there is collision, false otherwise.


Suggested change

* @return true if there is collision, false otherwise.

* @return True if there is collision, false otherwise.

Andrewpini · 2023-05-23T13:41:53Z

subsys/bluetooth/mesh/va.h

+
+/** @brief Iterate stored Label UUIDs.
+ *
+ * When @c addr is @ref BT_MESH_ADDR_UNASSIGNED, this function iterates all available addresses


Suggested change

* When @c addr is @ref BT_MESH_ADDR_UNASSIGNED, this function iterates all available addresses

* When @c addr is @ref BT_MESH_ADDR_UNASSIGNED, this function iterates over all available addresses

?

subsys/bluetooth/mesh/transport.c

include/zephyr/bluetooth/mesh/access.h

subsys/bluetooth/mesh/access.c

subsys/bluetooth/mesh/cfg_srv.c

tests/bsim/bluetooth/mesh/tests_scripts/friendship/msg_va_collision.sh

When LPN sends a segmented message to itself, it unnecesseraly polls Friend. Since Friend doesn't receive this message, the segmented message transmission will eventually fail (send end callback will return error), while the message will actually be passed to the access layer. Signed-off-by: Pavel Vasilyev <pavel.vasilyev@nordicsemi.no>

This commit adds the following features related to virtual addresses support: - Allows to store Label UUIDs which virtual addresses collide; - Allows to decrypt messages encrypted with a virtual address with collision; - Allows to publish a message to a specific Label UUID to avoid virtual addresses collision by adding a pointer to Label UUID to struct bt_mesh_msg_ctx and struct bt_mesh_model_pub; - Allows to differentiate Label UUIDs in the model's Subscription List by storing all subscribed UUIDs in struct bt_mesh_model.uuids field. Signed-off-by: Pavel Vasilyev <pavel.vasilyev@nordicsemi.no>

Test that: - virtual addresses in subscription list and publication states are stored and restored correctly - virtual addresses with collisions are stored and restored correctly Signed-off-by: Pavel Vasilyev <pavel.vasilyev@nordicsemi.no>

Test that transport layer correctly encrypts and decrypts messages to virtual addresses with collision. Signed-off-by: Pavel Vasilyev <pavel.vasilyev@nordicsemi.no>

Test that LPN correctly sends Friend Subscription List Add and Remove messages to Friend when subscribed and unsubscribed to virtual addresses wirth collision. Signed-off-by: Pavel Vasilyev <pavel.vasilyev@nordicsemi.no>

alxelax

LGTM just needs to clarify the final case with backward compatibility. After this, I'll approve PR.

After adding support for virtual addresses with collision (where two Label UUIDs have the same virtual address), the format of the data in the persistent storage with the Label UUIDs which a model is subscribed to or publishes to has been changed. The recovery code is added and the Label UUIDs will be recovered by picking first Label UUID matching to the virtual address in the subscription list or model publication. This options can disable the recovery code and save some flash if the recovery is not required (e.g. virtual address support wasn't enabled before this option was added, or the devices were unprovisioned before upgrading to the version with this option). Making this option as deprecated to be able to drop support of this option and remove the recovery code eventually. Signed-off-by: Pavel Vasilyev <pavel.vasilyev@nordicsemi.no>

Virtual address behavior has been changed in this PR: zephyrproject-rtos/zephyr#57878 Now it requires label uuid to be added before any message can be sent and desired uuid should be passed to message context structure before sending a message to a virtual address. This change should fix MESH/NODE/NET/BV-02-C and MESH/NODE/TNPT/BV-05-C failing tests. For MESH/NODE/NET/BV-02-C the virtual address is added on hdl_wid_21 as PTS asks the stack to provide known virtual address. For MESH/NODE/TNPT/BV-05-C PTS gives the label uuid in the message, therefore we need to add this address first before sending a message to it. Signed-off-by: Pavel Vasilyev <pavel.vasilyev@nordicsemi.no>

Virtual address behavior has been changed in this PR: zephyrproject-rtos#57878 Now it is required to register virtual address before using it. Signed-off-by: Pavel Vasilyev <pavel.vasilyev@nordicsemi.no>

Virtual address behavior has been changed in this PR: zephyrproject-rtos#57878 Now it is required to register virtual address before using it. Corresponding PR to auto-pts: auto-pts/auto-pts#961 Signed-off-by: Pavel Vasilyev <pavel.vasilyev@nordicsemi.no>

Virtual address behavior has been changed in this PR: zephyrproject-rtos/zephyr#57878 Now it requires label uuid to be added before any message can be sent and desired uuid should be passed to message context structure before sending a message to a virtual address. This change should fix MESH/NODE/NET/BV-02-C and MESH/NODE/TNPT/BV-05-C failing tests. For MESH/NODE/NET/BV-02-C the virtual address is added on hdl_wid_21 as PTS asks the stack to provide known virtual address. For MESH/NODE/TNPT/BV-05-C PTS gives the label uuid in the message, therefore we need to add this address first before sending a message to it. Corresponding PR to zephyrproject-rtos: zephyrproject-rtos/zephyr#59486 Signed-off-by: Pavel Vasilyev <pavel.vasilyev@nordicsemi.no>

Virtual address behavior has been changed in this PR: zephyrproject-rtos#57878 Now it is required to register virtual address before using it. Corresponding PR to auto-pts: auto-pts/auto-pts#961 Signed-off-by: Pavel Vasilyev <pavel.vasilyev@nordicsemi.no>

Virtual address behavior has been changed in this PR: #57878 Now it is required to register virtual address before using it. Corresponding PR to auto-pts: auto-pts/auto-pts#961 Signed-off-by: Pavel Vasilyev <pavel.vasilyev@nordicsemi.no>

…ual addresses Virtual address behavior has been changed in this PR: zephyrproject-rtos/zephyr#57878 Now it is required to register virtual address before using it. Corresponding PR to auto-pts: auto-pts/auto-pts#961 Signed-off-by: Pavel Vasilyev <pavel.vasilyev@nordicsemi.no> (cherry picked from commit 4d56a31) Signed-off-by: Alperen Sener <alperen.sener@nordicsemi.no>

Virtual address behavior has been changed in this PR: zephyrproject-rtos/zephyr#57878 Now it requires label uuid to be added before any message can be sent and desired uuid should be passed to message context structure before sending a message to a virtual address. This change should fix MESH/NODE/NET/BV-02-C and MESH/NODE/TNPT/BV-05-C failing tests. For MESH/NODE/NET/BV-02-C the virtual address is added on hdl_wid_21 as PTS asks the stack to provide known virtual address. For MESH/NODE/TNPT/BV-05-C PTS gives the label uuid in the message, therefore we need to add this address first before sending a message to it. Corresponding PR to zephyrproject-rtos: zephyrproject-rtos/zephyr#59486 Signed-off-by: Pavel Vasilyev <pavel.vasilyev@nordicsemi.no>

…ual addresses Virtual address behavior has been changed in this PR: zephyrproject-rtos/zephyr#57878 Now it is required to register virtual address before using it. Corresponding PR to auto-pts: auto-pts/auto-pts#961 Signed-off-by: Pavel Vasilyev <pavel.vasilyev@nordicsemi.no> (cherry picked from commit 4d56a31) Signed-off-by: Alperen Sener <alperen.sener@nordicsemi.no>

Virtual address behavior has been changed in this PR: zephyrproject-rtos/zephyr#57878 Now it is required to register virtual address before using it. Corresponding PR to auto-pts: auto-pts/auto-pts#961 (cherry picked from commit 4d56a31) Original-Signed-off-by: Pavel Vasilyev <pavel.vasilyev@nordicsemi.no> GitOrigin-RevId: 4d56a31 Change-Id: I8d32b5d0bb9a9fa6983c1a3b5a8bab2529a4c2e8 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/zephyr/+/4716825 Tested-by: Fabio Baltieri <fabiobaltieri@google.com> Tested-by: ChromeOS Prod (Robot) <chromeos-ci-prod@chromeos-bot.iam.gserviceaccount.com> Reviewed-by: Fabio Baltieri <fabiobaltieri@google.com> Commit-Queue: Fabio Baltieri <fabiobaltieri@google.com>

Virtual address behavior has been changed in this PR: zephyrproject-rtos/zephyr#57878 Now it is required to register virtual address before using it. Corresponding PR to auto-pts: auto-pts/auto-pts#961 Signed-off-by: Pavel Vasilyev <pavel.vasilyev@nordicsemi.no>

Virtual address behavior has been changed in this PR: zephyrproject-rtos#57878 Now it is required to register virtual address before using it. Corresponding PR to auto-pts: auto-pts/auto-pts#961 Signed-off-by: Pavel Vasilyev <pavel.vasilyev@nordicsemi.no>

Virtual address behavior has been changed in this PR: zephyrproject-rtos/zephyr#57878 Now it is required to register virtual address before using it. Corresponding PR to auto-pts: auto-pts/auto-pts#961 Signed-off-by: Pavel Vasilyev <pavel.vasilyev@nordicsemi.no>

Virtual address behavior has been changed in this PR: zephyrproject-rtos#57878 Now it is required to register virtual address before using it. Corresponding PR to auto-pts: auto-pts/auto-pts#961 Signed-off-by: Pavel Vasilyev <pavel.vasilyev@nordicsemi.no>

PavelVPV requested review from jhedberg, Vudentz, wopu-ot, LingaoM, alwa-nordic and sjanc as code owners May 15, 2023 07:40

zephyrbot added area: Bluetooth Mesh area: Bluetooth labels May 15, 2023

zephyrbot requested review from alxelax and Andrewpini May 15, 2023 07:40

zephyrbot assigned PavelVPV May 15, 2023

PavelVPV force-pushed the va_collision_support branch 4 times, most recently from 41c6331 to ae4079f Compare May 15, 2023 10:52

Andrewpini reviewed May 23, 2023

View reviewed changes

alxelax requested changes May 23, 2023

View reviewed changes

PavelVPV force-pushed the va_collision_support branch from ae4079f to 014816b Compare May 31, 2023 08:56

PavelVPV requested review from alxelax and Andrewpini May 31, 2023 08:57

PavelVPV force-pushed the va_collision_support branch 2 times, most recently from 15df358 to 880b321 Compare June 1, 2023 07:28

PavelVPV added 4 commits June 1, 2023 09:45

tests: bsim: bluetooth: mesh: Test tran to virtual addr with collision

f2aa422

Test that transport layer correctly encrypts and decrypts messages to virtual addresses with collision. Signed-off-by: Pavel Vasilyev <pavel.vasilyev@nordicsemi.no>

PavelVPV force-pushed the va_collision_support branch from 880b321 to 4aa8db6 Compare June 1, 2023 07:46

alxelax reviewed Jun 1, 2023

View reviewed changes

PavelVPV force-pushed the va_collision_support branch from e44b721 to 94b1c1e Compare June 1, 2023 13:19

PavelVPV force-pushed the va_collision_support branch from 94b1c1e to 8515e36 Compare June 1, 2023 13:20

PavelVPV requested a review from alxelax June 1, 2023 13:25

alxelax approved these changes Jun 1, 2023

View reviewed changes

Andrewpini approved these changes Jun 2, 2023

View reviewed changes

nashif merged commit 47e3c53 into zephyrproject-rtos:main Jun 17, 2023
26 checks passed

PavelVPV mentioned this pull request Jun 21, 2023

mesh: Add virtual address before using it auto-pts/auto-pts#961

Merged

PavelVPV mentioned this pull request Jun 21, 2023

tests: bluetooth: tester: Add commands to add and delete virtual addresses #59486

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Bluetooth: Mesh: Add full virtual addresses support #57878

Bluetooth: Mesh: Add full virtual addresses support #57878

PavelVPV commented May 15, 2023

Andrewpini left a comment

Andrewpini May 23, 2023

Andrewpini May 23, 2023

Andrewpini May 23, 2023

Andrewpini May 23, 2023

Andrewpini May 23, 2023

alxelax left a comment

	* @note If @c dst is a Virtual Address, Label UUID shall initialized separately.
	* @note If @c dst is a Virtual Address, Label UUID shall be initialized separately.

	* @return Pointer to an valid entry, NULL otherwise.
	* @return Pointer to a valid entry, NULL otherwise.

	* @param uuid pointer to momry with Label UUID to be found.
	* @param uuid pointer to memory with Label UUID to be found.

	* @return true if there is collision, false otherwise.
	* @return True if there is collision, false otherwise.

	* When @c addr is @ref BT_MESH_ADDR_UNASSIGNED, this function iterates all available addresses
	* When @c addr is @ref BT_MESH_ADDR_UNASSIGNED, this function iterates over all available addresses

Bluetooth: Mesh: Add full virtual addresses support #57878

Bluetooth: Mesh: Add full virtual addresses support #57878

Conversation

PavelVPV commented May 15, 2023

Andrewpini left a comment

Choose a reason for hiding this comment

Andrewpini May 23, 2023

Choose a reason for hiding this comment

Andrewpini May 23, 2023

Choose a reason for hiding this comment

Andrewpini May 23, 2023

Choose a reason for hiding this comment

Andrewpini May 23, 2023

Choose a reason for hiding this comment

Andrewpini May 23, 2023

Choose a reason for hiding this comment

alxelax left a comment

Choose a reason for hiding this comment