tests: bsim: bluetooth: host: enable conn_stress

Adding some minor modifications in order to be able to run
host conn_stress test on CI.

Signed-off-by: Artur Dobrynin <[email protected]>

Author: ardo-nordic

tests/bsim/bluetooth/host/misc/conn_stress/central/CMakeLists.txt

@@ -5,6 +5,9 @@ cmake_minimum_required(VERSION 3.20.0)
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 project(conn_stress_central)
 
+add_subdirectory(${ZEPHYR_BASE}/tests/bsim/babblekit babblekit)
+target_link_libraries(app PRIVATE babblekit)
+
 target_sources(app PRIVATE
   src/main.c
 )

tests/bsim/bluetooth/host/misc/conn_stress/central/prj.conf

@@ -23,9 +23,8 @@ CONFIG_ASSERT_VERBOSE=y
 CONFIG_ASSERT_ON_ERRORS=y
 
 # TODO: use default 3
-# we get an ATT timeout if 3
-# we get an SMP timeout if 10
-# CONFIG_BT_L2CAP_TX_BUF_COUNT=10
+# we get an ATT timeout if 3 or SMP timeout if 10
+CONFIG_BT_L2CAP_TX_BUF_COUNT=10
 
 # deadlock on central with the default.
 # the problem is that `tx_free` is called from both syswq and btwq in that case.

tests/bsim/bluetooth/host/misc/conn_stress/central/src/main.c

@@ -22,14 +22,16 @@
 #include <zephyr/types.h>
 
 #include <zephyr/logging/log.h>
-LOG_MODULE_REGISTER(central, LOG_LEVEL_INF);
+LOG_MODULE_REGISTER(central, LOG_LEVEL_DBG);
 
 #include "bstests.h"
 #include "bs_types.h"
 #include "bs_tracing.h"
 #include "bstests.h"
 #include "bs_pc_backchannel.h"
 
+#include "babblekit/testcase.h"
+
 #define DEFAULT_CONN_INTERVAL	   20
 #define PERIPHERAL_DEVICE_NAME	   "Zephyr Peripheral"
 #define PERIPHERAL_DEVICE_NAME_LEN (sizeof(PERIPHERAL_DEVICE_NAME) - 1)
@@ -50,6 +52,8 @@ BUILD_ASSERT(NOTIFICATION_DATA_LEN <= CHARACTERISTIC_DATA_MAX_LEN);
 #define PERIPHERAL_SERVICE_UUID	       BT_UUID_DECLARE_128(PERIPHERAL_SERVICE_UUID_VAL)
 #define PERIPHERAL_CHARACTERISTIC_UUID BT_UUID_DECLARE_128(PERIPHERAL_CHARACTERISTIC_UUID_VAL)
 
+#define EXPECTED_CONN_CYCLES	1
+
 static struct bt_uuid_128 vnd_uuid =
 	BT_UUID_INIT_128(BT_UUID_128_ENCODE(0x12345678, 0x1234, 0x5678, 0x1234, 0x56789abcdea0));
 
@@ -89,6 +93,7 @@ struct conn_info {
 	struct bt_gatt_discover_params discover_params;
 	struct bt_gatt_subscribe_params subscribe_params;
 	bt_addr_le_t addr;
+	atomic_t conn_count;
 };
 
 static struct conn_info conn_infos[CONFIG_BT_MAX_CONN] = {0};
