tcp: accecn: try to fit AccECN option with SACK

As SACK blocks tend to eat all option space when there are
many holes, it is useful to compromise on sending many SACK
blocks in every ACK and attempt to fit the AccECN option
there by reducing the number of SACK blocks. However, it will
never go below two SACK blocks because of the AccECN option.

As the AccECN option is often not put to every ACK, the space
hijack is usually only temporary. Depending on the reuqired
AccECN fields (can be either 3, 2, 1, or 0, cf. Table 5 in
AccECN spec) and the NOPs used for alignment of other
TCP options, up to two SACK blocks will be reduced. Please
find below tables for more details:

+====================+=========================================+
| Number of | Required | Remaining |  Number of  |    Final    |
|   SACK    |  AccECN  |  option   |  reduced    |  number of  |
|  blocks   |  fields  |  spaces   | SACK blocks | SACK blocks |
+===========+==========+===========+=============+=============+
|  x (<=2)  |  0 to 3  |    any    |      0      |      x      |
+-----------+----------+-----------+-------------+-------------+
|     3     |    0     |    any    |      0      |      3      |
|     3     |    1     |    <4     |      1      |      2      |
|     3     |    1     |    >=4    |      0      |      3      |
|     3     |    2     |    <8     |      1      |      2      |
|     3     |    2     |    >=8    |      0      |      3      |
|     3     |    3     |    <12    |      1      |      2      |
|     3     |    3     |    >=12   |      0      |      3      |
+-----------+----------+-----------+-------------+-------------+
|  y (>=4)  |    0     |    any    |      0      |      y      |
|  y (>=4)  |    1     |    <4     |      1      |     y-1     |
|  y (>=4)  |    1     |    >=4    |      0      |      y      |
|  y (>=4)  |    2     |    <8     |      1      |     y-1     |
|  y (>=4)  |    2     |    >=8    |      0      |      y      |
|  y (>=4)  |    3     |    <4     |      2      |     y-2     |
|  y (>=4)  |    3     |    <12    |      1      |     y-1     |
|  y (>=4)  |    3     |    >=12   |      0      |      y      |
+===========+==========+===========+=============+=============+

Signed-off-by: Chia-Yu Chang <chia-yu.chang@nokia-bell-labs.com>
Co-developed-by: Ilpo Järvinen <ij@kernel.org>
Signed-off-by: Ilpo Järvinen <ij@kernel.org>
Reviewed-by: Eric Dumazet <edumazet@google.com>
Link: https://patch.msgid.link/20250916082434.100722-11-chia-yu.chang@nokia-bell-labs.com
Signed-off-by: Paolo Abeni <pabeni@redhat.com>

diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c
index 65b90f73daa0909b8b9e4148152ffd7cb7d3c8ce..388c458594691feb5eaa6518296375f0c4de1c2d 100644 (file)
--- a/net/ipv4/tcp_output.c
+++ b/net/ipv4/tcp_output.c
@@ -873,7 +873,9 @@ static int tcp_options_fit_accecn(struct tcp_out_options *opts, int required,
                                  int remaining)
 {
        int size = TCP_ACCECN_MAXSIZE;
+       int sack_blocks_reduce = 0;
        int max_combine_saving;
+       int rem = remaining;
        int align_size;
 
        if (opts->use_synack_ecn_bytes)
@@ -888,14 +890,31 @@ static int tcp_options_fit_accecn(struct tcp_out_options *opts, int required,
                else
                        align_size = ALIGN_DOWN(size, 4);
 
-               if (remaining >= align_size) {
+               if (rem >= align_size) {
                        size = align_size;
                        break;
+               } else if (opts->num_accecn_fields == required &&
+                          opts->num_sack_blocks > 2 &&
+                          required > 0) {
+                       /* Try to fit the option by removing one SACK block */
+                       opts->num_sack_blocks--;
+                       sack_blocks_reduce++;
+                       rem = rem + TCPOLEN_SACK_PERBLOCK;
+
+                       opts->num_accecn_fields = TCP_ACCECN_NUMFIELDS;
+                       size = TCP_ACCECN_MAXSIZE;
+                       continue;
                }
 
                opts->num_accecn_fields--;
                size -= TCPOLEN_ACCECN_PERFIELD;
        }
+       if (sack_blocks_reduce > 0) {
+               if (opts->num_accecn_fields >= required)
+                       size -= sack_blocks_reduce * TCPOLEN_SACK_PERBLOCK;
+               else
+                       opts->num_sack_blocks += sack_blocks_reduce;
+       }
        if (opts->num_accecn_fields < required)
                return 0;