Bluetooth: controller: Add remote proc ctx pool

Add a separate procedure context pool for remote initiated procedures.
Make it configurable in size by BT_CTLR_LLCP_REMOTE_PROC_CTX_BUF_NUM.
Fix all unit tests referring to the amount of free context buffers.

Fixes #41823

Signed-off-by: Thomas Ebert Hansen <[email protected]>

Author: thoh-ot

subsys/bluetooth/controller/Kconfig.ll_sw_split

@@ -533,15 +533,25 @@ config BT_CTLR_LLCP_COMMON_TX_CTRL_BUF_NUM
 	  Configure between 0 and (4 - BT_CTLR_LLCP_PER_CONN_TX_CTRL_BUF_NUM) * BT_CTLR_LLCP_CONN
 
 config BT_CTLR_LLCP_PROC_CTX_BUF_NUM
-	int "Number of control procedure contexts to be available across all connections"
+	int "Number of local control procedure contexts to be available across all connections"
 	default 2 if BT_CTLR_LLCP_CONN = 1
 	default BT_CTLR_LLCP_CONN if BT_CTLR_LLCP_CONN > 1
 	range 2 255
 	help
 	  Set the number control procedure contexts that is to be available.
 	  This defines the size of the pool of control procedure contexts available
-	  for handlign control procedures. This pool is shared across all
-	  connections (local vs remote initiate), with allocation through a queue
+	  for handling local initiated control procedures.
+	  This pool is shared across all connections, with allocation through a queue.
+
+config BT_CTLR_LLCP_REMOTE_PROC_CTX_BUF_NUM
+	int "Number of remote control procedure contexts to be available across all connections"
+	default BT_CTLR_LLCP_CONN
+	range 1 255
+	help
+	  Set the number control procedure contexts that is to be available.
+	  This defines the size of the pool of control procedure contexts available
+	  for handling remote initiated control procedures.
+	  This pool is shared across all connections, with allocation through a queue.
 
 endif #!BT_LL_SW_LLCP_LEGACY
 

subsys/bluetooth/controller/ll_sw/ull_llcp.c

@@ -59,8 +59,13 @@ static uint8_t buffer_mem_tx[TX_CTRL_BUF_SIZE * LLCP_TX_CTRL_BUF_COUNT];
 static struct llcp_mem_pool mem_tx = { .pool = buffer_mem_tx };
 
 /* TODO: Determine 'correct' number of ctx */
