mptcp: Use 32-bit DATA_ACK when possible

RFC8684 allows to send 32-bit DATA_ACKs as long as the peer is not
sending 64-bit data-sequence numbers. The 64-bit DSN is only there for
extreme scenarios when a very high throughput subflow is combined with a
long-RTT subflow such that the high-throughput subflow wraps around the
32-bit sequence number space within an RTT of the high-RTT subflow.

It is thus a rare scenario and we should try to use the 32-bit DATA_ACK
instead as long as possible. It allows to reduce the TCP-option overhead
by 4 bytes, thus makes space for an additional SACK-block. It also makes
tcpdumps much easier to read when the DSN and DATA_ACK are both either
32 or 64-bit.

Signed-off-by: Christoph Paasch <cpaasch@apple.com>
Reviewed-by: Matthieu Baerts <matthieu.baerts@tessares.net>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/net/mptcp.h b/include/net/mptcp.h
index c4a6ef4ba35beae7e55b4d398a7fc27a77621b8b..46d0487d2b227802ca0daf0a0ccae929f4b86b00 100644 (file)
--- a/include/net/mptcp.h
+++ b/include/net/mptcp.h
@@ -16,7 +16,10 @@ struct seq_file;
 
 /* MPTCP sk_buff extension data */
 struct mptcp_ext {
-       u64             data_ack;
+       union {
+               u64     data_ack;
+               u32     data_ack32;
+       };
        u64             data_seq;
        u32             subflow_seq;
        u16             data_len;

diff --git a/net/mptcp/options.c b/net/mptcp/options.c
index 45497af23906cdc33e2b6490d9f3a03c24aa8b1e..ece6f92cf7d110d46b6563386c2bd119ec93b990 100644 (file)
--- a/net/mptcp/options.c
+++ b/net/mptcp/options.c
@@ -516,7 +516,16 @@ static bool mptcp_established_options_dss(struct sock *sk, struct sk_buff *skb,
                return ret;
        }
 
-       ack_size = TCPOLEN_MPTCP_DSS_ACK64;
+       if (subflow->use_64bit_ack) {
+               ack_size = TCPOLEN_MPTCP_DSS_ACK64;
+               opts->ext_copy.data_ack = msk->ack_seq;
+               opts->ext_copy.ack64 = 1;
+       } else {
+               ack_size = TCPOLEN_MPTCP_DSS_ACK32;
+               opts->ext_copy.data_ack32 = (uint32_t)(msk->ack_seq);
+               opts->ext_copy.ack64 = 0;
+       }
+       opts->ext_copy.use_ack = 1;
 
        /* Add kind/length/subtype/flag overhead if mapping is not populated */
        if (dss_size == 0)
@@ -524,10 +533,6 @@ static bool mptcp_established_options_dss(struct sock *sk, struct sk_buff *skb,
 
        dss_size += ack_size;
 
-       opts->ext_copy.data_ack = msk->ack_seq;
-       opts->ext_copy.ack64 = 1;
-       opts->ext_copy.use_ack = 1;
-
        *size = ALIGN(dss_size, 4);
        return true;
 }
@@ -986,8 +991,13 @@ mp_capable_done:
                u8 flags = 0;
 
                if (mpext->use_ack) {
-                       len += TCPOLEN_MPTCP_DSS_ACK64;
-                       flags = MPTCP_DSS_HAS_ACK | MPTCP_DSS_ACK64;
+                       flags = MPTCP_DSS_HAS_ACK;
+                       if (mpext->ack64) {
+                               len += TCPOLEN_MPTCP_DSS_ACK64;
+                               flags |= MPTCP_DSS_ACK64;
+                       } else {
+                               len += TCPOLEN_MPTCP_DSS_ACK32;
+                       }
                }
 
                if (mpext->use_map) {
@@ -1004,8 +1014,13 @@ mp_capable_done:
                *ptr++ = mptcp_option(MPTCPOPT_DSS, len, 0, flags);
 
                if (mpext->use_ack) {
-                       put_unaligned_be64(mpext->data_ack, ptr);
-                       ptr += 2;
+                       if (mpext->ack64) {
+                               put_unaligned_be64(mpext->data_ack, ptr);
+                               ptr += 2;
+                       } else {
+                               put_unaligned_be32(mpext->data_ack32, ptr);
+                               ptr += 1;
+                       }
                }
 
                if (mpext->use_map) {

diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h
index e4ca6320ce7679c64f588290d65b10686ee3c728..f5adca93e8fb5b1d5a0f61320511802e46fdead7 100644 (file)
--- a/net/mptcp/protocol.h
+++ b/net/mptcp/protocol.h
@@ -290,6 +290,7 @@ struct mptcp_subflow_context {
                data_avail : 1,
                rx_eof : 1,
                data_fin_tx_enable : 1,
+               use_64bit_ack : 1, /* Set when we received a 64-bit DSN */
                can_ack : 1;        /* only after processing the remote a key */
        u64     data_fin_tx_seq;
        u32     remote_nonce;

diff --git a/net/mptcp/subflow.c b/net/mptcp/subflow.c
index 53c75b0e5dce949ef577fcfb0022ce1b0a5d5295..0020d356233dd06304cf168a42220609773c0633 100644 (file)
--- a/net/mptcp/subflow.c
+++ b/net/mptcp/subflow.c
@@ -667,9 +667,11 @@ static enum mapping_status get_mapping_status(struct sock *ssk)
        if (!mpext->dsn64) {
                map_seq = expand_seq(subflow->map_seq, subflow->map_data_len,
                                     mpext->data_seq);
+               subflow->use_64bit_ack = 0;
                pr_debug("expanded seq=%llu", subflow->map_seq);
        } else {
                map_seq = mpext->data_seq;
+               subflow->use_64bit_ack = 1;
        }
 
        if (subflow->map_valid) {