@@ -232,8 +237,6 @@ static uint8_t discover_func(struct bt_conn *conn, const struct bt_gatt_attr *at
 	conn_info_ref = get_connected_conn_info_ref(conn);
 	__ASSERT_NO_MSG(conn_info_ref);
 
-	atomic_clear_bit(conn_info_ref->flags, CONN_INFO_DISCOVER_PAUSED);
-
 	if (conn_info_ref->discover_params.type == BT_GATT_DISCOVER_PRIMARY) {
 		LOG_DBG("Primary Service Found");
 		memcpy(&conn_info_ref->uuid,
@@ -295,7 +298,7 @@ static uint8_t discover_func(struct bt_conn *conn, const struct bt_gatt_attr *at
 	/* if we're out of buffers or metadata contexts, continue discovery
 	 * later.
 	 */
-	LOG_INF("out of memory/not connected, continuing sub later");
+	LOG_INF("out of memory/not connected, continuing sub later (err %d)", err);
 	atomic_set_bit(conn_info_ref->flags, CONN_INFO_DISCOVER_PAUSED);
 
 	return BT_GATT_ITER_STOP;
@@ -328,6 +331,17 @@ static bool check_if_peer_connected(const bt_addr_le_t *addr)
 	return false;
 }
 
+static bool check_if_completed(void)
+{
+	for (size_t i = 0; i < ARRAY_SIZE(conn_infos); i++) {
+		if (atomic_get(&conn_infos[i].conn_count) < EXPECTED_CONN_CYCLES) {
+			return false;
+		}
+	}
+
+	return true;
+}
+
 static bool parse_ad(struct bt_data *data, void *user_data)
 {
 	bt_addr_le_t *addr = user_data;
@@ -451,6 +465,7 @@ static void disconnected(struct bt_conn *conn, uint8_t reason)
 	bt_conn_unref(conn);
 	clear_info(conn_info_ref);
 	atomic_dec(&conn_count);
+	atomic_inc(&conn_info_ref->conn_count);
 }
 
 #if defined(CONFIG_BT_SMP)
@@ -602,6 +617,8 @@ static void subscribe_to_service(struct bt_conn *conn, void *data)
 		if (err != -ENOMEM && err != -ENOTCONN) {
 			__ASSERT(!err, "Subscribe failed (err %d)", err);
 		}
+
+		atomic_clear_bit(conn_info_ref->flags, CONN_INFO_DISCOVER_PAUSED);
 	}
 }
 
@@ -669,7 +686,7 @@ void test_central_main(void)
 
 	start_scan();
 
-	while (true) {
+	while (!check_if_completed()) {
 		/* reconnect peripherals when they drop out */
 		if (atomic_get(&conn_count) < CONFIG_BT_MAX_CONN &&
 		    !atomic_test_bit(status_flags, DEVICE_IS_SCANNING) &&
@@ -698,13 +715,16 @@ void test_central_main(void)
 		}
 		k_msleep(10);
 	}
+
+	TEST_PASS("Central tests passed");
 }
 
 void test_init(void)
 {
 	extern enum bst_result_t bst_result;
 
 	LOG_INF("Initializing Test");
+	bst_ticker_set_next_tick_absolute(600*1e6);
 	/* The peripherals determines whether the test passed. */
 	bst_result = Passed;
 }
@@ -739,12 +759,23 @@ static void test_args(int argc, char **argv)
 	bs_trace_raw(0, "Notification data size : %d\n", notification_size);
 }
 
