network tc: inroduce FQ - Fair Queue traffic policing

Please see http://man7.org/linux/man-pages/man8/tc-fq.8.html

diff --git a/man/systemd.network.xml b/man/systemd.network.xml
index acafa8a712a64c570048f3452201b781c4bf28c6..8509a8485a19a82d67ffa486c383c20f3343d1d2 100644 (file)
--- a/man/systemd.network.xml
+++ b/man/systemd.network.xml
@@ -2450,6 +2450,14 @@
         </listitem>
       </varlistentry>
 
+      <varlistentry>
+        <term><varname>FairQueueTrafficPolicingPacketLimit=</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 41e482e7a19407f1583ec3ad4d5f806a46aac806..5f0e0890de09dbfdbcf3c52df136c2abe9a68c1b 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.c
+        tc/fq.h
         tc/fq-codel.c
         tc/fq-codel.h
         tc/netem.c

diff --git a/src/network/networkd-network-gperf.gperf b/src/network/networkd-network-gperf.gperf
index e80f0afd8f172be3004752d935f97b3359f15a52..5a1e0c0dadf6a31f4e81492cb53cce5f68c01ce0 100644 (file)
--- a/src/network/networkd-network-gperf.gperf
+++ b/src/network/networkd-network-gperf.gperf
@@ -259,6 +259,7 @@ TrafficControlQueueingDiscipline.TokenBufferFilterPeakRate,                  con
 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
+TrafficControlQueueingDiscipline.FairQueueTrafficPolicingPacketLimit,        config_parse_tc_fair_queue_traffic_policing_packet_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.c b/src/network/tc/fq.c
new file mode 100644 (file)
index 0000000..d9142c7
--- /dev/null
+++ b/src/network/tc/fq.c
@@ -0,0 +1,93 @@
+/* SPDX-License-Identifier: LGPL-2.1+
+ * Copyright © 2019 VMware, Inc. */
+
+#include <linux/pkt_sched.h>
+
+#include "alloc-util.h"
+#include "conf-parser.h"
+#include "fq.h"
+#include "netlink-util.h"
+#include "parse-util.h"
+#include "string-util.h"
+
+static int fair_queue_traffic_policing_fill_message(Link *link, QDisc *qdisc, sd_netlink_message *req) {
+        FairQueueTrafficPolicing *fq;
+        int r;
+
+        assert(link);
+        assert(qdisc);
+        assert(req);
+
+        fq = FQ(qdisc);
+
+        r = sd_netlink_message_open_container_union(req, TCA_OPTIONS, "fq");
+        if (r < 0)
+                return log_link_error_errno(link, r, "Could not open container TCA_OPTIONS: %m");
+
+        r = sd_netlink_message_append_u32(req, TCA_FQ_PLIMIT, fq->limit);
+        if (r < 0)
+                return log_link_error_errno(link, r, "Could not append TCA_FQ_PLIMIT 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_queue_traffic_policing_packet_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;
+        FairQueueTrafficPolicing *fq;
+        Network *network = data;
+        int r;
+
+        assert(filename);
+        assert(lvalue);
+        assert(rvalue);
+        assert(data);
+
+        r = qdisc_new_static(QDISC_KIND_FQ, network, filename, section_line, &qdisc);
+        if (r == -ENOMEM)
+                return log_oom();
+        if (r < 0)
+                return log_syntax(unit, LOG_ERR, filename, line, r,
+                                  "More than one kind of queueing discipline, ignoring assignment: %m");
+
+        fq = FQ(qdisc);
+
+        if (isempty(rvalue)) {
+                fq->limit = 0;
+
+                qdisc = NULL;
+                return 0;
+        }
+
+        r = safe_atou32(rvalue, &fq->limit);
+        if (r < 0) {
+                log_syntax(unit, LOG_ERR, filename, line, r,
+                           "Failed to parse '%s=', ignoring assignment: %s",
+                           lvalue, rvalue);
+                return 0;
+        }
+
+        qdisc = NULL;
+
+        return 0;
+}
+
+const QDiscVTable fq_vtable = {
+        .object_size = sizeof(FairQueueTrafficPolicing),
+        .tca_kind = "fq",
+        .fill_message = fair_queue_traffic_policing_fill_message,
+};

diff --git a/src/network/tc/fq.h b/src/network/tc/fq.h
new file mode 100644 (file)
index 0000000..ac6c29c
--- /dev/null
+++ b/src/network/tc/fq.h
@@ -0,0 +1,17 @@
+/* SPDX-License-Identifier: LGPL-2.1+
+ * Copyright © 2019 VMware, Inc. */
+#pragma once
+
+#include "conf-parser.h"
+#include "qdisc.h"
+
+typedef struct FairQueueTrafficPolicing {
+        QDisc meta;
+
+        uint32_t limit;
+} FairQueueTrafficPolicing;
+
+DEFINE_QDISC_CAST(FQ, FairQueueTrafficPolicing);
+extern const QDiscVTable fq_vtable;
+
+CONFIG_PARSER_PROTOTYPE(config_parse_tc_fair_queue_traffic_policing_packet_limit);

diff --git a/src/network/tc/qdisc.c b/src/network/tc/qdisc.c
index ee5aafe5e9fd381083a30244711433c899c1e9eb..118754a91ceb08ad8797c7f319e310c68a1f0647 100644 (file)
--- a/src/network/tc/qdisc.c
+++ b/src/network/tc/qdisc.c
@@ -14,6 +14,7 @@
 #include "string-util.h"
 
 const QDiscVTable * const qdisc_vtable[_QDISC_KIND_MAX] = {
+        [QDISC_KIND_FQ] = &fq_vtable,
         [QDISC_KIND_FQ_CODEL] = &fq_codel_vtable,
         [QDISC_KIND_NETEM] = &netem_vtable,
         [QDISC_KIND_SFQ] = &sfq_vtable,

diff --git a/src/network/tc/qdisc.h b/src/network/tc/qdisc.h
index 8e0ae28855fe5e1bb60900754a18b3742b14962a..cef540a4d53d94824a8b2e45a042eefcdcc1269c 100644 (file)
--- a/src/network/tc/qdisc.h
+++ b/src/network/tc/qdisc.h
@@ -8,6 +8,7 @@
 #include "networkd-util.h"
 
 typedef enum QDiscKind {
+        QDISC_KIND_FQ,
         QDISC_KIND_FQ_CODEL,
         QDISC_KIND_NETEM,
         QDISC_KIND_SFQ,
@@ -62,6 +63,7 @@ DEFINE_NETWORK_SECTION_FUNCTIONS(QDisc, qdisc_free);
 CONFIG_PARSER_PROTOTYPE(config_parse_tc_qdiscs_parent);
 
 #include "fq-codel.h"
+#include "fq.h"
 #include "netem.h"
 #include "sfq.h"
 #include "tbf.h"

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