-static uint8_t buffer_mem_ctx[PROC_CTX_BUF_SIZE * CONFIG_BT_CTLR_LLCP_PROC_CTX_BUF_NUM];
-static struct llcp_mem_pool mem_ctx = { .pool = buffer_mem_ctx };
+static uint8_t buffer_mem_local_ctx[PROC_CTX_BUF_SIZE * CONFIG_BT_CTLR_LLCP_PROC_CTX_BUF_NUM];
+static struct llcp_mem_pool mem_local_ctx = { .pool = buffer_mem_local_ctx };
+
+/* TODO(thoh-ot): Determine 'correct' number of ctx */
+static uint8_t buffer_mem_remote_ctx[PROC_CTX_BUF_SIZE *
+				     CONFIG_BT_CTLR_LLCP_REMOTE_PROC_CTX_BUF_NUM];
+static struct llcp_mem_pool mem_remote_ctx = { .pool = buffer_mem_remote_ctx };
 
 /*
  * LLCP Resource Management
@@ -282,7 +287,7 @@ struct proc_ctx *llcp_create_local_procedure(enum llcp_proc proc)
 {
 	struct proc_ctx *ctx;
 
-	ctx = create_procedure(proc, &mem_ctx);
+	ctx = create_procedure(proc, &mem_local_ctx);
 	if (!ctx) {
 		return NULL;
 	}
@@ -350,7 +355,7 @@ struct proc_ctx *llcp_create_remote_procedure(enum llcp_proc proc)
 {
 	struct proc_ctx *ctx;
 
-	ctx = create_procedure(proc, &mem_ctx);
+	ctx = create_procedure(proc, &mem_remote_ctx);
 	if (!ctx) {
 		return NULL;
 	}
@@ -423,8 +428,11 @@ struct proc_ctx *llcp_create_remote_procedure(enum llcp_proc proc)
 
 void ull_cp_init(void)
 {
-	mem_init(mem_ctx.pool, PROC_CTX_BUF_SIZE, CONFIG_BT_CTLR_LLCP_PROC_CTX_BUF_NUM,
-		 &mem_ctx.free);
+	mem_init(mem_local_ctx.pool, PROC_CTX_BUF_SIZE, CONFIG_BT_CTLR_LLCP_PROC_CTX_BUF_NUM,
+		 &mem_local_ctx.free);
+	mem_init(mem_remote_ctx.pool, PROC_CTX_BUF_SIZE,
+		 CONFIG_BT_CTLR_LLCP_REMOTE_PROC_CTX_BUF_NUM,
+		 &mem_remote_ctx.free);
 	mem_init(mem_tx.pool, TX_CTRL_BUF_SIZE, LLCP_TX_CTRL_BUF_COUNT, &mem_tx.free);
 
 #if defined(LLCP_TX_CTRL_BUF_QUEUE_ENABLE)
@@ -1025,13 +1033,19 @@ void ull_cp_rx(struct ll_conn *conn, struct node_rx_pdu *rx)
 
 #ifdef ZTEST_UNITTEST
 
-int ctx_buffers_free(void)
+static uint16_t local_ctx_buffers_free(void)
 {
-	int nr_of_free_ctx;
+	return mem_free_count_get(mem_local_ctx.free);
+}
 
-	nr_of_free_ctx = mem_free_count_get(mem_ctx.free);
+static uint16_t remote_ctx_buffers_free(void)
+{
+	return mem_free_count_get(mem_remote_ctx.free);
+}
 
-	return nr_of_free_ctx;
+uint16_t ctx_buffers_free(void)
+{
+	return local_ctx_buffers_free() + remote_ctx_buffers_free();
 }
 
 void test_int_mem_proc_ctx(void)
@@ -1043,28 +1057,29 @@ void test_int_mem_proc_ctx(void)
 	ull_cp_init();
 
 	nr_of_free_ctx = ctx_buffers_free();
-	zassert_equal(nr_of_free_ctx, CONFIG_BT_CTLR_LLCP_PROC_CTX_BUF_NUM, NULL);
+	zassert_equal(nr_of_free_ctx, CONFIG_BT_CTLR_LLCP_PROC_CTX_BUF_NUM +
+		      CONFIG_BT_CTLR_LLCP_REMOTE_PROC_CTX_BUF_NUM, NULL);
 
 	for (int i = 0U; i < CONFIG_BT_CTLR_LLCP_PROC_CTX_BUF_NUM; i++) {
-		ctx1 = proc_ctx_acquire(&mem_ctx);
+		ctx1 = proc_ctx_acquire(&mem_local_ctx);
 
 		/* The previous acquire should be valid */
 		zassert_not_null(ctx1, NULL);
 	}
 
-	nr_of_free_ctx = ctx_buffers_free();
+	nr_of_free_ctx = local_ctx_buffers_free();
 	zassert_equal(nr_of_free_ctx, 0, NULL);
 
-	ctx2 = proc_ctx_acquire(&mem_ctx);
+	ctx2 = proc_ctx_acquire(&mem_local_ctx);
 
 	/* The last acquire should fail */
 	zassert_is_null(ctx2, NULL);
 
 	llcp_proc_ctx_release(ctx1);
-	nr_of_free_ctx = ctx_buffers_free();
+	nr_of_free_ctx = local_ctx_buffers_free();
 	zassert_equal(nr_of_free_ctx, 1, NULL);
 
-	ctx1 = proc_ctx_acquire(&mem_ctx);
+	ctx1 = proc_ctx_acquire(&mem_local_ctx);
 
 	/* Releasing returns the context to the avilable pool */
 	zassert_not_null(ctx1, NULL);
@@ -1141,7 +1156,7 @@ void test_int_create_proc(void)
 
 	ull_cp_init();
 
