[nrf fromtree] Bluetooth: host: Fix RPA timeout expiration

Fix RPA timeout expiration when BT_EXT_ADV has been enabled.

Always invalidate the device RPA on RPA timeout.
This RPA is used by the scan roles, and the advertiser that was started
using the bt_le_adv_start API.

Call the RPA expire callback only on advertising sets that are enabled
and not being limited by a timeout and not using the identity address.
On RPA timeout always invalidate the RPA of advertising sets that are
disabled.

Fixes: #51208
Fixes: #51228
Fixes: #51247

Signed-off-by: Joakim Andersson <[email protected]>
(cherry picked from commit d63ae60)

Author: joerchan

subsys/bluetooth/host/hci_core.h

@@ -87,6 +87,8 @@ enum {
 	 * of the RPA timeout.
 	 */
 	BT_ADV_RPA_VALID,
+	/* The private random address of the advertiser is being updated. */
+	BT_ADV_RPA_UPDATE,
 	/* The advertiser set is limited by a timeout, or number of advertising
 	 * events, or both.
 	 */

subsys/bluetooth/host/id.c

@@ -184,9 +184,10 @@ int bt_id_set_adv_random_addr(struct bt_le_ext_adv *adv,
 	return 0;
 }
 
-static void adv_rpa_invalidate(struct bt_le_ext_adv *adv, void *data)
+static void adv_disabled_rpa_invalidate(struct bt_le_ext_adv *adv, void *data)
 {
-	if (!atomic_test_bit(adv->flags, BT_ADV_LIMITED)) {
+	/* Don't invalidate RPA of enabled advertising set. */
+	if (!atomic_test_bit(adv->flags, BT_ADV_ENABLED)) {
 		atomic_clear_bit(adv->flags, BT_ADV_RPA_VALID);
 	}
 }
@@ -199,8 +200,13 @@ static void le_rpa_invalidate(void)
 		atomic_clear_bit(bt_dev.flags, BT_DEV_RPA_VALID);
 	}
 
+	/* Invalidate RPA of advertising sets that are disabled.
+	 *
+	 * Enabled advertising set have to call rpa_expired callback first to
+	 * determine if the RPA of the advertising set should be rotated.
+	 */
 	if (IS_ENABLED(CONFIG_BT_BROADCASTER)) {
-		bt_le_ext_adv_foreach(adv_rpa_invalidate, NULL);
+		bt_le_ext_adv_foreach(adv_disabled_rpa_invalidate, NULL);
 	}
 }
 
@@ -387,41 +393,35 @@ int bt_id_set_adv_private_addr(struct bt_le_ext_adv *adv)
 #if defined(CONFIG_BT_EXT_ADV) && defined(CONFIG_BT_PRIVACY)
 static void adv_disable_rpa(struct bt_le_ext_adv *adv, void *data)
 {
-	uint8_t adv_index = bt_le_ext_adv_get_index(adv);
-	bool *adv_disabled = data;
 	bool rpa_invalid = true;
 
-	adv_disabled[adv_index] = false;
-
-	/* Invalidate RPA only for non-limited advertising sets. */
-	if (atomic_test_bit(adv->flags, BT_ADV_LIMITED)) {
-		return;
-	}
-
 	/* Disable advertising sets to prepare them for RPA update. */
 	if (atomic_test_bit(adv->flags, BT_ADV_ENABLED) &&
+	    !atomic_test_bit(adv->flags, BT_ADV_LIMITED) &&
 	    !atomic_test_bit(adv->flags, BT_ADV_USE_IDENTITY)) {
 		bt_le_adv_set_enable_ext(adv, false, NULL);
 
-		adv_disabled[adv_index] = true;
-	}
+		atomic_set_bit(adv->flags, BT_ADV_RPA_UPDATE);
 
-	/* Notify the user about the RPA timeout and set the RPA validity. */
-	if (adv->cb && adv->cb->rpa_expired) {
-		rpa_invalid = adv->cb->rpa_expired(adv);
-	}
+		/* Notify the user about the RPA timeout and set the RPA validity. */
+		if (adv->cb && adv->cb->rpa_expired) {
+			rpa_invalid = adv->cb->rpa_expired(adv);
+		}
 
-	if (rpa_invalid) {
-		atomic_clear_bit(adv->flags, BT_ADV_RPA_VALID);
+		if (rpa_invalid) {
+			atomic_clear_bit(adv->flags, BT_ADV_RPA_VALID);
+		} else {
+			/* Submit the timeout in case no advertising set updates their RPA
+			 * in the current period. This makes sure that the RPA timer is running.
+			 */
+			le_rpa_timeout_submit();
+		}
 	}
 }
 
 static void adv_enable_rpa(struct bt_le_ext_adv *adv, void *data)
 {
-	uint8_t adv_index = bt_le_ext_adv_get_index(adv);
-	bool *adv_disabled = data;
-
-	if (adv_disabled[adv_index]) {
+	if (atomic_test_and_clear_bit(adv->flags, BT_ADV_RPA_UPDATE)) {
 		int err;
 
 		err = bt_id_set_adv_private_addr(adv);
@@ -438,16 +438,9 @@ static void adv_enable_rpa(struct bt_le_ext_adv *adv, void *data)
 static void adv_update_rpa_foreach(void)
 {
 #if defined(CONFIG_BT_EXT_ADV) && defined(CONFIG_BT_PRIVACY)
-	bool adv_disabled[CONFIG_BT_EXT_ADV_MAX_ADV_SET];
-
-	bt_le_ext_adv_foreach(adv_disable_rpa, adv_disabled);
+	bt_le_ext_adv_foreach(adv_disable_rpa, NULL);
 
-	/* Submit the timeout in case all sets use the same
-	 * RPA for the next rotation period.
-	 */
-	le_rpa_timeout_submit();
-
-	bt_le_ext_adv_foreach(adv_enable_rpa, adv_disabled);
+	bt_le_ext_adv_foreach(adv_enable_rpa, NULL);
 #endif
 }
 
@@ -462,8 +455,6 @@ static void le_update_private_addr(void)
 	    IS_ENABLED(CONFIG_BT_EXT_ADV) &&
 	    BT_DEV_FEAT_LE_EXT_ADV(bt_dev.le.features)) {
 		adv_update_rpa_foreach();
-	} else {
-		le_rpa_invalidate();
 	}
 
 #if defined(CONFIG_BT_OBSERVER)
@@ -528,6 +519,7 @@ static void le_force_rpa_timeout(void)
 
 	k_work_cancel_delayable_sync(&bt_dev.rpa_update, &sync);
 #endif
+	le_rpa_invalidate();
 	le_update_private_addr();
 }
 
@@ -549,6 +541,8 @@ static void rpa_timeout(struct k_work *work)
 		}
 	}
 
+	le_rpa_invalidate();
+
 	if (IS_ENABLED(CONFIG_BT_BROADCASTER)) {
 		bt_le_ext_adv_foreach(adv_is_private_enabled, &adv_enabled);
 	}
@@ -558,7 +552,6 @@ static void rpa_timeout(struct k_work *work)
 	      atomic_test_bit(bt_dev.flags, BT_DEV_INITIATING) ||
 	      (atomic_test_bit(bt_dev.flags, BT_DEV_SCANNING) &&
 	       atomic_test_bit(bt_dev.flags, BT_DEV_ACTIVE_SCAN)))) {
-		le_rpa_invalidate();
 		return;
 	}