shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-02-24 17:57:34 +03:00
Code

network: Add support for mq qdisc

Browse Source
This commit is contained in:
Daan De Meyer 2024-09-04 13:32:32 +02:00
parent 3f14557ce0
commit 2b9ced9072
10 changed files with 57 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
man/systemd.network.xml
View File

@ -6064,6 +6064,16 @@ 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>

1
src/network/meson.build
View File

@ -93,6 +93,7 @@ sources = files(
'tc/gred.c',
'tc/hhf.c',
'tc/htb.c',
'tc/mq.c',
'tc/multiq.c',
'tc/netem.c',
'tc/pie.c',

2
src/network/networkd-network-gperf.gperf
View File

@ -552,6 +552,8 @@ 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

1
src/network/networkd-network.c
View File

@ -551,6 +551,7 @@ 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"

8
src/network/tc/mq.c Normal file
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",
};

11
src/network/tc/mq.h Normal file
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;

1
src/network/tc/qdisc.c
View File

@ -30,6 +30,7 @@ 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,

2
src/network/tc/qdisc.h
View File

@ -21,6 +21,7 @@ typedef enum QDiscKind {
QDISC_KIND_GRED,
QDISC_KIND_HHF,
QDISC_KIND_HTB,
QDISC_KIND_MQ,
QDISC_KIND_MULTIQ,
QDISC_KIND_NETEM,
QDISC_KIND_PFIFO,
@ -107,6 +108,7 @@ 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"

12
test/test-network/conf/25-qdisc-mq.network Normal file
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

9
test/test-network/systemd-networkd-tests.py
View File

@ -4648,6 +4648,15 @@ 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')