ahill/iproute2
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/network/iproute2/iproute2.git synced 2026-01-26 14:13:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

mptcp: add 'laminar' endpoint support

Browse Source 
This new endpoint type has been recently added to the kernel in v6.18
[1]. It will be used to create new subflows from the associated address
to additional addresses announced by the other peer. This will be done
if allowed by the MPTCP limits, and if the associated address is not
already being used by another subflow from the same MPTCP connection.

Note that the fullmesh flag takes precedence over the laminar one.
Without any of these two flags, the path-manager will create new
subflows to additional addresses announced by the other peer by
selecting the source address from the routing tables, which is harder to
configure if the announced address is not known in advance.

The support of the new flag is easy: simply by adding it in the
mptcp_addr_flag_names array.

The usage menu and the manual now references the new endpoint type. The
new corresponding counter has also been added in ss.

Link: https://git.kernel.org/torvalds/c/539f6b9de39e [1]
Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
Signed-off-by: David Ahern <dsahern@kernel.org>
This commit is contained in:
Matthieu Baerts (NGI0) 2025-11-24 12:19:23 +01:00 committed by David Ahern
parent 538478f236
commit 2ee7ec0d87
3 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ip/ipmptcp.c
View File

@ -32,7 +32,7 @@ static void usage(void)
" ip mptcp limits show\n"
" ip mptcp monitor\n"
"FLAG-LIST := [ FLAG-LIST ] FLAG\n"
"FLAG := [ signal | subflow | backup | fullmesh ]\n"
"FLAG := [ signal | subflow | laminar | backup | fullmesh ]\n"
"CHANGE-OPT := [ backup | nobackup | fullmesh | nofullmesh ]\n");
exit(-1);
@ -59,6 +59,7 @@ static const struct {
{ "backup", MPTCP_PM_ADDR_FLAG_BACKUP },
{ "fullmesh", MPTCP_PM_ADDR_FLAG_FULLMESH },
{ "implicit", MPTCP_PM_ADDR_FLAG_IMPLICIT },
{ "laminar", MPTCP_PM_ADDR_FLAG_LAMINAR },
{ "nobackup", MPTCP_PM_ADDR_FLAG_NONE },
{ "nofullmesh", MPTCP_PM_ADDR_FLAG_NONE }
};

16
man/man8/ip-mptcp.8
View File

@ -66,6 +66,8 @@ ip-mptcp \- MPTCP path manager configuration
.RB "|"
.B subflow
.RB "|"
.B laminar
.RB "|"
.B backup
.RB "|"
.B fullmesh
@ -169,6 +171,20 @@ path manager will try to create an additional subflow using this endpoint
as the source address after the MPTCP connection is established. A client would
typically do this.
.TP
.BR laminar
The endpoint will be used to create new subflows from the associated address to
additional addresses announced by the other peer. This will be done if allowed
by the MPTCP limits, and if the associated address is not already being used by
another subflow from the same MPTCP connection. Note that the
.BR fullmesh
flag takes precedence over the
.BR laminar
one. Without any of these two flags, the path-manager will create new subflows
to additional addresses announced by the other peer by selecting the source
address from the routing tables, which is harder to configure if the announced
address is not known in advance.
.TP
.BR backup
If this is a

2
misc/ss.c
View File

@ -3308,6 +3308,8 @@ static void mptcp_stats_print(struct mptcp_info *s)
out(" bytes_acked:%llu", s->mptcpi_bytes_acked);
if (s->mptcpi_subflows_total)
out(" subflows_total:%u", s->mptcpi_subflows_total);
if (s->mptcpi_endp_laminar_max)
out(" endp_laminar_max:%u", s->mptcpi_endp_laminar_max);
if (s->mptcpi_last_data_sent)
out(" last_data_sent:%u", s->mptcpi_last_data_sent);
if (s->mptcpi_last_data_recv)