network: TC - introduce BFIFO

bfifo - Byte limited First In, First Out queue

diff --git a/man/systemd.network.xml b/man/systemd.network.xml
index 516744c5f7159302c091ee707c513a2ae832c097..6d90c215ab0467d8de73aa9903e3aafdc09df889 100644 (file)
--- a/man/systemd.network.xml
+++ b/man/systemd.network.xml
@@ -2597,6 +2597,40 @@
     </variablelist>
   </refsect1>
 
+  <refsect1>
+    <title>[BFIFO] Section Options</title>
+    <para>The <literal>[BFIFO]</literal> section manages the queueing discipline (qdisc) of
+    Byte limited Packet First In First Out (bfifo).</para>
+
+    <variablelist class='network-directives'>
+      <varlistentry>
+        <term><varname>Parent=</varname></term>
+        <listitem>
+          <para>Specifies the parent Queueing Discipline (qdisc). Takes one of <literal>root</literal>,
+          <literal>clsact</literal> or <literal>ingress</literal>. Defaults to <literal>root</literal>.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><varname>Handle=</varname></term>
+        <listitem>
+          <para>Specifies the major number of unique identifier of the qdisc, known as the handle.
+          Takes a number in hexadecimal ranges 1 to ffff. Defaults to unset.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><varname>LimitSize=</varname></term>
+        <listitem>
+          <para>Specifies the hard limit on the FIFO size in bytes. The size limit (a buffer size) to prevent it
+          from overflowing in case it is unable to dequeue packets as quickly as it receives them. When this limit
+          is reached, incoming packets are dropped. When suffixed with K, M, or G, the specified size is parsed as
+          Kilobytes, Megabytes, or Gigabytes, respectively, to the base of 1024. Defaults to unset and kernel's default is used.</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+
   <refsect1>
     <title>[PFIFO] Section Options</title>
     <para>The <literal>[PFIFO]</literal> section manages the queueing discipline (qdisc) of

diff --git a/src/network/networkd-network-gperf.gperf b/src/network/networkd-network-gperf.gperf
index 5d7150c58a29f2753f9c11e7c82b15b57f411143..223d245a0f5281677f7d407cd26a8e3b9721fab1 100644 (file)
--- a/src/network/networkd-network-gperf.gperf
+++ b/src/network/networkd-network-gperf.gperf
@@ -258,6 +258,9 @@ CAN.TripleSampling,                          config_parse_tristate,
 CAN.Termination,                             config_parse_tristate,                                    0,                             offsetof(Network, can_termination)
 QDisc.Parent,                                config_parse_qdisc_parent,                                _QDISC_KIND_INVALID,           0
 QDisc.Handle,                                config_parse_qdisc_handle,                                _QDISC_KIND_INVALID,           0
+BFIFO.Parent,                                config_parse_qdisc_parent,                                QDISC_KIND_BFIFO,              0
+BFIFO.Handle,                                config_parse_qdisc_handle,                                QDISC_KIND_BFIFO,              0
+BFIFO.LimitSize,                             config_parse_bfifo_size,                                  QDISC_KIND_BFIFO,              0
 CAKE.Parent,                                 config_parse_qdisc_parent,                                QDISC_KIND_CAKE,               0
 CAKE.Handle,                                 config_parse_qdisc_handle,                                QDISC_KIND_CAKE,               0
 CAKE.Bandwidth,                              config_parse_cake_bandwidth,                              QDISC_KIND_CAKE,               0
@@ -276,7 +279,7 @@ DeficitRoundRobinSchedulerClass.ClassId,     config_parse_tclass_classid,
 DeficitRoundRobinSchedulerClass.Quantum,     config_parse_drr_size,                                    TCLASS_KIND_DRR,               0
 PFIFO.Parent,                                config_parse_qdisc_parent,                                QDISC_KIND_PFIFO,              0
 PFIFO.Handle,                                config_parse_qdisc_handle,                                QDISC_KIND_PFIFO,              0
-PFIFO.PacketLimit,                           config_parse_fifo_size,                                   QDISC_KIND_PFIFO,              0
+PFIFO.PacketLimit,                           config_parse_pfifo_size,                                  QDISC_KIND_PFIFO,              0
 FairQueueing.Parent,                         config_parse_qdisc_parent,                                QDISC_KIND_FQ,                 0
 FairQueueing.Handle,                         config_parse_qdisc_handle,                                QDISC_KIND_FQ,                 0
 FairQueueing.PacketLimit,                    config_parse_fair_queueing_u32,                           QDISC_KIND_FQ,                 0

diff --git a/src/network/networkd-network.c b/src/network/networkd-network.c
index cf423e274a22fc3a6d8d34a69983b9ca377c2b88..6e4eb39f86f216bf7f38b8f3c862b3bf17d3e350 100644 (file)
--- a/src/network/networkd-network.c
+++ b/src/network/networkd-network.c
@@ -486,6 +486,7 @@ int network_load_one(Manager *manager, OrderedHashmap **networks, const char *fi
                               "TrafficControlQueueingDiscipline\0"
                               "CAN\0"
                               "QDisc\0"
+                              "BFIFO\0"
                               "CAKE\0"
                               "ControlledDelay\0"
                               "DeficitRoundRobinScheduler\0"

diff --git a/src/network/tc/fifo.c b/src/network/tc/fifo.c
index 2d2a863e3a084e7dd44ef8b40654001f26f45dc0..7978f7b9223db07b284fd3ea86011eda4c25390d 100644 (file)
--- a/src/network/tc/fifo.c
+++ b/src/network/tc/fifo.c
@@ -19,7 +19,16 @@ static int fifo_fill_message(Link *link, QDisc *qdisc, sd_netlink_message *req)
         assert(qdisc);
         assert(req);
 
-        fifo = PFIFO(qdisc);
+        switch(qdisc->kind) {
+        case QDISC_KIND_PFIFO:
+                fifo = PFIFO(qdisc);
+                break;
+        case QDISC_KIND_BFIFO:
+                fifo = BFIFO(qdisc);
+                break;
+        default:
+                assert_not_reached("Invalid QDisc kind.");
+        }
 
         opt.limit = fifo->limit;
 
@@ -30,7 +39,7 @@ static int fifo_fill_message(Link *link, QDisc *qdisc, sd_netlink_message *req)
         return 0;
 }
 
