mirror of
https://github.com/systemd/systemd-stable.git
synced 2025-03-13 12:58:20 +03:00
network tc: Add support to conkfigure CoDel - Controlled-Delay Active Queue Management algorithm
``` $ 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 ```
This commit is contained in:
parent
d808102008
commit
4e5ef14919
@ -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>
|
||||
|
||||
|
@ -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
|
||||
|
@ -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)
|
||||
|
91
src/network/tc/fq-codel.c
Normal file
91
src/network/tc/fq-codel.c
Normal file
@ -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;
|
||||
}
|
17
src/network/tc/fq-codel.h
Normal file
17
src/network/tc/fq-codel.h
Normal file
@ -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);
|
@ -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);
|
||||
|
@ -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);
|
||||
|
@ -278,3 +278,4 @@ TokenBufferFilterMPUBytes=
|
||||
TokenBufferFilterPeakRate=
|
||||
TokenBufferFilterLatencySec=
|
||||
StochasticFairnessQueueingPerturbPeriodSec=
|
||||
FairQueuingControlledDelayPacketLimit=
|
||||
|
Loading…
x
Reference in New Issue
Block a user