SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #30967 from yuwata/network-can-required-operstate-for-online

Browse Source 
network: several cleanups for required operstate for online, and change the default for CAN devices
This commit is contained in:
Yu Watanabe
2024-01-17 07:01:24 +09:00
committed by GitHub
parent db75b2aba7 7155ad9532
commit 443afd6c19
10 changed files with 126 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/network/networkd-link.c
+23 -4
View File
@@ -71,6 +71,21 @@
#include "udev-util.h"
#include "vrf.h"
void link_required_operstate_for_online(Link *link, LinkOperationalStateRange *ret) {
assert(link);
assert(ret);
if (link->network && operational_state_range_is_valid(&link->network->required_operstate_for_online))
*ret = link->network->required_operstate_for_online;
else if (link->iftype == ARPHRD_CAN)
*ret = (const LinkOperationalStateRange) {
.min = LINK_OPERSTATE_CARRIER,
.max = LINK_OPERSTATE_CARRIER,
};
else
*ret = LINK_OPERSTATE_RANGE_DEFAULT;
}
bool link_ipv6_enabled(Link *link) {
assert(link);
@@ -1845,12 +1860,16 @@ void link_update_operstate(Link *link, bool also_update_master) {
else
operstate = LINK_OPERSTATE_ENSLAVED;
LinkOperationalStateRange req;
link_required_operstate_for_online(link, &req);
/* Only determine online state for managed links with RequiredForOnline=yes */
if (!link->network || !link->network->required_for_online)
online_state = _LINK_ONLINE_STATE_INVALID;
else if (operstate < link->network->required_operstate_for_online.min ||
operstate > link->network->required_operstate_for_online.max)
else if (!operational_state_is_in_range(operstate, &req))
online_state = LINK_ONLINE_STATE_OFFLINE;
else {
AddressFamily required_family = link->network->required_family_for_online;
bool needs_ipv4 = required_family & ADDRESS_FAMILY_IPV4;
@@ -1861,14 +1880,14 @@ void link_update_operstate(Link *link, bool also_update_master) {
* to offline in the blocks below. */
online_state = LINK_ONLINE_STATE_ONLINE;
if (link->network->required_operstate_for_online.min >= LINK_OPERSTATE_DEGRADED) {
if (req.min >= LINK_OPERSTATE_DEGRADED) {
if (needs_ipv4 && ipv4_address_state < LINK_ADDRESS_STATE_DEGRADED)
online_state = LINK_ONLINE_STATE_OFFLINE;
if (needs_ipv6 && ipv6_address_state < LINK_ADDRESS_STATE_DEGRADED)
online_state = LINK_ONLINE_STATE_OFFLINE;
}
if (link->network->required_operstate_for_online.min >= LINK_OPERSTATE_ROUTABLE) {
if (req.min >= LINK_OPERSTATE_ROUTABLE) {
if (needs_ipv4 && ipv4_address_state < LINK_ADDRESS_STATE_ROUTABLE)
online_state = LINK_ONLINE_STATE_OFFLINE;
if (needs_ipv6 && ipv6_address_state < LINK_ADDRESS_STATE_ROUTABLE)
src/network/networkd-link.h
+2
View File
@@ -259,3 +259,5 @@ int manager_rtnl_process_link(sd_netlink *rtnl, sd_netlink_message *message, Man
int link_flags_to_string_alloc(uint32_t flags, char **ret);
const char *kernel_operstate_to_string(int t) _const_;
void link_required_operstate_for_online(Link *link, LinkOperationalStateRange *ret);
src/network/networkd-network.c
+7 -10
View File
@@ -372,7 +372,7 @@ int network_load_one(Manager *manager, OrderedHashmap **networks, const char *fi
.n_ref = 1,
.required_for_online = -1,
.required_operstate_for_online = LINK_OPERSTATE_RANGE_DEFAULT,
.required_operstate_for_online = LINK_OPERSTATE_RANGE_INVALID,
.activation_policy = _ACTIVATION_POLICY_INVALID,
.group = -1,
.arp = -1,
@@ -1213,8 +1213,6 @@ int config_parse_required_for_online(
void *userdata) {
Network *network = ASSERT_PTR(userdata);
LinkOperationalStateRange range;
bool required = true;
int r;
assert(filename);
@@ -1223,11 +1221,11 @@ int config_parse_required_for_online(
if (isempty(rvalue)) {
network->required_for_online = -1;
network->required_operstate_for_online = LINK_OPERSTATE_RANGE_DEFAULT;
network->required_operstate_for_online = LINK_OPERSTATE_RANGE_INVALID;
return 0;
}
r = parse_operational_state_range(rvalue, &range);
r = parse_operational_state_range(rvalue, &network->required_operstate_for_online);
if (r < 0) {
r = parse_boolean(rvalue);
if (r < 0) {
@@ -1237,13 +1235,12 @@ int config_parse_required_for_online(
return 0;
}
required = r;
range = LINK_OPERSTATE_RANGE_DEFAULT;
network->required_for_online = r;
network->required_operstate_for_online = LINK_OPERSTATE_RANGE_DEFAULT;
return 0;
}
network->required_for_online = required;
network->required_operstate_for_online = range;
network->required_for_online = true;
return 0;
}
src/network/networkd-state-file.c
+5 -5
View File
@@ -630,11 +630,11 @@ static int link_save(Link *link) {
fprintf(f, "REQUIRED_FOR_ONLINE=%s\n",
yes_no(link->network->required_for_online));
LinkOperationalStateRange st = link->network->required_operstate_for_online;
fprintf(f, "REQUIRED_OPER_STATE_FOR_ONLINE=%s%s%s\n",
strempty(link_operstate_to_string(st.min)),
st.max != LINK_OPERSTATE_RANGE_DEFAULT.max ? ":" : "",
st.max != LINK_OPERSTATE_RANGE_DEFAULT.max ? strempty(link_operstate_to_string(st.max)) : "");
LinkOperationalStateRange st;
link_required_operstate_for_online(link, &st);
fprintf(f, "REQUIRED_OPER_STATE_FOR_ONLINE=%s:%s\n",
link_operstate_to_string(st.min), link_operstate_to_string(st.max));
fprintf(f, "REQUIRED_FAMILY_FOR_ONLINE=%s\n",
link_required_address_family_to_string(link->network->required_family_for_online));
src/network/wait-online/manager.c
+11 -15
View File
@@ -52,7 +52,7 @@ static bool manager_ignore_link(Manager *m, Link *link) {
return false;
}
static int manager_link_is_online(Manager *m, Link *l, LinkOperationalStateRange s) {
static int manager_link_is_online(Manager *m, Link *l, const LinkOperationalStateRange *state_range) {
AddressFamily required_family;
bool needs_ipv4;
bool needs_ipv6;
@@ -91,25 +91,23 @@ static int manager_link_is_online(Manager *m, Link *l, LinkOperationalStateRange
"link is being processed by networkd: setup state is %s.",
l->state);
if (s.min < 0)
s.min = m->required_operstate.min >= 0 ? m->required_operstate.min
: l->required_operstate.min;
const LinkOperationalStateRange *range;
FOREACH_POINTER(range, state_range, &m->required_operstate, &l->required_operstate)
if (operational_state_range_is_valid(range))
break;
assert(range != POINTER_MAX);
if (s.max < 0)
s.max = m->required_operstate.max >= 0 ? m->required_operstate.max
: l->required_operstate.max;
if (l->operational_state < s.min || l->operational_state > s.max)
if (!operational_state_is_in_range(l->operational_state, range))
return log_link_debug_errno(l, SYNTHETIC_ERRNO(EADDRNOTAVAIL),
"Operational state '%s' is not in range ['%s':'%s']",
link_operstate_to_string(l->operational_state),
link_operstate_to_string(s.min), link_operstate_to_string(s.max));
link_operstate_to_string(range->min), link_operstate_to_string(range->max));
required_family = m->required_family > 0 ? m->required_family : l->required_family;
needs_ipv4 = required_family & ADDRESS_FAMILY_IPV4;
needs_ipv6 = required_family & ADDRESS_FAMILY_IPV6;
if (s.min < LINK_OPERSTATE_ROUTABLE) {
if (range->min < LINK_OPERSTATE_ROUTABLE) {
if (needs_ipv4 && l->ipv4_address_state < LINK_ADDRESS_STATE_DEGRADED)
return log_link_debug_errno(l, SYNTHETIC_ERRNO(EADDRNOTAVAIL),
"No routable or link-local IPv4 address is configured.");
@@ -155,7 +153,7 @@ bool manager_configured(Manager *m) {
continue;
}
r = manager_link_is_online(m, l, *range);
r = manager_link_is_online(m, l, range);
if (r <= 0 && !m->any)
return false;
if (r > 0 && m->any)
@@ -175,9 +173,7 @@ bool manager_configured(Manager *m) {
continue;
}
r = manager_link_is_online(m, l,
(LinkOperationalStateRange) { _LINK_OPERSTATE_INVALID,
_LINK_OPERSTATE_INVALID });
r = manager_link_is_online(m, l, /* state_range = */ NULL);
if (r < 0 && !m->any) /* Unlike the above loop, unmanaged interfaces are ignored here. */
return false;
if (r > 0) {
src/network/wait-online/wait-online.c
+10 -16
View File
@@ -19,7 +19,7 @@ static bool arg_quiet = false;
static usec_t arg_timeout = 120 * USEC_PER_SEC;
static Hashmap *arg_interfaces = NULL;
static char **arg_ignore = NULL;
static LinkOperationalStateRange arg_required_operstate = { _LINK_OPERSTATE_INVALID, _LINK_OPERSTATE_INVALID };
static LinkOperationalStateRange arg_required_operstate = LINK_OPERSTATE_RANGE_INVALID;
static AddressFamily arg_required_family = ADDRESS_FAMILY_NO;
static bool arg_any = false;
@@ -71,12 +71,11 @@ static int parse_interface_with_operstate_range(const char *str) {
if (p) {
r = parse_operational_state_range(p + 1, range);
if (r < 0)
log_error_errno(r, "Invalid operational state range '%s'", p + 1);
return log_error_errno(r, "Invalid operational state range: %s", p + 1);
ifname = strndup(optarg, p - optarg);
} else {
range->min = _LINK_OPERSTATE_INVALID;
range->max = _LINK_OPERSTATE_INVALID;
*range = LINK_OPERSTATE_RANGE_INVALID;
ifname = strdup(str);
}
if (!ifname)
@@ -84,18 +83,19 @@ static int parse_interface_with_operstate_range(const char *str) {
if (!ifname_valid(ifname))
return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
"Invalid interface name '%s'", ifname);
"Invalid interface name: %s", ifname);
r = hashmap_ensure_put(&arg_interfaces, &string_hash_ops, ifname, TAKE_PTR(range));
r = hashmap_ensure_put(&arg_interfaces, &string_hash_ops, ifname, range);
if (r == -ENOMEM)
return log_oom();
if (r < 0)
return log_error_errno(r, "Failed to store interface name: %m");
if (r == 0)
return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
"Interface name %s is already specified", ifname);
return log_error_errno(SYNTHETIC_ERRNO(EEXIST),
"Interface name %s is already specified.", ifname);
TAKE_PTR(ifname);
TAKE_PTR(range);
return 0;
}
@@ -154,17 +154,11 @@ static int parse_argv(int argc, char *argv[]) {
break;
case 'o': {
LinkOperationalStateRange range;
r = parse_operational_state_range(optarg, &range);
case 'o':
r = parse_operational_state_range(optarg, &arg_required_operstate);
if (r < 0)
return log_error_errno(r, "Invalid operational state range '%s'", optarg);
arg_required_operstate = range;
break;
}
case '4':
arg_required_family |= ADDRESS_FAMILY_IPV4;