mptcp: add 'laminar' endpoint support

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
Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
Signed-off-by: David Ahern <dsahern@kernel.org>

diff --git a/ip/ipmptcp.c b/ip/ipmptcp.c
index 2415cac8a36089da0e1c42995c06535a08305de7..2908b69ed16d6ffa41052ada7518d67ddcd99746 100644 (file)
--- a/ip/ipmptcp.c
+++ b/ip/ipmptcp.c
@@ -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 }
 };

diff --git a/man/man8/ip-mptcp.8 b/man/man8/ip-mptcp.8
index 500dc6717ada49823ad6cb9813bc86fc7103a021..c03935ddafd062b1f86cf8069edd09d31cea40df 100644 (file)
--- a/man/man8/ip-mptcp.8
+++ b/man/man8/ip-mptcp.8
@@ -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

diff --git a/misc/ss.c b/misc/ss.c
index 989e168ae35026249ccec0e2d4a3df07b0438c7b..b3566f6b6b81427609829720496e80bea7cfeef7 100644 (file)
--- a/misc/ss.c
+++ b/misc/ss.c
@@ -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)