summaryrefslogtreecommitdiff
path: root/libnm-core
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2019-05-01 08:43:31 +0200
committerThomas Haller <thaller@redhat.com>2019-05-07 20:58:17 +0200
commit46a904389bf13a2cfd40888ab2a843827fda7469 (patch)
tree8397586223c80b8ef6759d3a534f607be2b1bed6 /libnm-core
parentb658e3da0825cf6e62e0850d3508dde1dd5c1914 (diff)
downloadNetworkManager-46a904389bf13a2cfd40888ab2a843827fda7469.tar.gz
platform: fix handling of fq_codel's memory limit default value
The memory-limit is an unsigned integer. It is ugly (if not wrong) to compare unsigned values with "-1". When comparing with the default value we must also use an u32 type. Instead add a define NM_PLATFORM_FQ_CODEL_MEMORY_LIMIT_UNSET. Note that like iproute2 we treat NM_PLATFORM_FQ_CODEL_MEMORY_LIMIT_UNSET to indicate to not set TCA_FQ_CODEL_MEMORY_LIMIT in RTM_NEWQDISC. This special value is entirely internal to NetworkManager (or iproute2) and kernel will then choose a default memory limit (of 32MB). So setting NM_PLATFORM_FQ_CODEL_MEMORY_LIMIT_UNSET means to leave it to kernel to choose a value (which then chooses 32MB). See kernel's net/sched/sch_fq_codel.c: static int fq_codel_init(struct Qdisc *sch, struct nlattr *opt, struct netlink_ext_ack *extack) { ... q->memory_limit = 32 << 20; /* 32 MBytes */ static int fq_codel_change(struct Qdisc *sch, struct nlattr *opt, struct netlink_ext_ack *extack) ... if (tb[TCA_FQ_CODEL_MEMORY_LIMIT]) q->memory_limit = min(1U << 31, nla_get_u32(tb[TCA_FQ_CODEL_MEMORY_LIMIT])); Note that not having zero as default value is problematic. In fields like "NMPlatformIP4Route.table_coerced" and "NMPlatformRoutingRule.suppress_prefixlen_inverse" we avoid this problem by storing a coerced value in the structure so that zero is still the default. We don't do that here for memory-limit, so the caller must always explicitly set the value.
Diffstat (limited to 'libnm-core')
-rw-r--r--libnm-core/nm-utils.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/libnm-core/nm-utils.c b/libnm-core/nm-utils.c
index 860bc0079e..833cc30e5b 100644
--- a/libnm-core/nm-utils.c
+++ b/libnm-core/nm-utils.c
@@ -2333,7 +2333,12 @@ static const NMVariantAttributeSpec *const tc_qdisc_fq_codel_spec[] = {
NM_VARIANT_ATTRIBUTE_SPEC_DEFINE ("interval", G_VARIANT_TYPE_UINT32, ),
NM_VARIANT_ATTRIBUTE_SPEC_DEFINE ("quantum", G_VARIANT_TYPE_UINT32, ),
NM_VARIANT_ATTRIBUTE_SPEC_DEFINE ("ce_threshold", G_VARIANT_TYPE_UINT32, ),
+
+ /* kernel clamps the value at 2^31. Possibly such values should be rejected from configuration
+ * as they cannot be configured. Leaving the attribute unspecified causes kernel to choose
+ * a default (currently 32MB). */
NM_VARIANT_ATTRIBUTE_SPEC_DEFINE ("memory", G_VARIANT_TYPE_UINT32, ),
+
NM_VARIANT_ATTRIBUTE_SPEC_DEFINE ("ecn", G_VARIANT_TYPE_BOOLEAN, .no_value = TRUE, ),
NULL,
};