network: add more settings for CoDel
This commit is contained in:
parent
c695dcf929
commit
b078e52855
|
@ -2465,6 +2465,38 @@
|
||||||
</listitem>
|
</listitem>
|
||||||
</varlistentry>
|
</varlistentry>
|
||||||
|
|
||||||
|
<varlistentry>
|
||||||
|
<term><varname>ControlledDelayTargetSec=</varname></term>
|
||||||
|
<listitem>
|
||||||
|
<para>Takes a timespan. Specifies the acceptable minimum standing/persistent queue delay.
|
||||||
|
Defaults to unset and kernel's default is used.</para>
|
||||||
|
</listitem>
|
||||||
|
</varlistentry>
|
||||||
|
|
||||||
|
<varlistentry>
|
||||||
|
<term><varname>ControlledDelayIntervalSec=</varname></term>
|
||||||
|
<listitem>
|
||||||
|
<para>Takes a timespan. This is used to ensure that the measured minimum delay does not
|
||||||
|
become too stale. Defaults to unset and kernel's default is used.</para>
|
||||||
|
</listitem>
|
||||||
|
</varlistentry>
|
||||||
|
|
||||||
|
<varlistentry>
|
||||||
|
<term><varname>ControlledDelayECN=</varname></term>
|
||||||
|
<listitem>
|
||||||
|
<para>Takes a boolean. This can be used to mark packets instead of dropping them. Defaults to
|
||||||
|
unset and kernel's default is used.</para>
|
||||||
|
</listitem>
|
||||||
|
</varlistentry>
|
||||||
|
|
||||||
|
<varlistentry>
|
||||||
|
<term><varname>ControlledDelayCEThresholdSec=</varname></term>
|
||||||
|
<listitem>
|
||||||
|
<para>Takes a timespan. This sets a threshold above which all packets are marked with ECN
|
||||||
|
Congestion Experienced (CE). Defaults to unset and kernel's default is used.</para>
|
||||||
|
</listitem>
|
||||||
|
</varlistentry>
|
||||||
|
|
||||||
<varlistentry>
|
<varlistentry>
|
||||||
<term><varname>FairQueuingControlledDelayPacketLimit=</varname></term>
|
<term><varname>FairQueuingControlledDelayPacketLimit=</varname></term>
|
||||||
<listitem>
|
<listitem>
|
||||||
|
|
|
@ -746,7 +746,11 @@ static const NLTypeSystem rtnl_nexthop_type_system = {
|
||||||
};
|
};
|
||||||
|
|
||||||
static const NLType rtnl_tca_option_data_codel_types[] = {
|
static const NLType rtnl_tca_option_data_codel_types[] = {
|
||||||
[TCA_CODEL_LIMIT] = { .type = NETLINK_TYPE_U32 },
|
[TCA_CODEL_TARGET] = { .type = NETLINK_TYPE_U32 },
|
||||||
|
[TCA_CODEL_LIMIT] = { .type = NETLINK_TYPE_U32 },
|
||||||
|
[TCA_CODEL_INTERVAL] = { .type = NETLINK_TYPE_U32 },
|
||||||
|
[TCA_CODEL_ECN] = { .type = NETLINK_TYPE_U32 },
|
||||||
|
[TCA_CODEL_CE_THRESHOLD] = { .type = NETLINK_TYPE_U32 },
|
||||||
};
|
};
|
||||||
|
|
||||||
static const NLType rtnl_tca_option_data_fq_types[] = {
|
static const NLType rtnl_tca_option_data_fq_types[] = {
|
||||||
|
|
|
@ -279,6 +279,10 @@ TrafficControlQueueingDiscipline.FairQueueTrafficPolicingOrphanMask, con
|
||||||
TrafficControlQueueingDiscipline.FairQueueTrafficPolicingPacing, config_parse_tc_fair_queue_traffic_policing_bool, 0, 0
|
TrafficControlQueueingDiscipline.FairQueueTrafficPolicingPacing, config_parse_tc_fair_queue_traffic_policing_bool, 0, 0
|
||||||
TrafficControlQueueingDiscipline.FairQueueTrafficPolicingCEThresholdSec, config_parse_tc_fair_queue_traffic_policing_usec, 0, 0
|
TrafficControlQueueingDiscipline.FairQueueTrafficPolicingCEThresholdSec, config_parse_tc_fair_queue_traffic_policing_usec, 0, 0
|
||||||
TrafficControlQueueingDiscipline.ControlledDelayPacketLimit, config_parse_tc_controlled_delay_u32, 0, 0
|
TrafficControlQueueingDiscipline.ControlledDelayPacketLimit, config_parse_tc_controlled_delay_u32, 0, 0
|
||||||
|
TrafficControlQueueingDiscipline.ControlledDelayTargetSec, config_parse_tc_controlled_delay_usec, 0, 0
|
||||||
|
TrafficControlQueueingDiscipline.ControlledDelayIntervalSec, config_parse_tc_controlled_delay_usec, 0, 0
|
||||||
|
TrafficControlQueueingDiscipline.ControlledDelayCEThresholdSec, config_parse_tc_controlled_delay_usec, 0, 0
|
||||||
|
TrafficControlQueueingDiscipline.ControlledDelayECN, config_parse_tc_controlled_delay_bool, 0, 0
|
||||||
/* backwards compatibility: do not add new entries to this section */
|
/* backwards compatibility: do not add new entries to this section */
|
||||||
Network.IPv4LL, config_parse_ipv4ll, 0, offsetof(Network, link_local)
|
Network.IPv4LL, config_parse_ipv4ll, 0, offsetof(Network, link_local)
|
||||||
DHCP.ClientIdentifier, config_parse_dhcp_client_identifier, 0, offsetof(Network, dhcp_client_identifier)
|
DHCP.ClientIdentifier, config_parse_dhcp_client_identifier, 0, offsetof(Network, dhcp_client_identifier)
|
||||||
|
|
|
@ -10,6 +10,19 @@
|
||||||
#include "qdisc.h"
|
#include "qdisc.h"
|
||||||
#include "string-util.h"
|
#include "string-util.h"
|
||||||
|
|
||||||
|
static int controlled_delay_init(QDisc *qdisc) {
|
||||||
|
ControlledDelay *cd;
|
||||||
|
|
||||||
|
assert(qdisc);
|
||||||
|
|
||||||
|
cd = CODEL(qdisc);
|
||||||
|
|
||||||
|
cd->ce_threshold_usec = USEC_INFINITY;
|
||||||
|
cd->ecn = -1;
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
static int controlled_delay_fill_message(Link *link, QDisc *qdisc, sd_netlink_message *req) {
|
static int controlled_delay_fill_message(Link *link, QDisc *qdisc, sd_netlink_message *req) {
|
||||||
ControlledDelay *cd;
|
ControlledDelay *cd;
|
||||||
int r;
|
int r;
|
||||||
|
@ -30,6 +43,30 @@ static int controlled_delay_fill_message(Link *link, QDisc *qdisc, sd_netlink_me
|
||||||
return log_link_error_errno(link, r, "Could not append TCA_CODEL_LIMIT attribute: %m");
|
return log_link_error_errno(link, r, "Could not append TCA_CODEL_LIMIT attribute: %m");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (cd->interval_usec > 0) {
|
||||||
|
r = sd_netlink_message_append_u32(req, TCA_CODEL_INTERVAL, cd->interval_usec);
|
||||||
|
if (r < 0)
|
||||||
|
return log_link_error_errno(link, r, "Could not append TCA_CODEL_INTERVAL attribute: %m");
|
||||||
|
}
|
||||||
|
|
||||||
|
if (cd->target_usec > 0) {
|
||||||
|
r = sd_netlink_message_append_u32(req, TCA_CODEL_TARGET, cd->target_usec);
|
||||||
|
if (r < 0)
|
||||||
|
return log_link_error_errno(link, r, "Could not append TCA_CODEL_TARGET attribute: %m");
|
||||||
|
}
|
||||||
|
|
||||||
|
if (cd->ecn >= 0) {
|
||||||
|
r = sd_netlink_message_append_u32(req, TCA_CODEL_ECN, cd->ecn);
|
||||||
|
if (r < 0)
|
||||||
|
return log_link_error_errno(link, r, "Could not append TCA_CODEL_ECN attribute: %m");
|
||||||
|
}
|
||||||
|
|
||||||
|
if (cd->ce_threshold_usec != USEC_INFINITY) {
|
||||||
|
r = sd_netlink_message_append_u32(req, TCA_CODEL_CE_THRESHOLD, cd->ce_threshold_usec);
|
||||||
|
if (r < 0)
|
||||||
|
return log_link_error_errno(link, r, "Could not append TCA_CODEL_CE_THRESHOLD attribute: %m");
|
||||||
|
}
|
||||||
|
|
||||||
r = sd_netlink_message_close_container(req);
|
r = sd_netlink_message_close_container(req);
|
||||||
if (r < 0)
|
if (r < 0)
|
||||||
return log_link_error_errno(link, r, "Could not close container TCA_OPTIONS: %m");
|
return log_link_error_errno(link, r, "Could not close container TCA_OPTIONS: %m");
|
||||||
|
@ -88,8 +125,125 @@ int config_parse_tc_controlled_delay_u32(
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
int config_parse_tc_controlled_delay_usec(
|
||||||
|
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;
|
||||||
|
ControlledDelay *cd;
|
||||||
|
Network *network = data;
|
||||||
|
usec_t *p;
|
||||||
|
int r;
|
||||||
|
|
||||||
|
assert(filename);
|
||||||
|
assert(lvalue);
|
||||||
|
assert(rvalue);
|
||||||
|
assert(data);
|
||||||
|
|
||||||
|
r = qdisc_new_static(QDISC_KIND_CODEL, 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");
|
||||||
|
|
||||||
|
cd = CODEL(qdisc);
|
||||||
|
|
||||||
|
if (streq(lvalue, "ControlledDelayTargetSec"))
|
||||||
|
p = &cd->target_usec;
|
||||||
|
else if (streq(lvalue, "ControlledDelayIntervalSec"))
|
||||||
|
p = &cd->interval_usec;
|
||||||
|
else if (streq(lvalue, "ControlledDelayCEThresholdSec"))
|
||||||
|
p = &cd->ce_threshold_usec;
|
||||||
|
else
|
||||||
|
assert_not_reached("Invalid lvalue");
|
||||||
|
|
||||||
|
if (isempty(rvalue)) {
|
||||||
|
if (streq(lvalue, "ControlledDelayCEThresholdSec"))
|
||||||
|
*p = USEC_INFINITY;
|
||||||
|
else
|
||||||
|
*p = 0;
|
||||||
|
|
||||||
|
qdisc = NULL;
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
r = parse_sec(rvalue, p);
|
||||||
|
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;
|
||||||
|
}
|
||||||
|
|
||||||
|
int config_parse_tc_controlled_delay_bool(
|
||||||
|
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;
|
||||||
|
ControlledDelay *cd;
|
||||||
|
Network *network = data;
|
||||||
|
int r;
|
||||||
|
|
||||||
|
assert(filename);
|
||||||
|
assert(lvalue);
|
||||||
|
assert(rvalue);
|
||||||
|
assert(data);
|
||||||
|
|
||||||
|
r = qdisc_new_static(QDISC_KIND_CODEL, 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");
|
||||||
|
|
||||||
|
cd = CODEL(qdisc);
|
||||||
|
|
||||||
|
if (isempty(rvalue)) {
|
||||||
|
cd->ecn = -1;
|
||||||
|
|
||||||
|
qdisc = NULL;
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
r = parse_boolean(rvalue);
|
||||||
|
if (r < 0) {
|
||||||
|
log_syntax(unit, LOG_ERR, filename, line, r,
|
||||||
|
"Failed to parse '%s=', ignoring assignment: %s",
|
||||||
|
lvalue, rvalue);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
cd->ecn = r;
|
||||||
|
qdisc = NULL;
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
const QDiscVTable codel_vtable = {
|
const QDiscVTable codel_vtable = {
|
||||||
.object_size = sizeof(ControlledDelay),
|
.object_size = sizeof(ControlledDelay),
|
||||||
.tca_kind = "codel",
|
.tca_kind = "codel",
|
||||||
|
.init = controlled_delay_init,
|
||||||
.fill_message = controlled_delay_fill_message,
|
.fill_message = controlled_delay_fill_message,
|
||||||
};
|
};
|
||||||
|
|
|
@ -10,10 +10,15 @@ typedef struct ControlledDelay {
|
||||||
QDisc meta;
|
QDisc meta;
|
||||||
|
|
||||||
uint32_t packet_limit;
|
uint32_t packet_limit;
|
||||||
|
usec_t interval_usec;
|
||||||
|
usec_t target_usec;
|
||||||
|
usec_t ce_threshold_usec;
|
||||||
|
int ecn;
|
||||||
} ControlledDelay;
|
} ControlledDelay;
|
||||||
|
|
||||||
DEFINE_QDISC_CAST(CODEL, ControlledDelay);
|
DEFINE_QDISC_CAST(CODEL, ControlledDelay);
|
||||||
extern const QDiscVTable codel_vtable;
|
extern const QDiscVTable codel_vtable;
|
||||||
|
|
||||||
CONFIG_PARSER_PROTOTYPE(config_parse_tc_controlled_delay_u32);
|
CONFIG_PARSER_PROTOTYPE(config_parse_tc_controlled_delay_u32);
|
||||||
|
CONFIG_PARSER_PROTOTYPE(config_parse_tc_controlled_delay_usec);
|
||||||
|
CONFIG_PARSER_PROTOTYPE(config_parse_tc_controlled_delay_bool);
|
||||||
|
|
|
@ -299,3 +299,7 @@ FairQueueTrafficPolicingOrphanMask=
|
||||||
FairQueueTrafficPolicingPacing=
|
FairQueueTrafficPolicingPacing=
|
||||||
FairQueueTrafficPolicingCEThresholdSec=
|
FairQueueTrafficPolicingCEThresholdSec=
|
||||||
ControlledDelayPacketLimit=
|
ControlledDelayPacketLimit=
|
||||||
|
ControlledDelayTargetSec=
|
||||||
|
ControlledDelayIntervalSec=
|
||||||
|
ControlledDelayCEThresholdSec=
|
||||||
|
ControlledDelayECN=
|
||||||
|
|
Loading…
Reference in a new issue