[PATCH v2 0/4] mptcp: msk diag support
by Paolo Abeni
This introduces basic mptcp sockets diag support.
As IPPROTO_MPTCP excedes 8 bits, we need some changes at the inet_diag level:
a new attribute is introduced to allow user-space providing u32 protocol
values.
Patch 2 introduces new token APIs to allow traversing the existing msks, while
patch 3 bring in the actual diag implementation.
Patch 4 includes some basic functional tests
v1 -> v2
- fixed dump issue on large dump
- use flags for fallback, etc
- patch 4
Paolo Abeni (4):
inet_diag: support for wider protocol numbers
mptcp: add msk interations helpers
mptcp: add MPTCP socket diag interface
selftests/mptcp: add diag interface tests
include/uapi/linux/inet_diag.h | 1 +
include/uapi/linux/mptcp.h | 17 ++
net/core/sock.c | 1 +
net/ipv4/inet_diag.c | 63 +++++--
net/mptcp/Kconfig | 4 +
net/mptcp/Makefile | 2 +
net/mptcp/mptcp_diag.c | 167 ++++++++++++++++++
net/mptcp/protocol.h | 3 +
net/mptcp/token.c | 83 +++++++++
tools/testing/selftests/net/mptcp/Makefile | 2 +-
tools/testing/selftests/net/mptcp/diag.sh | 122 +++++++++++++
.../selftests/net/mptcp/mptcp_connect.c | 14 +-
12 files changed, 457 insertions(+), 22 deletions(-)
create mode 100644 net/mptcp/mptcp_diag.c
create mode 100755 tools/testing/selftests/net/mptcp/diag.sh
--
2.26.2
1 day, 14 hours
[PATCH net-next 0/2] mptcp: add receive buffer auto-tuning
by Florian Westphal
First patch extends the test script to allow for reproducible results.
Second patch adds receive auto-tuning. Its based on what TCP is doing,
only difference is that we use the largest RTT of any of the subflows
and that we will update all subflows with the new value.
Else, we get spurious packet drops because the mptcp work queue might
not be able to move packets from subflow socket to master socket
fast enough. Without the adjustment, TCP may drop the packets because
the subflow socket is over its rcvbuffer limit.
Florian Westphal (2):
selftests: mptcp: add option to specify size of file to transfer
mptcp: add receive buffer auto-tuning
net/mptcp/protocol.c | 123 +++++++++++++++++++--
net/mptcp/protocol.h | 7 ++
net/mptcp/subflow.c | 5 +-
tools/testing/selftests/net/mptcp/mptcp_connect.sh | 52 ++++++---
4 files changed, 166 insertions(+), 21 deletions(-)
2 days, 11 hours
[PATCH net] mptcp: fix DSS map generation on fin retransmission
by Paolo Abeni
The RFC 8684 mandates that no-data DATA FIN packets should carry
a DSS with 0 sequence number and data len equal to 1. Currently,
on FIN retransmission we re-use the existing mapping; if the previous
fin transmission was part of a partially acked data packet, we could
end-up writing in the egress packet a non-compliant DSS.
The above will be detected by a "Bad mapping" warning on the receiver
side.
This change addresses the issue explicitly checking for 0 len packet
when adding the DATA_FIN option.
Fixes: 6d0060f600ad ("mptcp: Write MPTCP DSS headers to outgoing data packets")
Signed-off-by: Paolo Abeni <pabeni(a)redhat.com>
---
net/mptcp/options.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
---
this should go on "top" of export branch, just before the "DO NOT MERGE"
changes.
Hopefully should not conflict with others
diff --git a/net/mptcp/options.c b/net/mptcp/options.c
index f464f8669dfc..46470194b8ca 100644
--- a/net/mptcp/options.c
+++ b/net/mptcp/options.c
@@ -451,9 +451,9 @@ static bool mptcp_established_options_mp(struct sock *sk, struct sk_buff *skb,
}
static void mptcp_write_data_fin(struct mptcp_subflow_context *subflow,
- struct mptcp_ext *ext)
+ struct sk_buff *skb, struct mptcp_ext *ext)
{
- if (!ext->use_map) {
+ if (!ext->use_map || !skb->len) {
/* RFC6824 requires a DSS mapping with specific values
* if DATA_FIN is set but no data payload is mapped
*/
@@ -505,7 +505,7 @@ static bool mptcp_established_options_dss(struct sock *sk, struct sk_buff *skb,
opts->ext_copy = *mpext;
if (skb && tcp_fin && subflow->data_fin_tx_enable)
- mptcp_write_data_fin(subflow, &opts->ext_copy);
+ mptcp_write_data_fin(subflow, skb, &opts->ext_copy);
ret = true;
}
--
2.26.2
2 days, 23 hours
[PATCH mptcp-next] mptcp: init autotune state also in simultaneous connect case.
by 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(+)
diff --git a/net/mptcp/subflow.c b/net/mptcp/subflow.c
index 0f0fa1ba57a8..e1e19c76e267 100644
--- a/net/mptcp/subflow.c
+++ b/net/mptcp/subflow.c
@@ -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) {
--
2.26.2
3 days
[PATCH iproute2-next 0/2] ss: msk diag support
by Paolo Abeni
basic support for MPTCP sockets diag interface.
The first patch update the required headers, while the 2nd one bring in
the actual implementation
Paolo Abeni (2):
include: update mptcp uAPI
ss: mptcp: add msk diag interface support
include/uapi/linux/inet_diag.h | 1 +
include/uapi/linux/mptcp.h | 15 +++++
misc/ss.c | 115 ++++++++++++++++++++++++++++++---
3 files changed, 121 insertions(+), 10 deletions(-)
--
2.26.2
3 days, 1 hour
[PATCH net-next] mptcp: do nonce initialization at subflow creation time
by Paolo Abeni
This clean-up the code a bit, reduces the number of
used hooks and indirect call requested, and allow
better error reporting from __mptcp_subflow_connect()
Signed-off-by: Paolo Abeni <pabeni(a)redhat.com>
---
net/mptcp/subflow.c | 54 +++++++++++++++++----------------------------
1 file changed, 20 insertions(+), 34 deletions(-)
diff --git a/net/mptcp/subflow.c b/net/mptcp/subflow.c
index 548f9e347ff5..664aa9158363 100644
--- a/net/mptcp/subflow.c
+++ b/net/mptcp/subflow.c
@@ -29,34 +29,6 @@ static void SUBFLOW_REQ_INC_STATS(struct request_sock *req,
MPTCP_INC_STATS(sock_net(req_to_sk(req)), field);
}
-static int subflow_rebuild_header(struct sock *sk)
-{
- struct mptcp_subflow_context *subflow = mptcp_subflow_ctx(sk);
- int local_id;
-
- if (subflow->request_join && !subflow->local_nonce) {
- struct mptcp_sock *msk = (struct mptcp_sock *)subflow->conn;
-
- pr_debug("subflow=%p", sk);
-
- do {
- get_random_bytes(&subflow->local_nonce, sizeof(u32));
- } while (!subflow->local_nonce);
-
- if (subflow->local_id)
- goto out;
-
- local_id = mptcp_pm_get_local_id(msk, (struct sock_common *)sk);
- if (local_id < 0)
- return -EINVAL;
-
- subflow->local_id = local_id;
- }
-
-out:
- return subflow->icsk_af_ops->rebuild_header(sk);
-}
-
static void subflow_req_destructor(struct request_sock *req)
{
struct mptcp_subflow_request_sock *subflow_req = mptcp_subflow_rsk(req);
@@ -984,7 +956,9 @@ int __mptcp_subflow_connect(struct sock *sk, int ifindex,
struct mptcp_sock *msk = mptcp_sk(sk);
struct mptcp_subflow_context *subflow;
struct sockaddr_storage addr;
+ int local_id = loc->id;
struct socket *sf;
+ struct sock *ssk;
u32 remote_token;
int addrlen;
int err;
@@ -996,7 +970,20 @@ int __mptcp_subflow_connect(struct sock *sk, int ifindex,
if (err)
return err;
- subflow = mptcp_subflow_ctx(sf->sk);
+ ssk = sf->sk;
+ subflow = mptcp_subflow_ctx(ssk);
+ do {
+ get_random_bytes(&subflow->local_nonce, sizeof(u32));
+ } while (!subflow->local_nonce);
+
+ if (!local_id) {
+ err = mptcp_pm_get_local_id(msk, (struct sock_common *)ssk);
+ if (err < 0)
+ goto failed;
+
+ local_id = err;
+ }
+
subflow->remote_key = msk->remote_key;
subflow->local_key = msk->local_key;
subflow->token = msk->token;
@@ -1007,15 +994,16 @@ int __mptcp_subflow_connect(struct sock *sk, int ifindex,
if (loc->family == AF_INET6)
addrlen = sizeof(struct sockaddr_in6);
#endif
- sf->sk->sk_bound_dev_if = ifindex;
+ ssk->sk_bound_dev_if = ifindex;
err = kernel_bind(sf, (struct sockaddr *)&addr, addrlen);
if (err)
goto failed;
mptcp_crypto_key_sha(subflow->remote_key, &remote_token, NULL);
- pr_debug("msk=%p remote_token=%u", msk, remote_token);
+ pr_debug("msk=%p remote_token=%u local_id=%d", msk, remote_token,
+ local_id);
subflow->remote_token = remote_token;
- subflow->local_id = loc->id;
+ subflow->local_id = local_id;
subflow->request_join = 1;
subflow->request_bkup = 1;
mptcp_info2sockaddr(remote, &addr);
@@ -1288,7 +1276,6 @@ void __init mptcp_subflow_init(void)
subflow_specific.conn_request = subflow_v4_conn_request;
subflow_specific.syn_recv_sock = subflow_syn_recv_sock;
subflow_specific.sk_rx_dst_set = subflow_finish_connect;
- subflow_specific.rebuild_header = subflow_rebuild_header;
#if IS_ENABLED(CONFIG_MPTCP_IPV6)
subflow_request_sock_ipv6_ops = tcp_request_sock_ipv6_ops;
@@ -1298,7 +1285,6 @@ void __init mptcp_subflow_init(void)
subflow_v6_specific.conn_request = subflow_v6_conn_request;
subflow_v6_specific.syn_recv_sock = subflow_syn_recv_sock;
subflow_v6_specific.sk_rx_dst_set = subflow_finish_connect;
- subflow_v6_specific.rebuild_header = subflow_rebuild_header;
subflow_v6m_specific = subflow_v6_specific;
subflow_v6m_specific.queue_xmit = ipv4_specific.queue_xmit;
--
2.26.2
3 days, 15 hours
[RFC PATCH 0/5] mptcp: cope better with mp_join storm
by Paolo Abeni
This series it amied at fixing:
https://github.com/multipath-tcp/mptcp_net-next/issues/33
patch 3/5 do the main work, while patch 4 and 5 should
reduce the server load avoid creating unneeded children.
Patch 1 and 2 are somewhat related cleanup.
Patch 2 && 5 are likely the most controversial. Any
feedback more than welcome!
Paolo Abeni (5):
mptcp: cleanup subflow_finish_connect()
subflow: explicitly check for plain tcp rsk
subflow: use rsk_ops->send_reset()
subflow: introduce and use mptcp_can_accept_new_subflow()
subflow: do not create child subflow for fallback MP_JOIN
net/mptcp/subflow.c | 76 +++++++++++++++++++++++++--------------------
1 file changed, 42 insertions(+), 34 deletions(-)
--
2.26.2
4 days
[PATCH net-next 0/6] MPTCP: improve fallback to TCP
by Davide Caratti
there are situations where MPTCP sockets should fall-back to regular TCP:
this series reworks the fallback code to pursue the following goals:
1) cleanup the non fallback code, removing most of 'if (<fallback>)' in
the data path
2) improve performance for non-fallback sockets, avoiding locks in poll()
further work will also leverage on this changes to achieve:
a) more consistent behavior of gestockopt()/setsockopt() on passive sockets
after fallback
b) support for "infinite maps" as per RFC8684, section 3.7
the series is made of the following items:
- patch 1 lets sendmsg() / recvmsg() / poll() use the main socket also
after fallback
- patch 2 fixes 'simultaneous connect' scenario after fallback. The
problem was present also before the rework, but the fix is much easier
to implement after patch 1
- patch 3, 4, 5 are clean-ups for code that is no more needed after the
fallback rework
- patch 6 fixes a race condition between close() and poll(). The problem
was theoretically present before the rework, but it became almost
systematic after patch 1
Davide Caratti (2):
net: mptcp: improve fallback to TCP
mptcp: fallback in case of simultaneous connect
Paolo Abeni (4):
mptcp: check for plain TCP sock at accept time
mptcp: create first subflow at msk creation time
mptcp: __mptcp_tcp_fallback() returns a struct sock
mptcp: close poll() races
net/mptcp/options.c | 9 +-
net/mptcp/protocol.c | 267 ++++++++++++++-----------------------------
net/mptcp/protocol.h | 43 +++++++
net/mptcp/subflow.c | 57 ++++++---
4 files changed, 175 insertions(+), 201 deletions(-)
--
2.26.2
4 days, 11 hours
