network tc: Add support to conkfigure CoDel - Controlled-Delay Active Queue Managemen...

```
$ tc qdisc show dev dummy99
qdisc fq_codel 8005: dev dummy99 root refcnt 2 limit 1000p flows 1024 quantum 1514 target 5.0ms interval 100.0ms memory_limit 32Mb ecn
$ network cat dumm99.network
[Match]
Name=dummy99

[TrafficControlQueueingDiscipline]
Parent=root
FairQueuingControlledDelayPacketLimit=1000

```

diff --git a/man/systemd.network.xml b/man/systemd.network.xml
index a23f0e6c2339a4a4416c3507c57db34e03645c8b..acafa8a712a64c570048f3452201b781c4bf28c6 100644 (file)
--- a/man/systemd.network.xml
+++ b/man/systemd.network.xml
@@ -2442,6 +2442,14 @@
         </listitem>
       </varlistentry>
 
+      <varlistentry>
+        <term><varname>FairQueuingControlledDelayPacketLimit=</varname></term>
+        <listitem>
+          <para>Specifies the hard limit on the real queue size. When this limit is reached, incoming packets are
+          dropped. Defaults to unset and kernel's default is used.</para>
+        </listitem>
+      </varlistentry>
+
     </variablelist>
   </refsect1>
 