-	ctx = create_procedure(PROC_VERSION_EXCHANGE, &mem_ctx);
+	ctx = create_procedure(PROC_VERSION_EXCHANGE, &mem_local_ctx);
 	zassert_not_null(ctx, NULL);
 
 	zassert_equal(ctx->proc, PROC_VERSION_EXCHANGE, NULL);
@@ -1150,7 +1165,7 @@ void test_int_create_proc(void)
 
 	for (int i = 0U; i < CONFIG_BT_CTLR_LLCP_PROC_CTX_BUF_NUM; i++) {
 		zassert_not_null(ctx, NULL);
-		ctx = create_procedure(PROC_VERSION_EXCHANGE, &mem_ctx);
+		ctx = create_procedure(PROC_VERSION_EXCHANGE, &mem_local_ctx);
 	}
 
 	zassert_is_null(ctx, NULL);

subsys/bluetooth/controller/ll_sw/ull_llcp_internal.h

@@ -626,5 +626,5 @@ bool lr_is_disconnected(struct ll_conn *conn);
 bool lr_is_idle(struct ll_conn *conn);
 bool rr_is_disconnected(struct ll_conn *conn);
 bool rr_is_idle(struct ll_conn *conn);
-int ctx_buffers_free(void);
+uint16_t ctx_buffers_free(void);
 #endif

tests/bluetooth/controller/common/include/helper_util.h

@@ -6,9 +6,10 @@
  */
 
 void test_print_conn(struct ll_conn *conn);
-
+uint16_t test_ctx_buffers_cnt(void);
 void test_set_role(struct ll_conn *conn, uint8_t role);
 void test_setup(struct ll_conn *conn);
+
 void event_prepare(struct ll_conn *conn);
 void event_tx_ack(struct ll_conn *conn, struct node_tx *tx);
 void event_done(struct ll_conn *conn);

tests/bluetooth/controller/common/src/helper_util.c

@@ -42,6 +42,7 @@ static uint32_t event_active;
 static uint16_t lazy;
 sys_slist_t ut_rx_q;
 static sys_slist_t lt_tx_q;
+static uint32_t no_of_ctx_buffers_at_test_setup;
 
 #define PDU_DC_LL_HEADER_SIZE (offsetof(struct pdu_data, lldata))
 #define NODE_RX_HEADER_SIZE (offsetof(struct node_rx_pdu, pdu))
@@ -192,6 +193,11 @@ void test_print_conn(struct ll_conn *conn)
 	printf("--------------------->\n");
 }
 
+uint16_t test_ctx_buffers_cnt(void)
+{
+	return no_of_ctx_buffers_at_test_setup;
+}
+
 void test_setup(struct ll_conn *conn)
 {
 	ull_conn_init();
@@ -218,6 +224,8 @@ void test_setup(struct ll_conn *conn)
 	conn->lll.event_counter = 0;
 	event_active = 0;
 	lazy = 0;
+
+	no_of_ctx_buffers_at_test_setup = ctx_buffers_free();
 }
 
 

tests/bluetooth/controller/ctrl_api/src/main.c

@@ -107,13 +107,13 @@ void test_int_disconnect_loc(void)
 	ull_cp_state_set(&conn, ULL_CP_CONNECTED);
 
 	nr_free_ctx = ctx_buffers_free();
-	zassert_equal(nr_free_ctx, CONFIG_BT_CTLR_LLCP_PROC_CTX_BUF_NUM, NULL);
+	zassert_equal(nr_free_ctx, test_ctx_buffers_cnt(), NULL);
 
 	err = ull_cp_version_exchange(&conn);
 	zassert_equal(err, BT_HCI_ERR_SUCCESS, NULL);
 
 	nr_free_ctx = ctx_buffers_free();
-	zassert_equal(nr_free_ctx, CONFIG_BT_CTLR_LLCP_PROC_CTX_BUF_NUM - 1, NULL);
+	zassert_equal(nr_free_ctx, test_ctx_buffers_cnt() - 1, NULL);
 
 	event_prepare(&conn);
 	lt_rx(LL_VERSION_IND, &conn, &tx, &local_version_ind);
