|
| 1 | +From 916523aabc7fcb3b5b9362100a5e3417aae00cb2 Mon Sep 17 00:00:00 2001 |
| 2 | +From: Yu Watanabe < [email protected]> |
| 3 | +Date: Wed, 11 Jun 2025 18:05:46 +0900 |
| 4 | +Subject: [PATCH] network: also check ID_NET_MANAGED_BY property on |
| 5 | + reconfigure |
| 6 | + |
| 7 | +Previously, the property was checked only when an uevent is received, |
| 8 | +so even if an interface has ID_NET_MANAGED_BY property, the interface |
| 9 | +will be configured by networkd when reconfiguration is triggered e.g. |
| 10 | +when interface state is changed. |
| 11 | + |
| 12 | +Follow-up for ba87a61d05d637be9f0b21707f7fe3b0a74c5a05. |
| 13 | +Fixes #36997. |
| 14 | + |
| 15 | +(cherry picked from commit 78f8d5ed71ecc16ad36d1c215d2d57433d127679) |
| 16 | + |
| 17 | +Signed-off-by: Jeremi Piotrowski < [email protected]> |
| 18 | +--- |
| 19 | + src/network/networkd-link.c | 44 ++++++++++++++----- |
| 20 | + .../test-network/conf/11-dummy-unmanaged.link | 8 ++++ |
| 21 | + test/test-network/systemd-networkd-tests.py | 11 +++++ |
| 22 | + 3 files changed, 53 insertions(+), 10 deletions(-) |
| 23 | + create mode 100644 test/test-network/conf/11-dummy-unmanaged.link |
| 24 | + |
| 25 | +diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c |
| 26 | +index c3a5dc1f0d..3ed1584807 100644 |
| 27 | +--- a/src/network/networkd-link.c |
| 28 | ++++ b/src/network/networkd-link.c |
| 29 | +@@ -1315,6 +1315,32 @@ static int link_get_network(Link *link, Network **ret) { |
| 30 | + return -ENOENT; |
| 31 | + } |
| 32 | + |
| 33 | ++static int link_managed_by_us(Link *link) { |
| 34 | ++ int r; |
| 35 | ++ |
| 36 | ++ assert(link); |
| 37 | ++ |
| 38 | ++ if (!link->dev) |
| 39 | ++ return true; |
| 40 | ++ |
| 41 | ++ const char *s; |
| 42 | ++ r = sd_device_get_property_value(link->dev, "ID_NET_MANAGED_BY", &s); |
| 43 | ++ if (r == -ENOENT) |
| 44 | ++ return true; |
| 45 | ++ if (r < 0) |
| 46 | ++ return log_link_warning_errno(link, r, "Failed to get ID_NET_MANAGED_BY udev property: %m"); |
| 47 | ++ |
| 48 | ++ if (streq(s, "io.systemd.Network")) |
| 49 | ++ return true; |
| 50 | ++ |
| 51 | ++ if (link->state == LINK_STATE_UNMANAGED) |
| 52 | ++ return false; /* Already in unmanaged state */ |
| 53 | ++ |
| 54 | ++ log_link_debug(link, "Interface is requested to be managed by '%s', unmanaging the interface.", s); |
| 55 | ++ link_set_state(link, LINK_STATE_UNMANAGED); |
| 56 | ++ return false; |
| 57 | ++} |
| 58 | ++ |
| 59 | + int link_reconfigure_impl(Link *link, bool force) { |
| 60 | + Network *network = NULL; |
| 61 | + int r; |
| 62 | +@@ -1330,6 +1356,10 @@ int link_reconfigure_impl(Link *link, bool force) { |
| 63 | + if (IN_SET(link->state, LINK_STATE_PENDING, LINK_STATE_LINGER)) |
| 64 | + return 0; |
| 65 | + |
| 66 | ++ r = link_managed_by_us(link); |
| 67 | ++ if (r <= 0) |
| 68 | ++ return r; |
| 69 | ++ |
| 70 | + r = link_get_network(link, &network); |
| 71 | + if (r < 0 && r != -ENOENT) |
| 72 | + return r; |
| 73 | +@@ -1584,6 +1614,10 @@ static int link_initialized(Link *link, sd_device *device) { |
| 74 | + * or sysattrs) may be outdated. */ |
| 75 | + device_unref_and_replace(link->dev, device); |
| 76 | + |
| 77 | ++ r = link_managed_by_us(link); |
| 78 | ++ if (r <= 0) |
| 79 | ++ return r; |
| 80 | ++ |
| 81 | + if (link->dhcp_client) { |
| 82 | + r = sd_dhcp_client_attach_device(link->dhcp_client, link->dev); |
| 83 | + if (r < 0) |
| 84 | +@@ -1651,7 +1685,6 @@ static int link_check_initialized(Link *link) { |
| 85 | + |
| 86 | + int manager_udev_process_link(Manager *m, sd_device *device, sd_device_action_t action) { |
| 87 | + int r, ifindex; |
| 88 | +- const char *s; |
| 89 | + Link *link; |
| 90 | + |
| 91 | + assert(m); |
| 92 | +@@ -1686,15 +1719,6 @@ int manager_udev_process_link(Manager *m, sd_device *device, sd_device_action_t |
| 93 | + return 0; |
| 94 | + } |
| 95 | + |
| 96 | +- r = sd_device_get_property_value(device, "ID_NET_MANAGED_BY", &s); |
| 97 | +- if (r < 0 && r != -ENOENT) |
| 98 | +- log_device_debug_errno(device, r, "Failed to get ID_NET_MANAGED_BY udev property, ignoring: %m"); |
| 99 | +- if (r >= 0 && !streq(s, "io.systemd.Network")) { |
| 100 | +- log_device_debug(device, "Interface is requested to be managed by '%s', not managing the interface.", s); |
| 101 | +- link_set_state(link, LINK_STATE_UNMANAGED); |
| 102 | +- return 0; |
| 103 | +- } |
| 104 | +- |
| 105 | + r = link_initialized(link, device); |
| 106 | + if (r < 0) |
| 107 | + link_enter_failed(link); |
| 108 | +diff --git a/test/test-network/conf/11-dummy-unmanaged.link b/test/test-network/conf/11-dummy-unmanaged.link |
| 109 | +new file mode 100644 |
| 110 | +index 0000000000..99c07a72ce |
| 111 | +--- /dev/null |
| 112 | ++++ b/test/test-network/conf/11-dummy-unmanaged.link |
| 113 | +@@ -0,0 +1,8 @@ |
| 114 | ++# SPDX-License-Identifier: MIT-0 |
| 115 | ++[Match] |
| 116 | ++Kind=dummy |
| 117 | ++OriginalName=test1 |
| 118 | ++ |
| 119 | ++[Link] |
| 120 | ++NamePolicy=keep |
| 121 | ++Property=ID_NET_MANAGED_BY=hoge |
| 122 | +diff --git a/test/test-network/systemd-networkd-tests.py b/test/test-network/systemd-networkd-tests.py |
| 123 | +index d8acf538f0..391d219de8 100755 |
| 124 | +--- a/test/test-network/systemd-networkd-tests.py |
| 125 | ++++ b/test/test-network/systemd-networkd-tests.py |
| 126 | +@@ -2735,6 +2735,17 @@ class NetworkdNetworkTests(unittest.TestCase, Utilities): |
| 127 | + def tearDown(self): |
| 128 | + tear_down_common() |
| 129 | + |
| 130 | ++ def test_ID_NET_MANAGED_BY(self): |
| 131 | ++ copy_network_unit('11-dummy.netdev', '11-dummy-unmanaged.link', '11-dummy.network') |
| 132 | ++ start_networkd() |
| 133 | ++ self.wait_online('test1:off', setup_state='unmanaged') |
| 134 | ++ |
| 135 | ++ check_output('ip link set dev test1 up') |
| 136 | ++ self.wait_online('test1:degraded', setup_state='unmanaged') |
| 137 | ++ |
| 138 | ++ check_output('ip link set dev test1 down') |
| 139 | ++ self.wait_online('test1:off', setup_state='unmanaged') |
| 140 | ++ |
| 141 | + def verify_address_static( |
| 142 | + self, |
| 143 | + label1: str, |
| 144 | +-- |
| 145 | +2.39.5 |
| 146 | + |
0 commit comments