patrick/zephyr
1
0
Fork 0
Code Issues Pull requests Actions 7 Packages Projects Releases Wiki Activity

Bluetooth: Introduce separate pool for discardable events

Browse source 
Introduce a separate buffer pool for events which the HCI driver
considers discardable. Examples of such events could be e.g.
Advertising Reports. The benefit of having such a pool means that the
if there is a heavy inflow of such events it will not cause the
allocation for other critical events to block and may even eliminate
deadlocks in some cases.

Also update all mesh samples not to specify explicit RX buffer counts
anymore. Instead, create appropriate defaults in Kconfig so that we
only need to override this in the app for cases like the bbc:microbit
with limited memory.

Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
This commit is contained in:
Johan Hedberg 2019-06-28 12:09:36 +03:00 committed by Johan Hedberg
parent fc2fcd10cf
commit 0d9dab300e
29 changed files with 57 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/bluetooth/hci/h4.c
View file

@ -162,7 +162,7 @@ static struct net_buf *get_rx(int timeout)
BT_DBG("type 0x%02x, evt 0x%02x", rx.type, rx.evt.evt);
if (rx.type == H4_EVT) {
return bt_buf_get_evt(rx.evt.evt, timeout);
return bt_buf_get_evt(rx.evt.evt, rx.discardable, timeout);
}
return bt_buf_get_rx(BT_BUF_ACL_IN, timeout);

2
drivers/bluetooth/hci/h5.c
View file

@ -408,7 +408,7 @@ static inline struct net_buf *get_evt_buf(u8_t evt)
{
struct net_buf *buf;
buf = bt_buf_get_evt(evt, K_NO_WAIT);
buf = bt_buf_get_evt(evt, false, K_NO_WAIT);
if (buf) {
net_buf_add_u8(h5.rx_buf, evt);
}

3
drivers/bluetooth/hci/ipm_stm32wb.c
View file

@ -115,7 +115,8 @@ void TM_EvtReceivedCb(TL_EvtPacket_t *hcievt)
hcievt->evtserial.evt.evtcode);
goto out;
default:
buf = bt_buf_get_evt(evtserial.evt.evtcode, K_FOREVER);
buf = bt_buf_get_evt(evtserial.evt.evtcode, false,
K_FOREVER);
break;
}
net_buf_add_mem(buf, &hcievt->evtserial.evt,

2
drivers/bluetooth/hci/spi.c
View file

@ -355,7 +355,7 @@ static void bt_spi_rx_thread(void)
continue;
default:
buf = bt_buf_get_evt(rxmsg[EVT_HEADER_EVENT],
K_FOREVER);
false, K_FOREVER);
break;
}

2
drivers/bluetooth/hci/userchan.c
View file