@@ -126,7 +126,7 @@ void test_int_disconnect_loc(void)
 	ull_cp_state_set(&conn, ULL_CP_DISCONNECTED);
 
 	nr_free_ctx = ctx_buffers_free();
-	zassert_equal(nr_free_ctx, CONFIG_BT_CTLR_LLCP_PROC_CTX_BUF_NUM, NULL);
+	zassert_equal(nr_free_ctx, test_ctx_buffers_cnt(), NULL);
 
 	ut_rx_q_is_empty();
 
@@ -137,7 +137,7 @@ void test_int_disconnect_loc(void)
 	event_done(&conn);
 
 	nr_free_ctx = ctx_buffers_free();
-	zassert_equal(nr_free_ctx, CONFIG_BT_CTLR_LLCP_PROC_CTX_BUF_NUM, NULL);
+	zassert_equal(nr_free_ctx, test_ctx_buffers_cnt(), NULL);
 
 	/*
 	 * all buffers should still be empty
@@ -165,15 +165,15 @@ void test_int_disconnect_rem(void)
 	ull_cp_state_set(&conn, ULL_CP_CONNECTED);
 
 	nr_free_ctx = ctx_buffers_free();
-	zassert_equal(nr_free_ctx, CONFIG_BT_CTLR_LLCP_PROC_CTX_BUF_NUM, NULL);
+	zassert_equal(nr_free_ctx, test_ctx_buffers_cnt(), NULL);
 	/* Prepare */
 	event_prepare(&conn);
 
 	/* Rx */
 	lt_tx(LL_VERSION_IND, &conn, &remote_version_ind);
 
 	nr_free_ctx = ctx_buffers_free();
-	zassert_equal(nr_free_ctx, CONFIG_BT_CTLR_LLCP_PROC_CTX_BUF_NUM, NULL);
+	zassert_equal(nr_free_ctx, test_ctx_buffers_cnt(), NULL);
 
 	/* Disconnect before we reply */
 
@@ -189,7 +189,7 @@ void test_int_disconnect_rem(void)
 	event_done(&conn);
 
 	nr_free_ctx = ctx_buffers_free();
-	zassert_equal(nr_free_ctx, CONFIG_BT_CTLR_LLCP_PROC_CTX_BUF_NUM, NULL);
+	zassert_equal(nr_free_ctx, test_ctx_buffers_cnt(), NULL);
 
 	/* There should not be a host notifications */
 	ut_rx_q_is_empty();

tests/bluetooth/controller/ctrl_chmu/src/main.c

@@ -125,7 +125,7 @@ void test_channel_map_update_central_loc(void)
 	zassert_mem_equal(conn.lll.data_chan_map, chm, sizeof(conn.lll.data_chan_map),
 			  "Channel map invalid");
 
-	zassert_equal(ctx_buffers_free(), CONFIG_BT_CTLR_LLCP_PROC_CTX_BUF_NUM,
+	zassert_equal(ctx_buffers_free(), test_ctx_buffers_cnt(),
 				  "Free CTX buffers %d", ctx_buffers_free());
 }
 
@@ -193,7 +193,7 @@ void test_channel_map_update_periph_rem(void)
 	zassert_mem_equal(conn.lll.data_chan_map, chm, sizeof(conn.lll.data_chan_map),
 			  "Channel map invalid");
 
-	zassert_equal(ctx_buffers_free(), CONFIG_BT_CTLR_LLCP_PROC_CTX_BUF_NUM,
+	zassert_equal(ctx_buffers_free(), test_ctx_buffers_cnt(),
 				  "Free CTX buffers %d", ctx_buffers_free());
 }
 
@@ -211,7 +211,7 @@ void test_channel_map_update_periph_loc(void)
 	err = ull_cp_chan_map_update(&conn, chm);
 	zassert_equal(err, BT_HCI_ERR_CMD_DISALLOWED, NULL);
 
-	zassert_equal(ctx_buffers_free(), CONFIG_BT_CTLR_LLCP_PROC_CTX_BUF_NUM,
+	zassert_equal(ctx_buffers_free(), test_ctx_buffers_cnt(),
 				  "Free CTX buffers %d", ctx_buffers_free());
 }