Skip to contentSkip to conversation

Bluetooth: L2CAP: Improve credits logic

PATCH In review Luiz Augusto von Dentz 2 participants 6 messages Sep 4, 2018 – Sep 27, 2018

Subsystems (2)
lore
Share & tools
lore

Luiz Augusto von Dentz

author maintainer
#0 lore raw

v2 cover Bluetooth: L2CAP: Improve credits logic

From: Luiz Augusto von Dentz <[email protected]>

These changes replace the existing threshold logic with a limpler logic that gives back credits after receiving an SDU. It also removes the debugfs entries to configure the MPS and credits with auto selected one derived from the MTU and MPS.

v2: Account from the SDU length when adjusting the MPS.

Luiz Augusto von Dentz (3):
Bluetooth: L2CAP: Derive MPS from connection MTU
Bluetooth: L2CAP: Derive rx credits from MTU and MPS
Bluetooth: L2CAP: Detect if remote is not able to use the whole MPS

 include/net/bluetooth/l2cap.h |  3 --
 net/bluetooth/l2cap_core.c    | 66 +++++++++++++++++++++++------------
 2 files changed, 44 insertions(+), 25 deletions(-)
Signature · 1 line
2.17.1
author maintainer
#1 lore raw

PATCH v2 1/3 Bluetooth: L2CAP: Derive MPS from connection MTU

From: Luiz Augusto von Dentz <[email protected]>

This ensures the MPS can fit in a single HCI fragment so each segment don't have to be reassembled at HCI level, in addition to that also remove the debugfs entry to configure the MPS.

---
 include/net/bluetooth/l2cap.h |  1 -
 net/bluetooth/l2cap_core.c    | 14 +++++++-------
 2 files changed, 7 insertions(+), 8 deletions(-)
