SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #34251 from DaanDeMeyer/multiq

Browse Source 
network: Add support for multiq qdisc
This commit is contained in:
Daan De Meyer
2024-09-04 16:03:32 +02:00
committed by GitHub
parent 5d6d2d6ced 2b9ced9072
commit 144e53b333
13 changed files with 126 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
man/systemd.network.xml
+20
View File
@@ -6064,6 +6064,26 @@ ServerAddress=192.168.0.1/24</programlisting>
</variablelist>
</refsect1>
<refsect1>
<title>[ClassfulMultiQueueing] Section Options</title>
<para>The [ClassfulMultiQueueing] section manages the queueing discipline (qdisc) of Classful Multi Queueing (mq).</para>
<variablelist class='network-directives'>
<xi:include href="tc.xml" xpointer="qdisc-parent" />
<xi:include href="tc.xml" xpointer="qdisc-handle" />
</variablelist>
</refsect1>
<refsect1>
<title>[BandMultiQueueing] Section Options</title>
<para>The [BandMultiQueueing] section manages the queueing discipline (qdisc) of Band Multi Queueing (multiq).</para>
<variablelist class='network-directives'>
<xi:include href="tc.xml" xpointer="qdisc-parent" />
<xi:include href="tc.xml" xpointer="qdisc-handle" />
</variablelist>
</refsect1>
<refsect1>
<title>[HeavyHitterFilter] Section Options</title>
<para>The [HeavyHitterFilter] section manages the queueing discipline (qdisc) of Heavy Hitter Filter
src/network/meson.build
+2
View File
@@ -93,6 +93,8 @@ sources = files(
'tc/gred.c',
'tc/hhf.c',
'tc/htb.c',
'tc/mq.c',
'tc/multiq.c',
'tc/netem.c',
'tc/pie.c',
'tc/qdisc.c',
src/network/networkd-network-gperf.gperf
+4
View File
@@ -552,6 +552,10 @@ HierarchyTokenBucketClass.Rate, config_parse_hierarchy_token_bucket
HierarchyTokenBucketClass.CeilRate, config_parse_hierarchy_token_bucket_class_rate, TCLASS_KIND_HTB, 0
HierarchyTokenBucketClass.BufferBytes, config_parse_hierarchy_token_bucket_class_size, TCLASS_KIND_HTB, 0
HierarchyTokenBucketClass.CeilBufferBytes, config_parse_hierarchy_token_bucket_class_size, TCLASS_KIND_HTB, 0
ClassfulMultiQueueing.Parent, config_parse_qdisc_parent, QDISC_KIND_MQ, 0
ClassfulMultiQueueing.Handle, config_parse_qdisc_handle, QDISC_KIND_MQ, 0
BandMultiQueueing.Parent, config_parse_qdisc_parent, QDISC_KIND_MULTIQ, 0
BandMultiQueueing.Handle, config_parse_qdisc_handle, QDISC_KIND_MULTIQ, 0
NetworkEmulator.Parent, config_parse_qdisc_parent, QDISC_KIND_NETEM, 0
NetworkEmulator.Handle, config_parse_qdisc_handle, QDISC_KIND_NETEM, 0
NetworkEmulator.DelaySec, config_parse_network_emulator_delay, QDISC_KIND_NETEM, 0
src/network/networkd-network.c
+2
View File
@@ -551,6 +551,8 @@ int network_load_one(Manager *manager, OrderedHashmap **networks, const char *fi
"HeavyHitterFilter\0"
"HierarchyTokenBucket\0"
"HierarchyTokenBucketClass\0"
"ClassfulMultiQueueing\0"
"BandMultiQueueing\0"
"NetworkEmulator\0"
"PFIFO\0"
"PFIFOFast\0"
src/network/tc/mq.c
+8
View File
@@ -0,0 +1,8 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include "mq.h"
const QDiscVTable mq_vtable = {
.object_size = sizeof(ClassfulMultiQueueing),
.tca_kind = "mq",
};
src/network/tc/mq.h
+11
View File
@@ -0,0 +1,11 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include "qdisc.h"
typedef struct ClassfulMultiQueueing {
QDisc meta;
} ClassfulMultiQueueing;
DEFINE_QDISC_CAST(MQ, ClassfulMultiQueueing);
extern const QDiscVTable mq_vtable;
src/network/tc/multiq.c
+19
View File
@@ -0,0 +1,19 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include "multiq.h"
static int multi_queueing_fill_message(Link *link, QDisc *qdisc, sd_netlink_message *req) {
struct tc_multiq_qopt opt = {};
assert(req);
/* It looks weird, but the multiq qdisc initialization wants to receive a tc_multiq_qopt attr even
* though it doesn't do anything with it. */
return sd_netlink_message_append_data(req, TCA_OPTIONS, &opt, sizeof(opt));
}
const QDiscVTable multiq_vtable = {
.object_size = sizeof(BandMultiQueueing),
.tca_kind = "multiq",
.fill_message = multi_queueing_fill_message,
};
src/network/tc/multiq.h
+11
View File
@@ -0,0 +1,11 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include "qdisc.h"
typedef struct BandMultiQueueing {
QDisc meta;
} BandMultiQueueing;
DEFINE_QDISC_CAST(MULTIQ, BandMultiQueueing);
extern const QDiscVTable multiq_vtable;
src/network/tc/qdisc.c
+2
View File
@@ -30,6 +30,8 @@ const QDiscVTable * const qdisc_vtable[_QDISC_KIND_MAX] = {
[QDISC_KIND_GRED] = &gred_vtable,
[QDISC_KIND_HHF] = &hhf_vtable,
[QDISC_KIND_HTB] = &htb_vtable,
[QDISC_KIND_MQ] = &mq_vtable,
[QDISC_KIND_MULTIQ] = &multiq_vtable,
[QDISC_KIND_NETEM] = &netem_vtable,
[QDISC_KIND_PIE] = &pie_vtable,
[QDISC_KIND_QFQ] = &qfq_vtable,
src/network/tc/qdisc.h
+4
View File
@@ -21,6 +21,8 @@ typedef enum QDiscKind {
QDISC_KIND_GRED,
QDISC_KIND_HHF,
QDISC_KIND_HTB,
QDISC_KIND_MQ,
QDISC_KIND_MULTIQ,
QDISC_KIND_NETEM,
QDISC_KIND_PFIFO,
QDISC_KIND_PFIFO_FAST,
@@ -106,6 +108,8 @@ CONFIG_PARSER_PROTOTYPE(config_parse_qdisc_handle);
#include "gred.h"
#include "hhf.h"
#include "htb.h"
#include "mq.h"
#include "multiq.h"
#include "pie.h"
#include "qfq.h"
#include "netem.h"
test/test-network/conf/25-qdisc-mq.network
+12
View File
@@ -0,0 +1,12 @@
# SPDX-License-Identifier: LGPL-2.1-or-later
[Match]
Name=testtun99
Name=testtap99
[Network]
LinkLocalAddressing=yes
IPv6AcceptRA=no
[ClassfulMultiQueueing]
Parent=root
Handle=0002
test/test-network/conf/25-qdisc-multiq.network
+12
View File
@@ -0,0 +1,12 @@
# SPDX-License-Identifier: LGPL-2.1-or-later
[Match]
Name=testtun99
Name=testtap99
[Network]
LinkLocalAddressing=yes
IPv6AcceptRA=no
[BandMultiQueueing]
Parent=root
Handle=0002
test/test-network/systemd-networkd-tests.py
+19
View File
@@ -4648,6 +4648,25 @@ class NetworkdTCTests(unittest.TestCase, Utilities):
print(output)
self.assertRegex(output, 'qdisc ingress')
def test_qdisc_mq(self):
copy_network_unit('25-tun.netdev', '25-tap.netdev', '25-qdisc-mq.network')
start_networkd()
self.wait_online('testtun99:degraded', 'testtap99:degraded')
output = check_output('tc qdisc show dev testtun99')
print(output)
self.assertIn('qdisc mq 2: root', output)
@expectedFailureIfModuleIsNotAvailable('sch_multiq')
def test_qdisc_multiq(self):
copy_network_unit('25-tun.netdev', '25-tap.netdev', '25-qdisc-multiq.network')
start_networkd()
self.wait_online('testtun99:degraded', 'testtap99:degraded')
output = check_output('tc qdisc show dev testtun99')
print(output)
self.assertIn('qdisc multiq 2: root', output)
@expectedFailureIfModuleIsNotAvailable('sch_netem')
def test_qdisc_netem(self):
copy_network_unit('25-qdisc-netem.network', '12-dummy.netdev',