mirror of
https://git.yoctoproject.org/poky
synced 2026-05-08 05:09:24 +00:00
systemd: Fix interface bring-up on kernels >= 5.2
With kernels >=5.2 systemd-networkd is unable to bring up the link. eth0: Could not bring up interface: Invalid argument This is already reported upstream and fixed on master: https://github.com/systemd/systemd/issues/12784 They recommend Debian to backport two patches. (From OE-Core rev: 536d54ab46708ef921dbdcb68d1cf644ec639be8) Signed-off-by: Ricardo Ribalda Delgado <ricardo@ribalda.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Ricardo Ribalda Delgado
committed by
Richard Purdie
Richard Purdie
parent
eba6cd155a
commit
6726c663fd
@@ -0,0 +1,66 @@
|
||||
From 6bd76d2d4ff130decd3aa13e0c2dbfd56ff8d7b7 Mon Sep 17 00:00:00 2001
|
||||
From: Susant Sahani <ssahani@gmail.com>
|
||||
Date: Thu, 9 May 2019 07:35:35 +0530
|
||||
Subject: [PATCH] networkd: fix link_up() (#12505)
|
||||
|
||||
Fillup IFLA_INET6_ADDR_GEN_MODE while we do link_up.
|
||||
|
||||
Fixes the following error:
|
||||
```
|
||||
dummy-test: Could not bring up interface: Invalid argument
|
||||
```
|
||||
|
||||
After reading the kernel code when we do a link up
|
||||
```
|
||||
net/core/rtnetlink.c
|
||||
IFLA_AF_SPEC
|
||||
af_ops->set_link_af(dev, af);
|
||||
inet6_set_link_af
|
||||
if (tb[IFLA_INET6_ADDR_GEN_MODE])
|
||||
Here it looks for IFLA_INET6_ADDR_GEN_MODE
|
||||
```
|
||||
Since link up we didn't filling up that it's failing.
|
||||
|
||||
Closes #12504.
|
||||
|
||||
Signed-off-by: Ricardo Ribalda Delgado <ricardo@ribalda.com>
|
||||
|
||||
Upstream-Status: Backport [https://github.com/systemd/systemd/commit/4eb086a38712ea98faf41e075b84555b11b54362.patch]
|
||||
|
||||
---
|
||||
src/network/networkd-link.c | 15 +++++++++++++++
|
||||
1 file changed, 15 insertions(+)
|
||||
|
||||
diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c
|
||||
index e466b96792..042496173c 100644
|
||||
--- a/src/network/networkd-link.c
|
||||
+++ b/src/network/networkd-link.c
|
||||
@@ -2034,6 +2034,8 @@ static int link_up(Link *link) {
|
||||
}
|
||||
|
||||
if (link_ipv6_enabled(link)) {
|
||||
+ uint8_t ipv6ll_mode;
|
||||
+
|
||||
r = sd_netlink_message_open_container(req, IFLA_AF_SPEC);
|
||||
if (r < 0)
|
||||
return log_link_error_errno(link, r, "Could not open IFLA_AF_SPEC container: %m");
|
||||
@@ -2049,6 +2051,19 @@ static int link_up(Link *link) {
|
||||
return log_link_error_errno(link, r, "Could not append IFLA_INET6_TOKEN: %m");
|
||||
}
|
||||
|
||||
+ if (!link_ipv6ll_enabled(link))
|
||||
+ ipv6ll_mode = IN6_ADDR_GEN_MODE_NONE;
|
||||
+ else if (sysctl_read_ip_property(AF_INET6, link->ifname, "stable_secret", NULL) < 0)
|
||||
+ /* The file may not exist. And event if it exists, when stable_secret is unset,
|
||||
+ * reading the file fails with EIO. */
|
||||
+ ipv6ll_mode = IN6_ADDR_GEN_MODE_EUI64;
|
||||
+ else
|
||||
+ ipv6ll_mode = IN6_ADDR_GEN_MODE_STABLE_PRIVACY;
|
||||
+
|
||||
+ r = sd_netlink_message_append_u8(req, IFLA_INET6_ADDR_GEN_MODE, ipv6ll_mode);
|
||||
+ if (r < 0)
|
||||
+ return log_link_error_errno(link, r, "Could not append IFLA_INET6_ADDR_GEN_MODE: %m");
|
||||
+
|
||||
r = sd_netlink_message_close_container(req);
|
||||
if (r < 0)
|
||||
return log_link_error_errno(link, r, "Could not close AF_INET6 container: %m");
|
||||
@@ -0,0 +1,96 @@
|
||||
From b5c4eb818101127a606849e822937b15b8497c75 Mon Sep 17 00:00:00 2001
|
||||
From: Yu Watanabe <watanabe.yu+github@gmail.com>
|
||||
Date: Thu, 9 May 2019 14:39:46 +0900
|
||||
Subject: [PATCH] network: do not send ipv6 token to kernel
|
||||
|
||||
We disabled kernel RA support. Then, we should not send
|
||||
IFLA_INET6_TOKEN.
|
||||
Thus, we do not need to send IFLA_INET6_ADDR_GEN_MODE twice.
|
||||
|
||||
Follow-up for 0e2fdb83bb5e22047e0c7cc058b415d0e93f02cf and
|
||||
4eb086a38712ea98faf41e075b84555b11b54362.
|
||||
|
||||
Signed-off-by: Ricardo Ribalda Delgado <ricardo@ribalda.com>
|
||||
|
||||
Upstream-Status: Backport [https://github.com/systemd/systemd/commit/9f6e82e6eb3b6e73d66d00d1d6eee60691fb702f]
|
||||
|
||||
---
|
||||
src/network/networkd-link.c | 51 +++++--------------------------------
|
||||
1 file changed, 6 insertions(+), 45 deletions(-)
|
||||
|
||||
diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c
|
||||
index 042496173c..c49dba33da 100644
|
||||
--- a/src/network/networkd-link.c
|
||||
+++ b/src/network/networkd-link.c
|
||||
@@ -1940,6 +1940,9 @@ static int link_configure_addrgen_mode(Link *link) {
|
||||
assert(link->manager);
|
||||
assert(link->manager->rtnl);
|
||||
|
||||
+ if (!socket_ipv6_is_supported())
|
||||
+ return 0;
|
||||
+
|
||||
log_link_debug(link, "Setting address genmode for link");
|
||||
|
||||
r = sd_rtnl_message_new_link(link->manager->rtnl, &req, RTM_SETLINK, link->ifindex);
|
||||
@@ -2033,46 +2036,6 @@ static int link_up(Link *link) {
|
||||
return log_link_error_errno(link, r, "Could not set MAC address: %m");
|
||||
}
|
||||
|
||||
- if (link_ipv6_enabled(link)) {
|
||||
- uint8_t ipv6ll_mode;
|
||||
-
|
||||
- r = sd_netlink_message_open_container(req, IFLA_AF_SPEC);
|
||||
- if (r < 0)
|
||||
- return log_link_error_errno(link, r, "Could not open IFLA_AF_SPEC container: %m");
|
||||
-
|
||||
- /* if the kernel lacks ipv6 support setting IFF_UP fails if any ipv6 options are passed */
|
||||
- r = sd_netlink_message_open_container(req, AF_INET6);
|
||||
- if (r < 0)
|
||||
- return log_link_error_errno(link, r, "Could not open AF_INET6 container: %m");
|
||||
-
|
||||
- if (!in_addr_is_null(AF_INET6, &link->network->ipv6_token)) {
|
||||
- r = sd_netlink_message_append_in6_addr(req, IFLA_INET6_TOKEN, &link->network->ipv6_token.in6);
|
||||
- if (r < 0)
|
||||
- return log_link_error_errno(link, r, "Could not append IFLA_INET6_TOKEN: %m");
|
||||
- }
|
||||
-
|
||||
- if (!link_ipv6ll_enabled(link))
|
||||
- ipv6ll_mode = IN6_ADDR_GEN_MODE_NONE;
|
||||
- else if (sysctl_read_ip_property(AF_INET6, link->ifname, "stable_secret", NULL) < 0)
|
||||
- /* The file may not exist. And event if it exists, when stable_secret is unset,
|
||||
- * reading the file fails with EIO. */
|
||||
- ipv6ll_mode = IN6_ADDR_GEN_MODE_EUI64;
|
||||
- else
|
||||
- ipv6ll_mode = IN6_ADDR_GEN_MODE_STABLE_PRIVACY;
|
||||
-
|
||||
- r = sd_netlink_message_append_u8(req, IFLA_INET6_ADDR_GEN_MODE, ipv6ll_mode);
|
||||
- if (r < 0)
|
||||
- return log_link_error_errno(link, r, "Could not append IFLA_INET6_ADDR_GEN_MODE: %m");
|
||||
-
|
||||
- r = sd_netlink_message_close_container(req);
|
||||
- if (r < 0)
|
||||
- return log_link_error_errno(link, r, "Could not close AF_INET6 container: %m");
|
||||
-
|
||||
- r = sd_netlink_message_close_container(req);
|
||||
- if (r < 0)
|
||||
- return log_link_error_errno(link, r, "Could not close IFLA_AF_SPEC container: %m");
|
||||
- }
|
||||
-
|
||||
r = netlink_call_async(link->manager->rtnl, NULL, req, link_up_handler,
|
||||
link_netlink_destroy_callback, link);
|
||||
if (r < 0)
|
||||
@@ -3208,11 +3171,9 @@ static int link_configure(Link *link) {
|
||||
if (r < 0)
|
||||
return r;
|
||||
|
||||
- if (socket_ipv6_is_supported()) {
|
||||
- r = link_configure_addrgen_mode(link);
|
||||
- if (r < 0)
|
||||
- return r;
|
||||
- }
|
||||
+ r = link_configure_addrgen_mode(link);
|
||||
+ if (r < 0)
|
||||
+ return r;
|
||||
|
||||
return link_configure_after_setting_mtu(link);
|
||||
}
|
||||
@@ -26,6 +26,8 @@ SRC_URI += "file://touchscreen.rules \
|
||||
file://99-default.preset \
|
||||
file://0001-resolved-Fix-incorrect-use-of-OpenSSL-BUF_MEM.patch \
|
||||
file://0001-core-set-fs.file-max-sysctl-to-LONG_MAX-rather-than-.patch \
|
||||
file://0001-networkd-fix-link-up.patch \
|
||||
file://0002-network-do-not-send-ipv6.patch \
|
||||
"
|
||||
|
||||
# patches needed by musl
|
||||
|
||||
Reference in New Issue
Block a user