Bluetooth: Mesh: Convert beacon timer to delayable work

Moves the beacon_enabled check in the beacon work handler to check the
beacon flag before sending anything, in case a cancel call fails.

Split out from zephyrproject-rtos#33782.

Signed-off-by: Trond Einar Snekvik <[email protected]>

Author: trond-snekvik

subsys/bluetooth/mesh/beacon.c

@@ -38,7 +38,7 @@
 /* 1 transmission, 20ms interval */
 #define PROV_XMIT                  BT_MESH_TRANSMIT(0, 20)
 
-static struct k_delayed_work beacon_timer;
+static struct k_work_delayable beacon_timer;
 
 static int cache_check(struct bt_mesh_subnet *sub, void *beacon_data)
 {
@@ -232,32 +232,30 @@ static void update_beacon_observation(void)
 
 static void beacon_send(struct k_work *work)
 {
-	/* Don't send anything if we have an active provisioning link */
-	if (IS_ENABLED(CONFIG_BT_MESH_PB_ADV) && bt_mesh_prov_active()) {
-		k_delayed_work_submit(&beacon_timer, K_SECONDS(CONFIG_BT_MESH_UNPROV_BEACON_INT));
-		return;
-	}
-
 	BT_DBG("");
 
 	if (bt_mesh_is_provisioned()) {
+		if (!bt_mesh_beacon_enabled() &&
+		    !atomic_test_bit(bt_mesh.flags, BT_MESH_IVU_INITIATOR)) {
+			return;
+		}
+
 		update_beacon_observation();
 		(void)bt_mesh_subnet_find(secure_beacon_send, NULL);
 
-		/* Only resubmit if beaconing is still enabled */
-		if (bt_mesh_beacon_enabled() ||
-		    atomic_test_bit(bt_mesh.flags, BT_MESH_IVU_INITIATOR)) {
-			k_delayed_work_submit(&beacon_timer,
-					      PROVISIONED_INTERVAL);
-		}
-
+		k_work_schedule(&beacon_timer, PROVISIONED_INTERVAL);
 		return;
 	}
 
 	if (IS_ENABLED(CONFIG_BT_MESH_PB_ADV)) {
-		unprovisioned_beacon_send();
-		k_delayed_work_submit(&beacon_timer, K_SECONDS(CONFIG_BT_MESH_UNPROV_BEACON_INT));
+		/* Don't send anything if we have an active provisioning link */
+		if (!bt_mesh_prov_active()) {
+			unprovisioned_beacon_send();
+		}
+
+		k_work_schedule(&beacon_timer, K_SECONDS(CONFIG_BT_MESH_UNPROV_BEACON_INT));
 	}
+
 }
 
 struct beacon_params {
@@ -430,18 +428,23 @@ BT_MESH_SUBNET_CB_DEFINE(subnet_evt);
 
 void bt_mesh_beacon_init(void)
 {
-	k_delayed_work_init(&beacon_timer, beacon_send);
+	k_work_init_delayable(&beacon_timer, beacon_send);
 }
 
 void bt_mesh_beacon_ivu_initiator(bool enable)
 {
 	atomic_set_bit_to(bt_mesh.flags, BT_MESH_IVU_INITIATOR, enable);
 
-	if (enable) {
-		k_delayed_work_submit(&beacon_timer, K_NO_WAIT);
-	} else if (!bt_mesh_beacon_enabled()) {
-		k_delayed_work_cancel(&beacon_timer);
-	}
+	/* Fire the beacon handler straight away if it's not already pending -
+	 * in which case we'll fire according to the ongoing periodic sending.
+	 * If beacons are disabled, the handler will exit early.
+	 *
+	 * An alternative solution would be to check whether beacons are enabled
+	 * here, and cancel if not. As the cancel operation may fail, we would
+	 * still have to implement an early exit mechanism, so we might as well
+	 * just use this every time.
+	 */
+	k_work_schedule(&beacon_timer, K_NO_WAIT);
 }
 
 static void subnet_beacon_enable(struct bt_mesh_subnet *sub)
@@ -454,19 +457,17 @@ static void subnet_beacon_enable(struct bt_mesh_subnet *sub)
 
 void bt_mesh_beacon_enable(void)
 {
-	if (!bt_mesh_is_provisioned()) {
-		k_delayed_work_submit(&beacon_timer, K_NO_WAIT);
-		return;
+	if (bt_mesh_is_provisioned()) {
+		bt_mesh_subnet_foreach(subnet_beacon_enable);
 	}
 
-	bt_mesh_subnet_foreach(subnet_beacon_enable);
-
-	k_delayed_work_submit(&beacon_timer, K_NO_WAIT);
+	k_work_reschedule(&beacon_timer, K_NO_WAIT);
 }
 
 void bt_mesh_beacon_disable(void)
 {
 	if (!atomic_test_bit(bt_mesh.flags, BT_MESH_IVU_INITIATOR)) {
-		k_delayed_work_cancel(&beacon_timer);
+		/* If this fails, we'll do an early exit in the work handler. */
+		(void)k_work_cancel_delayable(&beacon_timer);
 	}
 }