michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Bluetooth: L2CAP: Try to allocate segment from the original pool

Browse source 
This makes the code attempt to allocate from the original buffer pool
before relying on le_data_pool which shall only be used as last resort
as it is configure with minimal possible buffers (1 per connection).

Change-Id: I85b581627f5c3b1bf1ee7c5fa69099c5aca13d4a
Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
This commit is contained in:
Luiz Augusto von Dentz 2017-04-10 16:41:45 +03:00 • committed by Johan Hedberg
commit 661c033124
2 changed files with 20 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/bluetooth/l2cap.h
View file

@ -210,7 +210,7 @@ struct bt_l2cap_chan_ops {
/** @def BT_L2CAP_CHAN_SEND_RESERVE
* @brief Headroom needed for outgoing buffers
*/
#define BT_L2CAP_CHAN_SEND_RESERVE (CONFIG_BLUETOOTH_HCI_RESERVE + 4 + 4 + 2)
#define BT_L2CAP_CHAN_SEND_RESERVE (CONFIG_BLUETOOTH_HCI_RESERVE + 4 + 4)
/** @brief L2CAP Server structure. */
struct bt_l2cap_server {

22
subsys/bluetooth/host/l2cap.c
View file

@ -985,6 +985,23 @@ static void le_disconn_rsp(struct bt_l2cap *l2cap, uint8_t ident,
bt_l2cap_chan_del(&chan->chan);
}
static inline struct net_buf *l2cap_alloc_seg(struct net_buf *buf)
{
struct net_buf *seg;
/* Try to use original pool if possible */
if (buf->pool->user_data_size >= BT_BUF_USER_DATA_MIN &&
buf->pool->buf_size >= BT_L2CAP_BUF_SIZE(BT_L2CAP_MAX_LE_MPS)) {
seg = net_buf_alloc(buf->pool, K_NO_WAIT);
if (seg) {
net_buf_reserve(seg, BT_L2CAP_CHAN_SEND_RESERVE);
return seg;
}
}
return bt_l2cap_create_pdu(&le_data_pool, 0);
}
static struct net_buf *l2cap_chan_create_seg(struct bt_l2cap_le_chan *ch,
struct net_buf *buf,
size_t sdu_hdr_len)
@ -1005,8 +1022,7 @@ static struct net_buf *l2cap_chan_create_seg(struct bt_l2cap_le_chan *ch,
goto segment;
}
headroom = sizeof(struct bt_hci_acl_hdr) +
sizeof(struct bt_l2cap_hdr) + sdu_hdr_len;
headroom = BT_L2CAP_CHAN_SEND_RESERVE + sdu_hdr_len;
/* Check if original buffer has enough headroom and don't have any
* fragments.
@ -1020,7 +1036,7 @@ static struct net_buf *l2cap_chan_create_seg(struct bt_l2cap_le_chan *ch,
}
segment:
seg = bt_l2cap_create_pdu(&le_data_pool, 0);
seg = l2cap_alloc_seg(buf);
if (sdu_hdr_len) {
net_buf_add_le16(seg, net_buf_frags_len(buf));