-int config_parse_fifo_size(
+int config_parse_pfifo_size(
                 const char *unit,
                 const char *filename,
                 unsigned line,
@@ -80,8 +89,73 @@ int config_parse_fifo_size(
         return 0;
 }
 
+int config_parse_bfifo_size(
+                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;
+        FirstInFirstOut *fifo;
+        uint64_t u;
+        int r;
+
+        assert(filename);
+        assert(lvalue);
+        assert(rvalue);
+        assert(data);
+
+        r = qdisc_new_static(QDISC_KIND_BFIFO, 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");
+
+        fifo = BFIFO(qdisc);
+
+        if (isempty(rvalue)) {
+                fifo->limit = 0;
+
+                qdisc = NULL;
+                return 0;
+        }
+
+        r = parse_size(rvalue, 1000, &u);
+        if (r < 0) {
+                log_syntax(unit, LOG_ERR, filename, line, r,
+                           "Failed to parse '%s=', ignoring assignment: %s",
+                           lvalue, rvalue);
+                return 0;
+        }
+        if (u > UINT32_MAX) {
+                log_syntax(unit, LOG_ERR, filename, line, 0, "Invalid '%s=', ignoring assignment: %s",
+                           lvalue, rvalue);
+                return 0;
+        }
+
+        fifo->limit = (uint32_t) u;
+
+        qdisc = NULL;
+        return 0;
+}
+
+
 const QDiscVTable pfifo_vtable = {
         .object_size = sizeof(FirstInFirstOut),
         .tca_kind = "pfifo",
         .fill_message = fifo_fill_message,
 };
+
+const QDiscVTable bfifo_vtable = {
+       .object_size = sizeof(FirstInFirstOut),
+       .tca_kind = "bfifo",
+       .fill_message = fifo_fill_message,
+};

diff --git a/src/network/tc/fifo.h b/src/network/tc/fifo.h
index 02976568dde9cf64bae9b0ae3b73acf8fe0112d4..7e6a94f16cf9dbb8670963f2286b2dd60205d990 100644 (file)
--- a/src/network/tc/fifo.h
+++ b/src/network/tc/fifo.h
@@ -12,6 +12,10 @@ typedef struct FirstInFirstOut {
 } FirstInFirstOut;
 
 DEFINE_QDISC_CAST(PFIFO, FirstInFirstOut);
+DEFINE_QDISC_CAST(BFIFO, FirstInFirstOut);
+
 extern const QDiscVTable pfifo_vtable;
+extern const QDiscVTable bfifo_vtable;
 
-CONFIG_PARSER_PROTOTYPE(config_parse_fifo_size);
+CONFIG_PARSER_PROTOTYPE(config_parse_pfifo_size);
+CONFIG_PARSER_PROTOTYPE(config_parse_bfifo_size);

diff --git a/src/network/tc/qdisc.c b/src/network/tc/qdisc.c
index 06204063ebfb671be8e62af102f6741d4609e50f..b6acc29f111515b7b3591a95125a5db13e6de391 100644 (file)
--- a/src/network/tc/qdisc.c
+++ b/src/network/tc/qdisc.c
@@ -16,6 +16,7 @@
 #include "tc-util.h"
 
 const QDiscVTable * const qdisc_vtable[_QDISC_KIND_MAX] = {
+        [QDISC_KIND_BFIFO] = &bfifo_vtable,
         [QDISC_KIND_CAKE] = &cake_vtable,
         [QDISC_KIND_CODEL] = &codel_vtable,
         [QDISC_KIND_DRR] = &drr_vtable,

diff --git a/src/network/tc/qdisc.h b/src/network/tc/qdisc.h
index dea3847728f141e18741a2fd223d43aa9a837a31..31a3ca34142dd765441f6d74d87afb8ad8eab5c8 100644 (file)
--- a/src/network/tc/qdisc.h
+++ b/src/network/tc/qdisc.h
@@ -9,6 +9,7 @@
 #include "tc.h"
 
 typedef enum QDiscKind {
+        QDISC_KIND_BFIFO,
         QDISC_KIND_CAKE,
         QDISC_KIND_CODEL,
         QDISC_KIND_DRR,

diff --git a/test/fuzz/fuzz-network-parser/directives.network b/test/fuzz/fuzz-network-parser/directives.network
index 6ea18d7dc96d1ec3121f0520f4933681ebd3812a..c4d13a73dc7ab0aa6ca067d76ae7cb578d240d88 100644 (file)
--- a/test/fuzz/fuzz-network-parser/directives.network
+++ b/test/fuzz/fuzz-network-parser/directives.network
@@ -356,6 +356,10 @@ ClassId=
 Priority=
 Rate=
 CeilRate=
+[BFIFO]
+Parent=
+Handle=
+LimitSize=
 [PFIFO]
 Parent=
 Handle=