diff --git a/src/network/meson.build b/src/network/meson.build
index 8a09078315994821a5a5a1a8493881410cb19387..41e482e7a19407f1583ec3ad4d5f806a46aac806 100644 (file)
--- a/src/network/meson.build
+++ b/src/network/meson.build
@@ -107,6 +107,8 @@ sources = files('''
         networkd-util.h
         networkd-wifi.c
         networkd-wifi.h
+        tc/fq-codel.c
+        tc/fq-codel.h
         tc/netem.c
         tc/netem.h
         tc/qdisc.c

diff --git a/src/network/networkd-network-gperf.gperf b/src/network/networkd-network-gperf.gperf
index ea4ba31b80cbd9793f6efdfdd89781c13a3b5a76..e80f0afd8f172be3004752d935f97b3359f15a52 100644 (file)
--- a/src/network/networkd-network-gperf.gperf
+++ b/src/network/networkd-network-gperf.gperf
@@ -258,6 +258,7 @@ TrafficControlQueueingDiscipline.TokenBufferFilterMPUBytes,                  con
 TrafficControlQueueingDiscipline.TokenBufferFilterPeakRate,                  config_parse_tc_token_buffer_filter_size,                    0, 0
 TrafficControlQueueingDiscipline.TokenBufferFilterLatencySec,                config_parse_tc_token_buffer_filter_latency,                 0, 0
 TrafficControlQueueingDiscipline.StochasticFairnessQueueingPerturbPeriodSec, config_parse_tc_stochastic_fairness_queueing_perturb_period, 0, 0
+TrafficControlQueueingDiscipline.FairQueuingControlledDelayPacketLimit,      config_parse_tc_fair_queuing_controlled_delay_limit,         0, 0
 /* backwards compatibility: do not add new entries to this section */
 Network.IPv4LL,                         config_parse_ipv4ll,                             0,                             offsetof(Network, link_local)
 DHCP.ClientIdentifier,                  config_parse_dhcp_client_identifier,             0,                             offsetof(Network, dhcp_client_identifier)

diff --git a/src/network/tc/fq-codel.c b/src/network/tc/fq-codel.c
new file mode 100644 (file)
index 0000000..174d70e
--- /dev/null
+++ b/src/network/tc/fq-codel.c
@@ -0,0 +1,91 @@
+/* SPDX-License-Identifier: LGPL-2.1+
+ * Copyright © 2019 VMware, Inc. */
+
+#include <linux/pkt_sched.h>
+
+#include "alloc-util.h"
+#include "conf-parser.h"
+#include "netlink-util.h"
+#include "parse-util.h"
+#include "qdisc.h"
+#include "string-util.h"
+
+int fair_queuing_controlled_delay_new(FairQueuingControlledDelay **ret) {
+        FairQueuingControlledDelay *fqcd = NULL;
+
+        fqcd = new0(FairQueuingControlledDelay, 1);
+        if (!fqcd)
+                return -ENOMEM;
+
+        *ret = TAKE_PTR(fqcd);
+
+        return 0;
+}
+
+int fair_queuing_controlled_delay_fill_message(Link *link, const FairQueuingControlledDelay *fqcd, sd_netlink_message *req) {
+        int r;
+
+        assert(link);
+        assert(fqcd);
+        assert(req);
+
+        r = sd_netlink_message_open_array(req, TCA_OPTIONS);
+        if (r < 0)
+                return log_link_error_errno(link, r, "Could not open container TCA_OPTIONS: %m");
+
+        r = sd_netlink_message_append_data(req, TCA_FQ_CODEL_LIMIT, &fqcd->limit, sizeof(fqcd->limit));
+        if (r < 0)
+                return log_link_error_errno(link, r, "Could not append TCA_FQ_CODEL_LIMIT attribute: %m");
+
+        r = sd_netlink_message_close_container(req);
+        if (r < 0)
+                return log_link_error_errno(link, r, "Could not close container TCA_OPTIONS: %m");
+
+        return 0;
+}
+
+int config_parse_tc_fair_queuing_controlled_delay_limit(
+                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) {
+
+        _cleanup_(qdisc_free_or_set_invalidp) QDisc *qdisc = NULL;
+        Network *network = data;
+        int r;
+
+        assert(filename);
+        assert(lvalue);
+        assert(rvalue);
+        assert(data);
+
+        r = qdisc_new_static(network, filename, section_line, &qdisc);
+        if (r < 0)
+                return r;
+
+        if (isempty(rvalue)) {
+                qdisc->fq_codel.limit = 0;
+
+                qdisc = NULL;
+                return 0;
+        }
+
+        r = safe_atou32(rvalue, &qdisc->fq_codel.limit);
+        if (r < 0) {
+                log_syntax(unit, LOG_ERR, filename, line, r,
+                           "Failed to parse '%s=', ignoring assignment: %s",
+                           lvalue, rvalue);
+                return 0;
+        }
+
+        qdisc->has_fair_queuing_controlled_delay = true;
+        qdisc = NULL;
+
+        return 0;
+}

diff --git a/src/network/tc/fq-codel.h b/src/network/tc/fq-codel.h
new file mode 100644 (file)
index 0000000..0ddb509
--- /dev/null
+++ b/src/network/tc/fq-codel.h
@@ -0,0 +1,17 @@
+/* SPDX-License-Identifier: LGPL-2.1+
+ * Copyright © 2019 VMware, Inc. */
+#pragma once
+
+#include "sd-netlink.h"
+
+#include "conf-parser.h"
+#include "networkd-link.h"
+
+typedef struct FairQueuingControlledDelay {
+        uint32_t limit;
+} FairQueuingControlledDelay;
+
+int fair_queuing_controlled_delay_new(FairQueuingControlledDelay **ret);
+int fair_queuing_controlled_delay_fill_message(Link *link, const FairQueuingControlledDelay *sfq, sd_netlink_message *req);
+
+CONFIG_PARSER_PROTOTYPE(config_parse_tc_fair_queuing_controlled_delay_limit);

diff --git a/src/network/tc/qdisc.c b/src/network/tc/qdisc.c
index 57e3025d7c9f43cc9cab04728e1e5dcc0bea2d5e..d066e0713f95048510c5b7c1f64f1841b361bdc5 100644 (file)
--- a/src/network/tc/qdisc.c
+++ b/src/network/tc/qdisc.c
@@ -169,6 +169,16 @@ int qdisc_configure(Link *link, QDisc *qdisc) {
                         return r;
         }
 
+        if (qdisc->has_fair_queuing_controlled_delay) {
+                r = free_and_strdup(&tca_kind, "fq_codel");
+                if (r < 0)
+                        return log_oom();
+
+                r = fair_queuing_controlled_delay_fill_message(link, &qdisc->fq_codel, req);
+                if (r < 0)
+                        return r;
+        }
+
         p = tca_kind ?:qdisc->tca_kind;
         if (p) {
                 r = sd_netlink_message_append_string(req, TCA_KIND, p);

diff --git a/src/network/tc/qdisc.h b/src/network/tc/qdisc.h
index cc68bdfaa735ef58538b189da9d99976e48bebb5..53968bcf1fb813c3aa6cf330349e006d4e255790 100644 (file)
--- a/src/network/tc/qdisc.h
+++ b/src/network/tc/qdisc.h
@@ -3,6 +3,7 @@
 #pragma once
 
 #include "conf-parser.h"
+#include "fq-codel.h"
 #include "netem.h"
 #include "networkd-link.h"
 #include "networkd-network.h"
@@ -25,10 +26,12 @@ typedef struct QDisc {
         bool has_network_emulator:1;
         bool has_token_buffer_filter:1;
         bool has_stochastic_fairness_queueing:1;
+        bool has_fair_queuing_controlled_delay:1;
 
         NetworkEmulator ne;
         TokenBufferFilter tbf;
         StochasticFairnessQueueing sfq;
+        FairQueuingControlledDelay fq_codel;
 } QDisc;
 
 void qdisc_free(QDisc *qdisc);

diff --git a/test/fuzz/fuzz-network-parser/directives.network b/test/fuzz/fuzz-network-parser/directives.network
index c3264522b41218b218309214542ca5c1042d6e2a..c71fe5ce77a848b8c468aef0cc74aac5593ded7e 100644 (file)
--- a/test/fuzz/fuzz-network-parser/directives.network
+++ b/test/fuzz/fuzz-network-parser/directives.network
@@ -278,3 +278,4 @@ TokenBufferFilterMPUBytes=
 TokenBufferFilterPeakRate=
 TokenBufferFilterLatencySec=
 StochasticFairnessQueueingPerturbPeriodSec=
+FairQueuingControlledDelayPacketLimit=