tests: Bluetooth: Refactor host/privacy/peripheral test

The test had a number of problems, rewrote to fix those and not use
backchannels.

Fixes #56733

Signed-off-by: Jonathan Rico <[email protected]>

Author: jori-nordic

tests/bsim/bluetooth/host/privacy/peripheral/src/bs_bt_utils.c

@@ -5,13 +5,10 @@
  */
 
 #include "bs_bt_utils.h"
-#include "bs_pc_backchannel.h"
 #include "argparse.h"
 
 #define BS_SECONDS(dur_sec)    ((bs_time_t)dur_sec * 1000000)
-#define TEST_TIMEOUT_SIMULATED BS_SECONDS(120)
-#define CHANNEL_ID	       0
-#define MSG_SIZE	       1
+#define TEST_TIMEOUT_SIMULATED BS_SECONDS(70)
 
 void test_tick(bs_time_t HW_device_time)
 {
@@ -29,44 +26,6 @@ void test_init(void)
 	bst_result = In_progress;
 }
 
-void backchannel_init(uint peer)
-{
-	uint device_number = get_device_nbr();
-	uint device_numbers[] = {peer};
-	uint channel_numbers[] = {CHANNEL_ID};
-	uint *ch;
-
-	ch = bs_open_back_channel(device_number, device_numbers, channel_numbers,
-				  ARRAY_SIZE(channel_numbers));
-	if (!ch) {
-		FAIL("Unable to open backchannel\n");
-	}
-}
-
-void backchannel_sync_send(void)
-{
-	uint8_t sync_msg[MSG_SIZE] = {get_device_nbr()};
-
-	bs_bc_send_msg(CHANNEL_ID, sync_msg, ARRAY_SIZE(sync_msg));
-}
-
-void backchannel_sync_wait(void)
-{
-	uint8_t sync_msg[MSG_SIZE];
-
-	while (true) {
-		if (bs_bc_is_msg_received(CHANNEL_ID) > 0) {
-			bs_bc_receive_msg(CHANNEL_ID, sync_msg, ARRAY_SIZE(sync_msg));
-			if (sync_msg[0] != get_device_nbr()) {
-				/* Received a message from another device, exit */
-				break;
-			}
-		}
-
-		k_sleep(K_MSEC(1));
-	}
-}
-
 void print_address(bt_addr_le_t *addr)
 {
 	char array[BT_ADDR_LE_STR_LEN];

tests/bsim/bluetooth/host/privacy/peripheral/src/bs_bt_utils.h

@@ -48,8 +48,5 @@ extern enum bst_result_t bst_result;
 
 void test_tick(bs_time_t HW_device_time);
 void test_init(void);
-void backchannel_init(uint peer);
-void backchannel_sync_send(void);
-void backchannel_sync_wait(void);
 
 void print_address(bt_addr_le_t *addr);

tests/bsim/bluetooth/host/privacy/peripheral/src/dut.c

@@ -16,8 +16,6 @@
 
 bool cb_rpa_expired(struct bt_le_ext_adv *adv)
 {
-	backchannel_sync_send();
-
 	/* Return true to rotate the current RPA */
 	return true;
 }
@@ -53,12 +51,8 @@ void start_advertising(void)
 
 void dut_procedure(void)
 {
-	/* Setup synchronization channel */
-	backchannel_init(TESTER_CENTRAL_ID);
-
 	start_advertising();
 
 	/* Nothing to do */
-
 	PASS("PASS\n");
 }

tests/bsim/bluetooth/host/privacy/peripheral/src/tester.c

@@ -10,93 +10,84 @@
 #include <stdint.h>
 #include <zephyr/bluetooth/bluetooth.h>
 
-static volatile int64_t old_time, new_time;
+#define EXPECTED_NUM_ROTATIONS 5
+
 static bt_addr_le_t old_addr;
-static bt_addr_le_t *new_addr;
+static int64_t old_time;
+static int rpa_rotations;
 
-static void cb_device_found(const bt_addr_le_t *addr, int8_t rssi, uint8_t type,
-			    struct net_buf_simple *ad)
+static void test_address(bt_addr_le_t *addr)
 {
-	static bool init;
+	int64_t diff_ms, rpa_timeout_ms;
 
-	if (!init) {
-		old_addr = *addr;
+	/* Only save the address + time if this is the first scan */
+	if (bt_addr_le_eq(&old_addr, BT_ADDR_LE_ANY)) {
+		bt_addr_le_copy(&old_addr, addr);
 		old_time = k_uptime_get();
-		init = true;
+		return;
+	}
+
+	/* Compare old and new address */
+	if (bt_addr_le_eq(&old_addr, addr)) {
+		return;
+	}
+
+	printk("Old ");
+	print_address(&old_addr);
+	printk("New ");
+	print_address(addr);
+
+	rpa_rotations++;
+
+	/* Ensure the RPA rotation occurs within +-10% of CONFIG_BT_RPA_TIMEOUT */
+	diff_ms = k_uptime_get() - old_time;
+	rpa_timeout_ms = CONFIG_BT_RPA_TIMEOUT * MSEC_PER_SEC;
+
+	if (abs(diff_ms - rpa_timeout_ms) > (rpa_timeout_ms / 10)) {
+		FAIL("RPA rotation did not occur within +-10% of CONFIG_BT_RPA_TIMEOUT\n");
 	}
 
-	new_addr = (bt_addr_le_t *)addr;
-	new_time = k_uptime_get();
+	bt_addr_le_copy(&old_addr, addr);
+	old_time = k_uptime_get();
+
+	if (rpa_rotations > EXPECTED_NUM_ROTATIONS) {
+		PASS("PASS\n");
+	}
+}
+
+static void cb_device_found(const bt_addr_le_t *addr, int8_t rssi, uint8_t type,
+			    struct net_buf_simple *ad)
+{
+	test_address((bt_addr_le_t *)addr);
 }
 
 void start_scanning(void)
 {
-	int err;
 	struct bt_le_scan_param params;
 
-	/* Enable bluetooth */
-	err = bt_enable(NULL);
-	if (err) {
-		FAIL("Failed to enable bluetooth (err %d\n)", err);
-	}
-
 	/* Start passive scanning */
 	params.type = BT_LE_SCAN_TYPE_PASSIVE;
 	params.options = BT_LE_SCAN_OPT_FILTER_DUPLICATE;
 	params.interval = BT_GAP_SCAN_FAST_INTERVAL;
 	params.window = BT_GAP_SCAN_FAST_WINDOW;
+	params.timeout = 0;
 
-	err = bt_le_scan_start(&params, cb_device_found);
+	int err = bt_le_scan_start(&params, cb_device_found);
 	if (err) {
 		FAIL("Failed to start scanning");
 	}
 }
 
 void tester_procedure(void)
 {
-	int err;
+	/* Enable bluetooth */
+	int err = bt_enable(NULL);
 
-	/* Setup synchronization channel */
-	backchannel_init(DUT_PERIPHERAL_ID);
+	if (err) {
+		FAIL("Failed to enable bluetooth (err %d\n)", err);
+	}
 
 	start_scanning();
 
-	/* Wait for the first address rotation */
-	backchannel_sync_wait();
-
-	for (uint16_t i = 0; i < 5; i++) {
-		int64_t diff, time_diff_ms, rpa_timeout_ms;
-
-		backchannel_sync_wait();
-
-		/* Compare old and new address */
-		err = bt_addr_le_cmp(&old_addr, new_addr);
-		if (err == 0) {
-			FAIL("RPA did not rotate", err);
-		}
-
-		/* Ensure the RPA rotation occurs within +-10% of CONFIG_BT_RPA_TIMEOUT */
-		time_diff_ms = new_time - old_time;
-		rpa_timeout_ms = CONFIG_BT_RPA_TIMEOUT * MSEC_PER_SEC;
-
-		if (time_diff_ms > rpa_timeout_ms) {
-			diff = time_diff_ms - rpa_timeout_ms;
-		} else {
-			diff = rpa_timeout_ms - time_diff_ms;
-		}
-
-		if (diff > (rpa_timeout_ms / 10)) {
-			FAIL("RPA rotation did not occur within +-10%% of CONFIG_BT_RPA_TIMEOUT");
-		}
-
-		printk("Old ");
-		print_address(&old_addr);
-		printk("New ");
-		print_address(new_addr);
-
-		old_addr = *new_addr;
-		old_time = new_time;
-	}
-
-	PASS("PASS\n");
+	/* The rest of the test is driven by the callback */
 }

tests/bsim/bluetooth/host/privacy/peripheral/test_scripts/_compile.sh

@@ -8,17 +8,5 @@ bash_source_dir="$(realpath "$(dirname "${BASH_SOURCE[0]}")")"
 # Read variable definitions output by _env.sh
 source "${bash_source_dir}/_env.sh"
 
-
-: "${BSIM_OUT_PATH:?BSIM_OUT_PATH must be defined}"
-: "${BSIM_COMPONENTS_PATH:?BSIM_COMPONENTS_PATH must be defined}"
-: "${ZEPHYR_BASE:?ZEPHYR_BASE must be defined}"
-
-
-WORK_DIR="${WORK_DIR:-${ZEPHYR_BASE}/bsim_out}"
-BOARD="${BOARD:-nrf52_bsim}"
-BOARD_ROOT="${BOARD_ROOT:-${ZEPHYR_BASE}}"
-INCR_BUILD=1
-mkdir -p ${WORK_DIR}
-
-west build -b nrf52_bsim
-cp build/zephyr/zephyr.exe $central_exe
+west build -b nrf52_bsim && \
+    cp build/zephyr/zephyr.exe $central_exe

tests/bsim/bluetooth/host/privacy/peripheral/test_scripts/run_test.sh

@@ -19,6 +19,6 @@ Execute "$peripheral_exe" \
     -v=${verbosity_level} -s=${simulation_id} -d=1 -testid=peripheral -RealEncryption=1
 
 Execute ./bs_2G4_phy_v1 -v=${verbosity_level} -s=${simulation_id} \
-    -D=2 -sim_length=120e6 $@
+    -D=2 -sim_length=70e6 $@
 
 wait_for_background_jobs