@ -58,7 +58,7 @@ static int bt_dev_index = -1;
static struct net_buf *get_rx(const u8_t *buf)
{
if (buf[0] == H4_EVT) {
return bt_buf_get_evt(buf[1], K_FOREVER);
return bt_buf_get_evt(buf[1], false, K_FOREVER);
}
return bt_buf_get_rx(BT_BUF_ACL_IN, K_FOREVER);

9
include/bluetooth/buf.h
View file

@ -69,12 +69,13 @@ struct net_buf *bt_buf_get_cmd_complete(s32_t timeout);
* This will set the buffer type so bt_buf_set_type() does not need to
* be explicitly called before bt_recv_prio() or bt_recv().
*
* @param evt HCI event code
* @param timeout Timeout in milliseconds, or one of the special values
* K_NO_WAIT and K_FOREVER.
* @param evt HCI event code
* @param discardable Whether the driver considers the event discardable.
* @param timeout Timeout in milliseconds, or one of the special values
* K_NO_WAIT and K_FOREVER.
* @return A new buffer.
*/
struct net_buf *bt_buf_get_evt(u8_t evt, s32_t timeout);
struct net_buf *bt_buf_get_evt(u8_t evt, bool discardable, s32_t timeout);
/** Set the buffer type
*

1
include/bluetooth/hci.h
View file

@ -1362,6 +1362,7 @@ struct bt_hci_cp_le_set_privacy_mode {
/* Event definitions */
#define BT_HCI_EVT_UNKNOWN 0x00
#define BT_HCI_EVT_VENDOR 0xff
#define BT_HCI_EVT_INQUIRY_COMPLETE 0x01

1
samples/bluetooth/mesh/prj.conf
View file

@ -26,7 +26,6 @@ CONFIG_BT_PERIPHERAL=y
CONFIG_BT=y
CONFIG_BT_TINYCRYPT_ECC=y
CONFIG_BT_RX_BUF_COUNT=30
CONFIG_BT_L2CAP_RX_MTU=69
CONFIG_BT_L2CAP_TX_MTU=69
CONFIG_BT_L2CAP_TX_BUF_COUNT=5

2
samples/bluetooth/mesh/prj_bbc_microbit.conf
View file

@ -17,6 +17,8 @@ CONFIG_SETTINGS_FCB=y
CONFIG_BT=y
CONFIG_BT_TINYCRYPT_ECC=y
CONFIG_BT_RX_STACK_SIZE=1100
CONFIG_BT_RX_BUF_COUNT=3
CONFIG_BT_DISCARDABLE_BUF_COUNT=3
CONFIG_BT_CTLR_DUP_FILTER_LEN=0
CONFIG_BT_OBSERVER=y

1
samples/bluetooth/mesh_demo/prj.conf
View file

@ -3,7 +3,6 @@ CONFIG_MAIN_STACK_SIZE=512
CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2048
CONFIG_BT=y
CONFIG_BT_RX_BUF_COUNT=30
CONFIG_BT_TINYCRYPT_ECC=y
#CONFIG_BT_DEBUG_LOG=y
CONFIG_BT_OBSERVER=y

1
samples/boards/nrf52/mesh/onoff-app/prj.conf
View file

@ -31,7 +31,6 @@ CONFIG_BT_PERIPHERAL=y
CONFIG_BT=y
CONFIG_BT_TINYCRYPT_ECC=y
CONFIG_BT_RX_BUF_COUNT=30
CONFIG_BT_L2CAP_RX_MTU=69
CONFIG_BT_L2CAP_TX_MTU=69
CONFIG_BT_L2CAP_TX_BUF_COUNT=8

1
samples/boards/nrf52/mesh/onoff_level_lighting_vnd_app/prj.conf
View file

@ -26,7 +26,6 @@ CONFIG_BT_CTLR_TX_PWR_PLUS_8=y
CONFIG_BT_PERIPHERAL=y
CONFIG_BT=y
CONFIG_BT_TINYCRYPT_ECC=y
CONFIG_BT_RX_BUF_COUNT=30
CONFIG_BT_RX_STACK_SIZE=4096
CONFIG_BT_L2CAP_RX_MTU=69
CONFIG_BT_L2CAP_TX_MTU=69

1
samples/boards/reel_board/mesh_badge/prj.conf
View file

@ -19,7 +19,6 @@ CONFIG_BT_MESH_DEBUG=y
CONFIG_BT_OBSERVER=y
CONFIG_BT_BROADCASTER=y
CONFIG_BT_RX_BUF_COUNT=30
CONFIG_BT_L2CAP_RX_MTU=69
CONFIG_BT_L2CAP_TX_MTU=69
CONFIG_BT_L2CAP_TX_BUF_COUNT=8

4
subsys/bluetooth/controller/hci/hci.c
View file

@ -120,7 +120,7 @@ void *hci_cmd_complete(struct net_buf **buf, u8_t plen)
{
struct bt_hci_evt_cmd_complete *cc;
*buf = bt_buf_get_evt(BT_HCI_EVT_CMD_COMPLETE, K_FOREVER);
*buf = bt_buf_get_evt(BT_HCI_EVT_CMD_COMPLETE, false, K_FOREVER);
hci_evt_create(*buf, BT_HCI_EVT_CMD_COMPLETE, sizeof(*cc) + plen);
@ -137,7 +137,7 @@ static struct net_buf *cmd_status(u8_t status)
struct bt_hci_evt_cmd_status *cs;
struct net_buf *buf;
buf = bt_buf_get_evt(BT_HCI_EVT_CMD_STATUS, K_FOREVER);
buf = bt_buf_get_evt(BT_HCI_EVT_CMD_STATUS, false, K_FOREVER);
hci_evt_create(buf, BT_HCI_EVT_CMD_STATUS, sizeof(*cs));
cs = net_buf_add(buf, sizeof(*cs));

5
subsys/bluetooth/controller/hci/hci_driver.c
View file

@ -91,7 +91,7 @@ static void prio_recv_thread(void *p1, void *p2, void *p3)
struct net_buf *buf;
buf = bt_buf_get_evt(BT_HCI_EVT_NUM_COMPLETED_PACKETS,
K_FOREVER);
false, K_FOREVER);
hci_num_cmplt_encode(buf, handle, num_cmplt);
BT_DBG("Num Complete: 0x%04x:%u", handle, num_cmplt);
bt_recv_prio(buf);
@ -146,7 +146,8 @@ static inline struct net_buf *encode_node(struct node_rx_pdu *node_rx,
case HCI_CLASS_EVT_REQUIRED:
case HCI_CLASS_EVT_CONNECTION:
if (class == HCI_CLASS_EVT_DISCARDABLE) {
buf = bt_buf_get_rx(BT_BUF_EVT, K_NO_WAIT);
buf = bt_buf_get_evt(BT_HCI_EVT_UNKNOWN, true,
K_NO_WAIT);
} else {
buf = bt_buf_get_rx(BT_BUF_EVT, K_FOREVER);
}

15
subsys/bluetooth/host/Kconfig
View file

@ -26,6 +26,7 @@ config BT_HCI_CMD_COUNT
config BT_RX_BUF_COUNT
int "Number of HCI RX buffers"
default 3 if BT_RECV_IS_RX_THREAD
default 20 if (BT_MESH && !BT_DISCARDABLE_BUF_COUNT)
default 10
range 2 255
help
@ -47,6 +48,20 @@ config BT_RX_BUF_LEN
an L2CAP MTU of 65 bytes. On top of this there's the L2CAP header
(4 bytes) and the ACL header (also 4 bytes) which yields 73 bytes.
config BT_DISCARDABLE_BUF_COUNT
int "Number of discardable event buffers"
range 1 255
default 20 if BT_MESH
default 3
depends on BT_H4 || BT_CTLR
help
Number of buffers in a separate buffer pool for events which
the HCI driver considers discardable. Examples of such events
could be e.g. Advertising Reports. The benefit of having such
a pool means that the if there is a heavy inflow of such events
it will not cause the allocation for other critical events to
block and may even eliminate deadlocks in some cases.
config BT_HCI_TX_STACK_SIZE
# NOTE: This value is derived from other symbols and should not be
# user-configurable. Do not give it a prompt.

21
subsys/bluetooth/host/hci_core.c
View file

@ -148,6 +148,11 @@ NET_BUF_POOL_DEFINE(num_complete_pool, 1, BT_BUF_RX_SIZE,
BT_BUF_USER_DATA_MIN, NULL);
#endif /* CONFIG_BT_CONN */
#if defined(CONFIG_BT_DISCARDABLE_BUF_COUNT)
NET_BUF_POOL_DEFINE(discardable_pool, CONFIG_BT_DISCARDABLE_BUF_COUNT,
BT_BUF_RX_SIZE, BT_BUF_USER_DATA_MIN, NULL);
#endif /* CONFIG_BT_DISCARDABLE_BUF_COUNT */
struct event_handler {
u8_t event;
u8_t min_len;
@ -5672,7 +5677,7 @@ struct net_buf *bt_buf_get_cmd_complete(s32_t timeout)
return bt_buf_get_rx(BT_BUF_EVT, timeout);
}
struct net_buf *bt_buf_get_evt(u8_t evt, s32_t timeout)
struct net_buf *bt_buf_get_evt(u8_t evt, bool discardable, s32_t timeout)
{
switch (evt) {
#if defined(CONFIG_BT_CONN)
@ -5693,6 +5698,20 @@ struct net_buf *bt_buf_get_evt(u8_t evt, s32_t timeout)
case BT_HCI_EVT_CMD_STATUS:
return bt_buf_get_cmd_complete(timeout);
default:
#if defined(CONFIG_BT_DISCARDABLE_BUF_COUNT)
if (discardable) {
struct net_buf *buf;
buf = net_buf_alloc(&discardable_pool, timeout);
if (buf) {
net_buf_reserve(buf, CONFIG_BT_HCI_RESERVE);
bt_buf_set_type(buf, BT_BUF_EVT);
}
return buf;
}
#endif /* CONFIG_BT_DISCARDABLE_BUF_COUNT */
return bt_buf_get_rx(BT_BUF_EVT, timeout);
}
}

2
subsys/bluetooth/host/hci_ecc.c
View file

@ -84,7 +84,7 @@ static void send_cmd_status(u16_t opcode, u8_t status)
BT_DBG("opcode %x status %x", opcode, status);
buf = bt_buf_get_evt(BT_HCI_EVT_CMD_STATUS, K_FOREVER);
buf = bt_buf_get_evt(BT_HCI_EVT_CMD_STATUS, false, K_FOREVER);
bt_buf_set_type(buf, BT_BUF_EVT);
hdr = net_buf_add(buf, sizeof(*hdr));

2
subsys/bluetooth/host/hci_raw.c
View file

@ -72,7 +72,7 @@ struct net_buf *bt_buf_get_cmd_complete(s32_t timeout)
return buf;
}
struct net_buf *bt_buf_get_evt(u8_t evt, s32_t timeout)
struct net_buf *bt_buf_get_evt(u8_t evt, bool discardable, s32_t timeout)
{
struct net_buf *buf;

2
tests/bluetooth/hci_prop_evt/src/main.c
View file

@ -53,7 +53,7 @@ static void *cmd_complete(struct net_buf **buf, u8_t plen, u16_t opcode)
{
struct bt_hci_evt_cmd_complete *cc;
*buf = bt_buf_get_evt(BT_HCI_EVT_CMD_COMPLETE, K_FOREVER);
*buf = bt_buf_get_evt(BT_HCI_EVT_CMD_COMPLETE, false, K_FOREVER);
evt_create(*buf, BT_HCI_EVT_CMD_COMPLETE, sizeof(*cc) + plen);
cc = net_buf_add(*buf, sizeof(*cc));
cc->ncmd = 1U;

1
tests/bluetooth/mesh/dbg.conf
View file

@ -19,7 +19,6 @@ CONFIG_BT_PERIPHERAL=y
CONFIG_BT=y
CONFIG_BT_TINYCRYPT_ECC=y
CONFIG_BT_RX_BUF_COUNT=30
CONFIG_BT_L2CAP_RX_MTU=69
CONFIG_BT_L2CAP_TX_MTU=69

1
tests/bluetooth/mesh/friend.conf
View file

@ -17,7 +17,6 @@ CONFIG_BT_CTLR_PRIVACY=n
CONFIG_BT=y
CONFIG_BT_TINYCRYPT_ECC=y
CONFIG_BT_RX_BUF_COUNT=30
CONFIG_BT_MESH=y
CONFIG_BT_MESH_RELAY=y

1
tests/bluetooth/mesh/gatt.conf
View file

@ -19,7 +19,6 @@ CONFIG_BT_PERIPHERAL=y
CONFIG_BT=y
CONFIG_BT_TINYCRYPT_ECC=y
CONFIG_BT_RX_BUF_COUNT=30
CONFIG_BT_L2CAP_RX_MTU=69
CONFIG_BT_L2CAP_TX_MTU=69

1
tests/bluetooth/mesh/lpn.conf
View file

@ -19,7 +19,6 @@ CONFIG_BT_PERIPHERAL=y
CONFIG_BT=y
CONFIG_BT_TINYCRYPT_ECC=y
CONFIG_BT_RX_BUF_COUNT=30
CONFIG_BT_L2CAP_RX_MTU=69
CONFIG_BT_L2CAP_TX_MTU=69

1
tests/bluetooth/mesh/pb_gatt.conf
View file

@ -19,7 +19,6 @@ CONFIG_BT_PERIPHERAL=y
CONFIG_BT=y
CONFIG_BT_TINYCRYPT_ECC=y
CONFIG_BT_RX_BUF_COUNT=30
CONFIG_BT_L2CAP_RX_MTU=69
CONFIG_BT_L2CAP_TX_MTU=69

1
tests/bluetooth/mesh/prj.conf
View file

@ -19,7 +19,6 @@ CONFIG_BT_PERIPHERAL=y
CONFIG_BT=y
CONFIG_BT_TINYCRYPT_ECC=y
CONFIG_BT_RX_BUF_COUNT=30
CONFIG_BT_L2CAP_RX_MTU=69
CONFIG_BT_L2CAP_TX_MTU=69

1
tests/bluetooth/mesh/proxy.conf
View file

@ -19,7 +19,6 @@ CONFIG_BT_PERIPHERAL=y
CONFIG_BT=y
CONFIG_BT_TINYCRYPT_ECC=y
CONFIG_BT_RX_BUF_COUNT=30
CONFIG_BT_L2CAP_RX_MTU=69
CONFIG_BT_L2CAP_TX_MTU=69

1
tests/bluetooth/mesh_shell/prj.conf
View file

@ -34,7 +34,6 @@ CONFIG_BT_CTLR_MIN_USED_CHAN=n
CONFIG_BT_CTLR_ADV_EXT=n
CONFIG_BT_CTLR_PRIVACY=n
CONFIG_BT_RX_BUF_COUNT=30
CONFIG_BT_L2CAP_RX_MTU=69
CONFIG_BT_L2CAP_TX_MTU=69
CONFIG_BT_L2CAP_TX_BUF_COUNT=4

1
tests/bluetooth/shell/mesh.conf
View file

@ -18,7 +18,6 @@ CONFIG_BT_SHELL=y
CONFIG_BT_DEVICE_NAME="test shell"
CONFIG_BT_L2CAP_TX_BUF_COUNT=6
CONFIG_BT_RX_BUF_COUNT=30
CONFIG_BT_L2CAP_RX_MTU=69
CONFIG_BT_L2CAP_TX_MTU=69