include/net/bluetooth/l2cap.h +0 -1
index 0697fd413087..17296675a0b1 100644
@@ -456,7 +456,6 @@ struct l2cap_conn_param_update_rsp {
 #define L2CAP_CONN_PARAM_REJECTED	0x0001
 
 #define L2CAP_LE_MAX_CREDITS		10
-#define L2CAP_LE_DEFAULT_MPS		230
 
 struct l2cap_le_conn_req {
 	__le16     psm;
net/bluetooth/l2cap_core.c +7 -7
index d17a4736e47c..8a60db6261f7 100644
@@ -52,7 +52,6 @@ static LIST_HEAD(chan_list);
 static DEFINE_RWLOCK(chan_list_lock);
 
 static u16 le_max_credits = L2CAP_LE_MAX_CREDITS;
-static u16 le_default_mps = L2CAP_LE_DEFAULT_MPS;
 
 static struct sk_buff *l2cap_build_cmd(struct l2cap_conn *conn,
 				       u8 code, u8 ident, u16 dlen, void *data);
@@ -520,7 +519,8 @@ static void l2cap_le_flowctl_init(struct l2cap_chan *chan)
 	chan->sdu_len = 0;
 	chan->tx_credits = 0;
 	chan->rx_credits = le_max_credits;
-	chan->mps = min_t(u16, chan->imtu, le_default_mps);
+	/* Derive MPS from connection MTU to stop HCI fragmentation */
+	chan->mps = min_t(u16, chan->imtu, chan->conn->mtu - L2CAP_HDR_SIZE);
 
 	skb_queue_head_init(&chan->tx_q);
 }
@@ -1282,6 +1282,8 @@ static void l2cap_le_connect(struct l2cap_chan *chan)
 	if (test_and_set_bit(FLAG_LE_CONN_REQ_SENT, &chan->flags))
 		return;
 
+	l2cap_le_flowctl_init(chan);
+
 	req.psm     = chan->psm;
 	req.scid    = cpu_to_le16(chan->scid);
 	req.mtu     = cpu_to_le16(chan->imtu);
@@ -5493,8 +5495,6 @@ static int l2cap_le_connect_req(struct l2cap_conn *conn,
 		goto response_unlock;
 	}
 
-	l2cap_le_flowctl_init(chan);
-
 	bacpy(&chan->src, &conn->hcon->src);
 	bacpy(&chan->dst, &conn->hcon->dst);
 	chan->src_type = bdaddr_src_type(conn->hcon);
@@ -5506,6 +5506,9 @@ static int l2cap_le_connect_req(struct l2cap_conn *conn,
 	chan->tx_credits = __le16_to_cpu(req->credits);
 
 	__l2cap_chan_add(conn, chan);
+
+	l2cap_le_flowctl_init(chan);
+
 	dcid = chan->scid;
 	credits = chan->rx_credits;
 
@@ -7102,7 +7105,6 @@ int l2cap_chan_connect(struct l2cap_chan *chan, __le16 psm, u16 cid,
 	case L2CAP_MODE_BASIC:
 		break;
 	case L2CAP_MODE_LE_FLOWCTL:
-		l2cap_le_flowctl_init(chan);
 		break;
 	case L2CAP_MODE_ERTM:
 	case L2CAP_MODE_STREAMING:
@@ -7647,8 +7649,6 @@ int __init l2cap_init(void)
 
 	debugfs_create_u16("l2cap_le_max_credits", 0644, bt_debugfs,
 			   &le_max_credits);
-	debugfs_create_u16("l2cap_le_default_mps", 0644, bt_debugfs,
-			   &le_default_mps);
 
 	return 0;
 }
Signature · 1 line
2.17.1
author maintainer
#2 lore raw

PATCH v2 2/3 Bluetooth: L2CAP: Derive rx credits from MTU and MPS

In reply to Luiz Augusto von Dentz

From: Luiz Augusto von Dentz <[email protected]>

Give enough rx credits for a full packet instead of using an arbitrary number which may not be enough depending on the MTU and MPS which can cause interruptions while waiting for more credits, also remove debugfs entry for l2cap_le_max_credits.

With these changes the credits are restored after each SDU is received instead of using fixed threshold, this way it is garanteed that there will always be enough credits to send a packet without waiting more credits to arrive.

---
 include/net/bluetooth/l2cap.h |  2 --
 net/bluetooth/l2cap_core.c    | 42 ++++++++++++++++++++++-------------
 2 files changed, 27 insertions(+), 17 deletions(-)
include/net/bluetooth/l2cap.h +0 -2
index 17296675a0b1..3555440e14fc 100644
@@ -455,8 +455,6 @@ struct l2cap_conn_param_update_rsp {
 #define L2CAP_CONN_PARAM_ACCEPTED	0x0000
 #define L2CAP_CONN_PARAM_REJECTED	0x0001
 
-#define L2CAP_LE_MAX_CREDITS		10
-
 struct l2cap_le_conn_req {
 	__le16     psm;
 	__le16     scid;
net/bluetooth/l2cap_core.c +27 -15

93 lines not on this page · raw message

Signature · 1 line
2.17.1
author maintainer
#3 lore raw

PATCH v2 3/3 Bluetooth: L2CAP: Detect if remote is not able to use the whole MPS

In reply to Luiz Augusto von Dentz

From: Luiz Augusto von Dentz <[email protected]>

If the remote is not able to fully utilize the MPS choosen recalculate the credits based on the actual amount it is sending that way it can still send packets of MTU size without credits dropping to 0.

---
 net/bluetooth/l2cap_core.c | 10 ++++++++++
 1 file changed, 10 insertions(+)
net/bluetooth/l2cap_core.c +10 -0
index 3fb2d757df88..514899f7f0d4 100644
@@ -6787,6 +6787,16 @@ static int l2cap_le_data_rcv(struct l2cap_chan *chan, struct sk_buff *skb)
 		chan->sdu_len = sdu_len;
 		chan->sdu_last_frag = skb;
 
+		/* Detect if remote is not able to use the selected MPS */
+		if (skb->len + L2CAP_SDULEN_SIZE < chan->mps) {
+			u16 mps_len = skb->len + L2CAP_SDULEN_SIZE;
+
+			/* Adjust the number of credits */
+			BT_DBG("chan->mps %u -> %u", chan->mps, mps_len);
+			chan->mps = mps_len;
+			l2cap_chan_le_send_credits(chan);
+		}
+
 		return 0;
 	}
 
Signature · 1 line
2.17.1
author maintainer
#4 lore raw
In reply to Luiz Augusto von Dentz

Hi,

Quoted 9 lines · Luiz Augusto von Dentz

From: Luiz Augusto von Dentz <[email protected]>

These changes replace the existing threshold logic with a limpler logic that gives back credits after receiving an SDU. It also removes the debugfs entries to configure the MPS and credits with auto selected one derived from the MTU and MPS.

v2: Account from the SDU length when adjusting the MPS.

Quoted 8 lines

Luiz Augusto von Dentz (3):
Bluetooth: L2CAP: Derive MPS from connection MTU
Bluetooth: L2CAP: Derive rx credits from MTU and MPS
Bluetooth: L2CAP: Detect if remote is not able to use the whole MPS

 include/net/bluetooth/l2cap.h |  3 --
 net/bluetooth/l2cap_core.c    | 66 +++++++++++++++++++++++------------
 2 files changed, 44 insertions(+), 25 deletions(-)

Ping.

Signature · 1 line
Luiz Augusto von Dentz
maintainer
#5 lore raw
In reply to Luiz Augusto von Dentz

Hi Luiz,

Quoted 7 lines

These changes replace the existing threshold logic with a limpler logic that gives back credits after receiving an SDU. It also removes the debugfs entries to configure the MPS and credits with auto selected one derived from the MTU and MPS.

v2: Account from the SDU length when adjusting the MPS.

Quoted 8 lines

Luiz Augusto von Dentz (3):
Bluetooth: L2CAP: Derive MPS from connection MTU
Bluetooth: L2CAP: Derive rx credits from MTU and MPS
Bluetooth: L2CAP: Detect if remote is not able to use the whole MPS

include/net/bluetooth/l2cap.h | 3 --
net/bluetooth/l2cap_core.c | 66 +++++++++++++++++++++++------------

2 files changed, 44 insertions(+), 25 deletions(-)

all 3 patches have been applied to bluetooth-next tree.

Regards

Marcel