diff options
author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2022-08-26 07:43:07 +0200 |
---|---|---|
committer | Yu Watanabe <watanabe.yu+github@gmail.com> | 2022-08-26 12:47:23 +0200 |
commit | dc7c21f00109886c52f04a4162ad6e36a43ca8c5 (patch) | |
tree | 12806c81e870f0b697eb4c2fe806a7846c50c37e | |
parent | sd-netlink: fix attribute type for RTAX_CC_ALGO (diff) | |
download | systemd-dc7c21f00109886c52f04a4162ad6e36a43ca8c5.tar.xz systemd-dc7c21f00109886c52f04a4162ad6e36a43ca8c5.zip |
network: introduce TCPCongestionControlAlgorithm=
Closes #24432.
-rw-r--r-- | man/systemd.network.xml | 9 | ||||
-rw-r--r-- | src/network/networkd-network-gperf.gperf | 1 | ||||
-rw-r--r-- | src/network/networkd-route.c | 54 | ||||
-rw-r--r-- | src/network/networkd-route.h | 2 | ||||
-rw-r--r-- | test/fuzz/fuzz-network-parser/directives | 1 |
5 files changed, 67 insertions, 0 deletions
diff --git a/man/systemd.network.xml b/man/systemd.network.xml index 818df99e5a..b9d74d6097 100644 --- a/man/systemd.network.xml +++ b/man/systemd.network.xml @@ -1623,6 +1623,15 @@ Table=1234</programlisting></para> </varlistentry> <varlistentry> + <term><varname>TCPCongestionControlAlgorithm=</varname></term> + <listitem> + <para>Specifies the TCP congestion control algorithm for the route. Takes a name of the algorithm, + e.g. <literal>bbr</literal>, <literal>dctcp</literal>, or <literal>vegas</literal>. When unset, + the kernel's default will be used.</para> + </listitem> + </varlistentry> + + <varlistentry> <term><varname>MultiPathRoute=<replaceable>address</replaceable>[@<replaceable>name</replaceable>] [<replaceable>weight</replaceable>]</varname></term> <listitem> <para>Configures multipath route. Multipath routing is the technique of using multiple diff --git a/src/network/networkd-network-gperf.gperf b/src/network/networkd-network-gperf.gperf index a4f038681a..dce7339d2f 100644 --- a/src/network/networkd-network-gperf.gperf +++ b/src/network/networkd-network-gperf.gperf @@ -196,6 +196,7 @@ Route.Type, config_parse_route_type, Route.InitialCongestionWindow, config_parse_tcp_window, 0, 0 Route.InitialAdvertisedReceiveWindow, config_parse_tcp_window, 0, 0 Route.TCPAdvertisedMaximumSegmentSize, config_parse_tcp_advmss, 0, 0 +Route.TCPCongestionControlAlgorithm, config_parse_tcp_congestion, 0, 0 Route.QuickAck, config_parse_route_boolean, 0, 0 Route.FastOpenNoCookie, config_parse_route_boolean, 0, 0 Route.TTLPropagate, config_parse_route_boolean, 0, 0 diff --git a/src/network/networkd-route.c b/src/network/networkd-route.c index 71e578d898..4f097364a1 100644 --- a/src/network/networkd-route.c +++ b/src/network/networkd-route.c @@ -107,6 +107,8 @@ Route *route_free(Route *route) { sd_event_source_disable_unref(route->expire); + free(route->tcp_congestion_control_algo); + return mfree(route); } @@ -319,6 +321,7 @@ int route_get(Manager *manager, Link *link, const Route *in, Route **ret) { int route_dup(const Route *src, Route **ret) { _cleanup_(route_freep) Route *dest = NULL; + int r; /* This does not copy mulipath routes. */ @@ -336,6 +339,11 @@ int route_dup(const Route *src, Route **ret) { dest->manager = NULL; dest->multipath_routes = NULL; dest->expire = NULL; + dest->tcp_congestion_control_algo = NULL; + + r = free_and_strdup(&dest->tcp_congestion_control_algo, src->tcp_congestion_control_algo); + if (r < 0) + return r; *ret = TAKE_PTR(dest); return 0; @@ -1231,6 +1239,12 @@ static int route_configure(const Route *route, uint32_t lifetime_sec, Link *link return r; } + if (!isempty(route->tcp_congestion_control_algo)) { + r = sd_netlink_message_append_string(m, RTAX_CC_ALGO, route->tcp_congestion_control_algo); + if (r < 0) + return r; + } + r = sd_netlink_message_close_container(m); if (r < 0) return r; @@ -2498,6 +2512,46 @@ int config_parse_route_type( return 0; } +int config_parse_tcp_congestion( + const char *unit, + const char *filename, + unsigned line, + const char *section, + unsigned section_line, + const char *lvalue, + int ltype, + const char *rvalue, + void *data, + void *userdata) { + + Network *network = userdata; + _cleanup_(route_free_or_set_invalidp) Route *n = NULL; + int r; + + assert(filename); + assert(section); + assert(lvalue); + assert(rvalue); + assert(data); + + r = route_new_static(network, filename, section_line, &n); + if (r == -ENOMEM) + return log_oom(); + if (r < 0) { + log_syntax(unit, LOG_WARNING, filename, line, r, + "Failed to allocate route, ignoring assignment: %m"); + return 0; + } + + r = config_parse_string(unit, filename, line, section, section_line, lvalue, ltype, + rvalue, &n->tcp_congestion_control_algo, userdata); + if (r < 0) + return r; + + TAKE_PTR(n); + return 0; +} + int config_parse_tcp_advmss( const char *unit, const char *filename, diff --git a/src/network/networkd-route.h b/src/network/networkd-route.h index b431e1a30f..fd4433eae4 100644 --- a/src/network/networkd-route.h +++ b/src/network/networkd-route.h @@ -50,6 +50,7 @@ struct Route { uint32_t initcwnd; uint32_t initrwnd; uint32_t advmss; + char *tcp_congestion_control_algo; unsigned char pref; unsigned flags; int gateway_onlink; /* Only used in conf parser and route_section_verify(). */ @@ -123,5 +124,6 @@ CONFIG_PARSER_PROTOTYPE(config_parse_route_type); CONFIG_PARSER_PROTOTYPE(config_parse_tcp_window); CONFIG_PARSER_PROTOTYPE(config_parse_route_mtu); CONFIG_PARSER_PROTOTYPE(config_parse_multipath_route); +CONFIG_PARSER_PROTOTYPE(config_parse_tcp_congestion); CONFIG_PARSER_PROTOTYPE(config_parse_tcp_advmss); CONFIG_PARSER_PROTOTYPE(config_parse_route_nexthop); diff --git a/test/fuzz/fuzz-network-parser/directives b/test/fuzz/fuzz-network-parser/directives index b7e8f16834..6f76f7ee18 100644 --- a/test/fuzz/fuzz-network-parser/directives +++ b/test/fuzz/fuzz-network-parser/directives @@ -189,6 +189,7 @@ Metric= TTLPropagate= MultiPathRoute= TCPAdvertisedMaximumSegmentSize= +TCPCongestionControlAlgorithm= NextHop= [Network] KeepMaster= |