+static void test_tick(bs_time_t HW_device_time)
+{
+	if (bst_result != Passed) {
+		TEST_FAIL("Test timeout (not passed after %lu seconds)",
+			  (unsigned long)(HW_device_time / USEC_PER_SEC));
+	}
+
+	bs_trace_silent_exit(0);
+}
+
 static const struct bst_test_instance test_def[] = {
 	{
 		.test_id = "central",
 		.test_descr = "Central Connection Stress",
 		.test_args_f = test_args,
 		.test_pre_init_f = test_init,
+		.test_tick_f = test_tick,
 		.test_main_f = test_central_main
 	},
 	BSTEST_END_MARKER

tests/bsim/bluetooth/host/misc/conn_stress/peripheral/CMakeLists.txt

@@ -5,6 +5,9 @@ cmake_minimum_required(VERSION 3.20.0)
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 project(conn_stress_peripheral)
 
+add_subdirectory(${ZEPHYR_BASE}/tests/bsim/babblekit babblekit)
+target_link_libraries(app PRIVATE babblekit)
+
 target_sources(app PRIVATE
   src/main.c
 )

tests/bsim/bluetooth/host/misc/conn_stress/peripheral/src/main.c

@@ -24,7 +24,7 @@
 #include <zephyr/types.h>
 
 #include <zephyr/logging/log.h>
-LOG_MODULE_REGISTER(peripheral, LOG_LEVEL_INF);
+LOG_MODULE_REGISTER(peripheral, LOG_LEVEL_DBG);
 
 #include "bstests.h"
 #include "bs_types.h"
@@ -33,7 +33,8 @@ LOG_MODULE_REGISTER(peripheral, LOG_LEVEL_INF);
 #include "bs_pc_backchannel.h"
 #include "argparse.h"
 
-#define TEST_ROUNDS 10
+#include "babblekit/testcase.h"
+
 #define MIN_NOTIFICATIONS 50
 
 #define NOTIFICATION_DATA_PREFIX     "Counter:"
@@ -52,6 +53,8 @@ BUILD_ASSERT(NOTIFICATION_DATA_LEN <= CHARACTERISTIC_DATA_MAX_LEN);
 #define CENTRAL_SERVICE_UUID	    BT_UUID_DECLARE_128(CENTRAL_SERVICE_UUID_VAL)
 #define CENTRAL_CHARACTERISTIC_UUID BT_UUID_DECLARE_128(CENTRAL_CHARACTERISTIC_UUID_VAL)
 
+#define EXPECTED_CONN_CYCLES	1
+
 /* Custom Service Variables */
 static struct bt_uuid_128 vnd_uuid =
 	BT_UUID_INIT_128(BT_UUID_128_ENCODE(0x12345678, 0x1234, 0x5678, 0x1234, 0x56789abcdef0));
@@ -164,7 +167,7 @@ static void disconnected(struct bt_conn *conn, uint8_t reason)
 
 	memset(&conn_info, 0x00, sizeof(struct active_conn_info));
 
-	if (rounds >= TEST_ROUNDS) {
+	if (rounds >= EXPECTED_CONN_CYCLES) {
 		LOG_INF("Number of conn/disconn cycles reached, stopping advertiser...");
 		bt_le_adv_stop();
 
@@ -400,18 +403,34 @@ void test_peripheral_main(void)
 	sprintf(name, "per-%d", get_device_nbr());
 	bt_set_name(name);
 
-	err = bt_le_adv_start(BT_LE_ADV_CONN_FAST_1, NULL, 0, NULL, 0);
+	struct bt_le_adv_param adv_param = {
+		.id = BT_ID_DEFAULT,
+		.sid = 0,
+		.secondary_max_skip = 0,
+		.options = BT_LE_ADV_OPT_CONN | BT_LE_ADV_OPT_SCANNABLE,
+		.interval_min = 0x0020, /* 20 ms */
+		.interval_max = 0x0020, /* 20 ms */
+		.peer = NULL,
+	};
+
+	struct bt_data sd[1];
+
+	sd[0].type = BT_DATA_NAME_COMPLETE;
+	sd[0].data_len = sizeof(CONFIG_BT_DEVICE_NAME) - 1;
+	sd[0].data = CONFIG_BT_DEVICE_NAME;
+
+	err = bt_le_adv_start(&adv_param, sd, 1, sd, 1);
 	if (err) {
 		LOG_ERR("Advertising failed to start (err %d)", err);
 		__ASSERT_NO_MSG(err);
 	}
-	LOG_INF("Started advertising");
+	LOG_DBG("Started advertising");
 
 	bt_gatt_cb_register(&gatt_callbacks);
 
 	vnd_attr = bt_gatt_find_by_uuid(vnd_svc.attrs, vnd_svc.attr_count, &vnd_enc_uuid.uuid);
 
-	while (true) {
+	for (size_t i = 0; i < EXPECTED_CONN_CYCLES; i++) {
 		LOG_DBG("Waiting for connection from central..");
 		while (!atomic_test_bit(conn_info.flags, CONN_INFO_CONNECTED)) {
 			k_sleep(K_MSEC(10));
@@ -425,11 +444,12 @@ void test_peripheral_main(void)
 			k_sleep(K_MSEC(10));
 		}
 
+		LOG_DBG("Waiting until MTU exchange..");
 		while (!atomic_test_bit(conn_info.flags, CONN_INFO_MTU_EXCHANGED)) {
 			k_sleep(K_MSEC(10));
 		}
 
-		LOG_INF("Begin sending notifications to central..");
+		LOG_DBG("Begin sending notifications to central..");
 		while (central_subscription &&
 		       atomic_test_bit(conn_info.flags, CONN_INFO_CONNECTED)) {
 
@@ -448,18 +468,21 @@ void test_peripheral_main(void)
 
 			if (atomic_get(&conn_info.tx_notify_counter) > MIN_NOTIFICATIONS &&
 			    atomic_get(&conn_info.notify_counter) > MIN_NOTIFICATIONS) {
-				LOG_INF("Disconnecting..");
+				LOG_DBG("Disconnecting..");
 				disconnect();
 			}
 		}
 	}
+
+	TEST_PASS("Peripheral tests passed");
 }
 
 void test_init(void)
 {
 	extern enum bst_result_t bst_result;
 
 	LOG_INF("Initializing Test");
+	bst_ticker_set_next_tick_absolute(600*1e6);
 	bst_result = Failed;
 }
 
@@ -481,12 +504,23 @@ static void test_args(int argc, char **argv)
 	bs_trace_raw(0, "Notification data size : %d\n", notification_size);
 }
 
+static void test_tick(bs_time_t HW_device_time)
+{
+	if (bst_result != Passed) {
+		TEST_FAIL("Test timeout (not passed after %lu seconds)",
+			  (unsigned long)(HW_device_time / USEC_PER_SEC));
+	}
+
+	bs_trace_silent_exit(0);
+}
+
 static const struct bst_test_instance test_def[] = {
 	{
 		.test_id = "peripheral",
 		.test_descr = "Peripheral Connection Stress",
 		.test_args_f = test_args,
 		.test_pre_init_f = test_init,
+		.test_tick_f = test_tick,
 		.test_main_f = test_peripheral_main
 	},
 	BSTEST_END_MARKER