Skip to contentSkip to conversation

mptcp: init autotune state also in simultaneous connect case.

PATCH In review Florian Westphal 4 participants 4 messages Jun 22, 2020 – Jul 1, 2020

Subsystems (2)
lore
Share & tools
lore

Florian Westphal

author
#0 lore raw

PATCH 1/1 mptcp: init autotune state also in simultaneous connect case.

This is what Christoph suggested needs to be added to avoid div0 in case of simultaneous connect.

Squashto: mptcp: add receive buffer auto-tuning

---
 net/mptcp/subflow.c | 1 +
 1 file changed, 1 insertion(+)
net/mptcp/subflow.c +1 -0
index 0f0fa1ba57a8..e1e19c76e267 100644
@@ -1120,6 +1120,7 @@ static void subflow_state_change(struct sock *sk)
 
 	if (subflow_simultaneous_connect(sk)) {
 		mptcp_do_fallback(sk);
+		mptcp_rcv_space_init(mptcp_sk(parent), sk);
 		pr_fallback(mptcp_sk(parent));
 		subflow->conn_finished = 1;
 		if (inet_sk_state_load(parent) == TCP_SYN_SENT) {
Signature · 1 line
2.26.2
#1 lore raw
Quoted 13 lines · Florian Westphal

This is what Christoph suggested needs to be added to avoid div0 in case of simultaneous connect.

Squashto: mptcp: add receive buffer auto-tuning

---
 net/mptcp/subflow.c | 1 +
 1 file changed, 1 insertion(+)
net/mptcp/subflow.c +0 -0
index 0f0fa1ba57a8..e1e19c76e267 100644

net/mptcp/subflow.c static void subflow_state_change(struct sock *sk) · line 1126

Quoted 7 lines
net/mptcp/subflow.c +1 -0
@@ -1120,6 +1120,7 @@ static void subflow_state_change(struct sock *sk)
 
 	if (subflow_simultaneous_connect(sk)) {
 		mptcp_do_fallback(sk);
+		mptcp_rcv_space_init(mptcp_sk(parent), sk);
 		pr_fallback(mptcp_sk(parent));
 		subflow->conn_finished = 1;
 		if (inet_sk_state_load(parent) == TCP_SYN_SENT) {

LGTM, and I think Christoph already acked it.

Thanks Florian,

/P

#2 lore raw
Quoted 15 lines · Paolo Abeni
Quoted 14 lines · Florian Westphal

This is what Christoph suggested needs to be added to avoid div0 in case of simultaneous connect.

Squashto: mptcp: add receive buffer auto-tuning

---
 net/mptcp/subflow.c | 1 +
 1 file changed, 1 insertion(+)
net/mptcp/subflow.c +0 -0
index 0f0fa1ba57a8..e1e19c76e267 100644
@@ -1120,6 +1120,7 @@ static void subflow_state_change(struct sock *sk)
 
Quoted 8 lines

net/mptcp/subflow.c static void subflow_state_change(struct sock *sk) · line 1126

Quoted 6 lines
net/mptcp/subflow.c +1 -0
 	if (subflow_simultaneous_connect(sk)) {
 		mptcp_do_fallback(sk);
+		mptcp_rcv_space_init(mptcp_sk(parent), sk);
 		pr_fallback(mptcp_sk(parent));
 		subflow->conn_finished = 1;
 		if (inet_sk_state_load(parent) == TCP_SYN_SENT) {

LGTM, and I think Christoph already acked it.

Yes, definitely good to squash this.

--
Mat Martineau
Intel

#3 lore raw

Hi Florian, Mat, Paolo,

Quoted 11 lines · Mat Martineau
Quoted 7 lines · Paolo Abeni
Quoted 4 lines · Florian Westphal

This is what Christoph suggested needs to be added to avoid div0 in case of simultaneous connect.

Squashto: mptcp: add receive buffer auto-tuning

LGTM, and I think Christoph already acked it.

Yes, definitely good to squash this.

Thank you for the patch and the review! Just applied:

- e6df694a4180: "squashed" in "mptcp: add receive buffer auto-tuning"
- 8de6e2516b12..d8ab2db3ac90: result

Tests and export will be started soon.

Cheers,
Matt

Signature · 2 lines
Tessares | Belgium | Hybrid Access Solutions
www.tessares.net