fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-09 05:58:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

merge: branch 'bg/rto-min'

Browse source 
platform: always set the lock flag for RTO_MIN

https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/2179
This commit is contained in:
Beniamino Galvani 2025-04-14 14:43:09 +00:00
commit 065fd3e046
5 changed files with 65 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/core/NetworkManagerUtils.c
View file

@ -1509,7 +1509,6 @@ nm_utils_ip_route_attribute_to_platform(int addr_family,
GET_ATTR(NM_IP_ROUTE_ATTRIBUTE_INITCWND, r->initcwnd, UINT32, uint32, 0); GET_ATTR(NM_IP_ROUTE_ATTRIBUTE_INITCWND, r->initcwnd, UINT32, uint32, 0);
GET_ATTR(NM_IP_ROUTE_ATTRIBUTE_INITRWND, r->initrwnd, UINT32, uint32, 0); GET_ATTR(NM_IP_ROUTE_ATTRIBUTE_INITRWND, r->initrwnd, UINT32, uint32, 0);
GET_ATTR(NM_IP_ROUTE_ATTRIBUTE_MTU, r->mtu, UINT32, uint32, 0); GET_ATTR(NM_IP_ROUTE_ATTRIBUTE_MTU, r->mtu, UINT32, uint32, 0);
GET_ATTR(NM_IP_ROUTE_ATTRIBUTE_RTO_MIN, r->rto_min, UINT32, uint32, 0);
GET_ATTR(NM_IP_ROUTE_ATTRIBUTE_QUICKACK, r->quickack, BOOLEAN, boolean, FALSE); GET_ATTR(NM_IP_ROUTE_ATTRIBUTE_QUICKACK, r->quickack, BOOLEAN, boolean, FALSE);
GET_ATTR(NM_IP_ROUTE_ATTRIBUTE_LOCK_WINDOW, r->lock_window, BOOLEAN, boolean, FALSE); GET_ATTR(NM_IP_ROUTE_ATTRIBUTE_LOCK_WINDOW, r->lock_window, BOOLEAN, boolean, FALSE);
GET_ATTR(NM_IP_ROUTE_ATTRIBUTE_LOCK_CWND, r->lock_cwnd, BOOLEAN, boolean, FALSE); GET_ATTR(NM_IP_ROUTE_ATTRIBUTE_LOCK_CWND, r->lock_cwnd, BOOLEAN, boolean, FALSE);
@ -1518,6 +1517,18 @@ nm_utils_ip_route_attribute_to_platform(int addr_family,
GET_ATTR(NM_IP_ROUTE_ATTRIBUTE_LOCK_MTU, r->lock_mtu, BOOLEAN, boolean, FALSE); GET_ATTR(NM_IP_ROUTE_ATTRIBUTE_LOCK_MTU, r->lock_mtu, BOOLEAN, boolean, FALSE);
GET_ATTR(NM_IP_ROUTE_ATTRIBUTE_LOCK_ADVMSS, r->lock_mss, BOOLEAN, boolean, FALSE); GET_ATTR(NM_IP_ROUTE_ATTRIBUTE_LOCK_ADVMSS, r->lock_mss, BOOLEAN, boolean, FALSE);
{
GVariant *_variant = nm_ip_route_get_attribute(s_route, NM_IP_ROUTE_ATTRIBUTE_RTO_MIN);
if (_variant && g_variant_is_of_type(_variant, G_VARIANT_TYPE_UINT32)) {
r->rto_min = g_variant_get_uint32(_variant);
r->rto_min_set = TRUE;
} else {
r->rto_min = 0;
r->rto_min_set = FALSE;
}
}
if ((variant = nm_ip_route_get_attribute(s_route, NM_IP_ROUTE_ATTRIBUTE_SRC)) if ((variant = nm_ip_route_get_attribute(s_route, NM_IP_ROUTE_ATTRIBUTE_SRC))
&& g_variant_is_of_type(variant, G_VARIANT_TYPE_STRING)) { && g_variant_is_of_type(variant, G_VARIANT_TYPE_STRING)) {
if (inet_pton(addr_family, g_variant_get_string(variant, NULL), &addr) == 1) { if (inet_pton(addr_family, g_variant_get_string(variant, NULL), &addr) == 1) {

33
src/core/platform/tests/test-route.c
View file

@ -640,22 +640,23 @@ test_ip4_route_options(gconstpointer test_data)
switch (TEST_IDX) { switch (TEST_IDX) {
case 1: case 1:
rts_add[rts_n++] = ((NMPlatformIP4Route) { rts_add[rts_n++] = ((NMPlatformIP4Route) {
.ifindex = IFINDEX, .ifindex = IFINDEX,
.rt_source = NM_IP_CONFIG_SOURCE_USER, .rt_source = NM_IP_CONFIG_SOURCE_USER,
.network = nmtst_inet4_from_string("172.16.1.0"), .network = nmtst_inet4_from_string("172.16.1.0"),
.plen = 24, .plen = 24,
.metric = 20, .metric = 20,
.tos = 0x28, .tos = 0x28,
.window = 10000, .window = 10000,
.cwnd = 16, .cwnd = 16,
.initcwnd = 30, .initcwnd = 30,
.initrwnd = 50, .initrwnd = 50,
.mtu = 1350, .mtu = 1350,
.lock_cwnd = TRUE, .lock_cwnd = TRUE,
.mss = 1300, .mss = 1300,
.quickack = TRUE, .quickack = TRUE,
.rto_min = 1000, .rto_min = 1000,
.n_nexthops = 1, .rto_min_set = TRUE,
.n_nexthops = 1,
}); });
break; break;
case 2: case 2:

45
src/libnm-platform/nm-linux-platform.c
View file

@ -4037,14 +4037,15 @@ _new_from_nl_route(const struct nlmsghdr *nlh, gboolean id_only, ParseNlmsgIter
NMPlatformIP4RtNextHop *v4_nh_extra_nexthops = v4_nh_extra_nexthops_stack; NMPlatformIP4RtNextHop *v4_nh_extra_nexthops = v4_nh_extra_nexthops_stack;
guint v4_nh_extra_alloc = G_N_ELEMENTS(v4_nh_extra_nexthops_stack); guint v4_nh_extra_alloc = G_N_ELEMENTS(v4_nh_extra_nexthops_stack);
guint32 mss; guint32 mss;
guint32 window = 0; guint32 window = 0;
guint32 cwnd = 0; guint32 cwnd = 0;
guint32 initcwnd = 0; guint32 initcwnd = 0;
guint32 initrwnd = 0; guint32 initrwnd = 0;
guint32 mtu = 0; guint32 mtu = 0;
guint32 rto_min = 0; guint32 rto_min = 0;
guint32 lock = 0; guint32 lock = 0;
gboolean quickack = FALSE; gboolean quickack = FALSE;
gboolean rto_min_set = FALSE;
nm_assert((parse_nlmsg_iter->iter_more && parse_nlmsg_iter->ip6_route.next_multihop > 0) nm_assert((parse_nlmsg_iter->iter_more && parse_nlmsg_iter->ip6_route.next_multihop > 0)
|| (!parse_nlmsg_iter->iter_more && parse_nlmsg_iter->ip6_route.next_multihop == 0)); || (!parse_nlmsg_iter->iter_more && parse_nlmsg_iter->ip6_route.next_multihop == 0));
@ -4290,8 +4291,10 @@ rta_multipath_done:
initrwnd = nla_get_u32(mtb[RTAX_INITRWND]); initrwnd = nla_get_u32(mtb[RTAX_INITRWND]);
if (mtb[RTAX_MTU]) if (mtb[RTAX_MTU])
mtu = nla_get_u32(mtb[RTAX_MTU]); mtu = nla_get_u32(mtb[RTAX_MTU]);
if (mtb[RTAX_RTO_MIN]) if (mtb[RTAX_RTO_MIN] && NM_FLAGS_HAS(lock, 1U << RTAX_RTO_MIN)) {
rto_min = nla_get_u32(mtb[RTAX_RTO_MIN]); rto_min = nla_get_u32(mtb[RTAX_RTO_MIN]);
rto_min_set = TRUE;
}
if (mtb[RTAX_QUICKACK]) if (mtb[RTAX_QUICKACK])
quickack = !!nla_get_u32(mtb[RTAX_QUICKACK]); quickack = !!nla_get_u32(mtb[RTAX_QUICKACK]);
} }
@ -4362,6 +4365,7 @@ rta_multipath_done:
obj->ip_route.initcwnd = initcwnd; obj->ip_route.initcwnd = initcwnd;
obj->ip_route.initrwnd = initrwnd; obj->ip_route.initrwnd = initrwnd;
obj->ip_route.rto_min = rto_min; obj->ip_route.rto_min = rto_min;
obj->ip_route.rto_min_set = rto_min_set;
obj->ip_route.quickack = quickack; obj->ip_route.quickack = quickack;
obj->ip_route.mtu = mtu; obj->ip_route.mtu = mtu;
obj->ip_route.lock_window = NM_FLAGS_HAS(lock, 1 << RTAX_WINDOW); obj->ip_route.lock_window = NM_FLAGS_HAS(lock, 1 << RTAX_WINDOW);
@ -5634,12 +5638,19 @@ nla_put_failure:
static guint32 static guint32
ip_route_get_lock_flag(const NMPlatformIPRoute *route) ip_route_get_lock_flag(const NMPlatformIPRoute *route)
{ {
return (((guint32) route->lock_window) << RTAX_WINDOW) guint32 ret;
| (((guint32) route->lock_cwnd) << RTAX_CWND)
| (((guint32) route->lock_initcwnd) << RTAX_INITCWND) ret = (((guint32) route->lock_window) << RTAX_WINDOW)
| (((guint32) route->lock_initrwnd) << RTAX_INITRWND) | (((guint32) route->lock_cwnd) << RTAX_CWND)
| (((guint32) route->lock_mtu) << RTAX_MTU) | (((guint32) route->lock_initcwnd) << RTAX_INITCWND)
| (((guint32) route->lock_mss) << RTAX_ADVMSS); | (((guint32) route->lock_initrwnd) << RTAX_INITRWND)
| (((guint32) route->lock_mtu) << RTAX_MTU)
| (((guint32) route->lock_mss) << RTAX_ADVMSS);
/* the rto-min value is ignored by kernel unless the lock flag is set */
ret |= (((guint32) route->rto_min_set) << RTAX_RTO_MIN);
return ret;
} }
static gboolean static gboolean
@ -5803,7 +5814,7 @@ _nl_msg_new_route(uint16_t nlmsg_type, uint16_t nlmsg_flags, const NMPObject *ob
NLA_PUT_U32(msg, RTAX_INITRWND, obj->ip_route.initrwnd); NLA_PUT_U32(msg, RTAX_INITRWND, obj->ip_route.initrwnd);
if (obj->ip_route.mtu) if (obj->ip_route.mtu)
NLA_PUT_U32(msg, RTAX_MTU, obj->ip_route.mtu); NLA_PUT_U32(msg, RTAX_MTU, obj->ip_route.mtu);
if (obj->ip_route.rto_min) if (obj->ip_route.rto_min_set)
NLA_PUT_U32(msg, RTAX_RTO_MIN, obj->ip_route.rto_min); NLA_PUT_U32(msg, RTAX_RTO_MIN, obj->ip_route.rto_min);
if (obj->ip_route.quickack) if (obj->ip_route.quickack)
NLA_PUT_U32(msg, RTAX_QUICKACK, obj->ip_route.quickack); NLA_PUT_U32(msg, RTAX_QUICKACK, obj->ip_route.quickack);

5
src/libnm-platform/nm-platform.c
View file

@ -7315,8 +7315,9 @@ nm_platform_ip4_route_to_string_full(const NMPlatformIP4Route *route,
route->lock_initrwnd ? "lock " : "", route->lock_initrwnd ? "lock " : "",
route->initrwnd) route->initrwnd)
: "", : "",
route->rto_min ? nm_sprintf_buf(str_rto_min, " rto_min %" G_GUINT32_FORMAT, route->rto_min) route->rto_min_set
: "", ? nm_sprintf_buf(str_rto_min, " rto_min %" G_GUINT32_FORMAT, route->rto_min)
: "",
route->quickack ? " quickack 1" : "", route->quickack ? " quickack 1" : "",
route->mtu || route->lock_mtu ? nm_sprintf_buf(str_mtu, route->mtu || route->lock_mtu ? nm_sprintf_buf(str_mtu,
" mtu %s%" G_GUINT32_FORMAT, " mtu %s%" G_GUINT32_FORMAT,

5
src/libnm-platform/nm-platform.h
View file

@ -314,6 +314,7 @@ guint _nm_platform_signal_id_get(NMPlatformSignalIdType signal_type);
guint32 initrwnd; \ guint32 initrwnd; \
\ \
/* RTA_METRICS.RTAX_RTO_MIN (iproute2: rto_min) */ \ /* RTA_METRICS.RTAX_RTO_MIN (iproute2: rto_min) */ \
/* Valid only when 'rto_min_set' is true. */ \
guint32 rto_min; \ guint32 rto_min; \
\ \
/* RTA_METRICS.RTAX_MTU (iproute2: mtu) */ \ /* RTA_METRICS.RTAX_MTU (iproute2: mtu) */ \
@ -367,6 +368,10 @@ guint _nm_platform_signal_id_get(NMPlatformSignalIdType signal_type);
/* RTA_METRICS.RTAX_QUICKACK (iproute2: quickack) */ \ /* RTA_METRICS.RTAX_QUICKACK (iproute2: quickack) */ \
bool quickack : 1; \ bool quickack : 1; \
\ \
/* RTA_METRICS.RTAX_RTO_MIN (iproute2: rto_min) */ \
/* If true, the 'rto_min' value is valid. */ \
bool rto_min_set : 1; \
\
/* if TRUE, the "metric" field is interpreted as an offset that is added to a default /* if TRUE, the "metric" field is interpreted as an offset that is added to a default
* metric. For example, form a DHCP lease we don't know the actually used metric, because * metric. For example, form a DHCP lease we don't know the actually used metric, because
* that is determined by upper layers (the configuration). However, we have a default * that is determined by upper layers (the configuration). However, we have a default