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

network/netdev: do not try to update several parameters if the interface already exists (#34937)

Browse Source 
split-out of #34909.
This commit is contained in:
Yu Watanabe
2024-10-31 04:04:33 +09:00
committed by GitHub
parent e725a91ab7 ceae9f9a38
commit 5251cb8254
5 changed files with 98 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/network/netdev/ipvlan.c
+9
View File
@@ -37,6 +37,13 @@ static int netdev_ipvlan_fill_message_create(NetDev *netdev, Link *link, sd_netl
return 0;
}
static bool ipvlan_can_set_mac(NetDev *netdev, const struct hw_addr_data *hw_addr) {
assert(netdev);
/* MAC address cannot be updated. Even unchanged, IFLA_ADDRESS attribute cannot be set in the message. */
return netdev->ifindex <= 0;
}
static void ipvlan_init(NetDev *netdev) {
IPVlan *m = ASSERT_PTR(netdev)->kind == NETDEV_KIND_IPVLAN ? IPVLAN(netdev) : IPVTAP(netdev);
@@ -50,6 +57,7 @@ const NetDevVTable ipvlan_vtable = {
.sections = NETDEV_COMMON_SECTIONS "IPVLAN\0",
.fill_message_create = netdev_ipvlan_fill_message_create,
.create_type = NETDEV_CREATE_STACKED,
.can_set_mac = ipvlan_can_set_mac,
.iftype = ARPHRD_ETHER,
.generate_mac = true,
};
@@ -60,6 +68,7 @@ const NetDevVTable ipvtap_vtable = {
.sections = NETDEV_COMMON_SECTIONS "IPVTAP\0",
.fill_message_create = netdev_ipvlan_fill_message_create,
.create_type = NETDEV_CREATE_STACKED,
.can_set_mac = ipvlan_can_set_mac,
.iftype = ARPHRD_ETHER,
.generate_mac = true,
};
src/network/netdev/macsec.c
+14 -6
View File
@@ -509,12 +509,6 @@ static int netdev_macsec_fill_message_create(NetDev *netdev, Link *link, sd_netl
MACsec *v = MACSEC(netdev);
int r;
if (v->port > 0) {
r = sd_netlink_message_append_u16(m, IFLA_MACSEC_PORT, v->port);
if (r < 0)
return r;
}
if (v->encrypt >= 0) {
r = sd_netlink_message_append_u8(m, IFLA_MACSEC_ENCRYPT, v->encrypt);
if (r < 0)
@@ -525,6 +519,20 @@ static int netdev_macsec_fill_message_create(NetDev *netdev, Link *link, sd_netl
if (r < 0)
return r;
/* The properties below cannot be updated, and the kernel refuses the whole request if one of the
* following attributes is set for an existing interface. */
if (netdev->ifindex > 0)
return 0;
if (v->port > 0) {
r = sd_netlink_message_append_u16(m, IFLA_MACSEC_PORT, v->port);
if (r < 0)
return r;
}
/* Currently not supported by networkd, but IFLA_MACSEC_CIPHER_SUITE, IFLA_MACSEC_ICV_LEN, and
* IFLA_MACSEC_SCI can neither set for an existing interface. */
return 0;
}
src/network/netdev/netdev.c
+27 -2
View File
@@ -622,6 +622,31 @@ finalize:
return 0;
}
static bool netdev_can_set_mac(NetDev *netdev, const struct hw_addr_data *hw_addr) {
assert(netdev);
assert(hw_addr);
if (hw_addr->length <= 0)
return false;
if (!NETDEV_VTABLE(netdev)->can_set_mac)
return true;
return NETDEV_VTABLE(netdev)->can_set_mac(netdev, hw_addr);
}
static bool netdev_can_set_mtu(NetDev *netdev, uint32_t mtu) {
assert(netdev);
if (mtu <= 0)
return false;
if (!NETDEV_VTABLE(netdev)->can_set_mtu)
return true;
return NETDEV_VTABLE(netdev)->can_set_mtu(netdev, mtu);
}
static int netdev_create_message(NetDev *netdev, Link *link, sd_netlink_message *m) {
int r;
@@ -634,14 +659,14 @@ static int netdev_create_message(NetDev *netdev, Link *link, sd_netlink_message
if (r < 0)
return r;
if (hw_addr.length > 0) {
if (netdev_can_set_mac(netdev, &hw_addr)) {
log_netdev_debug(netdev, "Using MAC address: %s", HW_ADDR_TO_STR(&hw_addr));
r = netlink_message_append_hw_addr(m, IFLA_ADDRESS, &hw_addr);
if (r < 0)
return r;
}
if (netdev->mtu != 0) {
if (netdev_can_set_mtu(netdev, netdev->mtu)) {
r = sd_netlink_message_append_u32(m, IFLA_MTU, netdev->mtu);
if (r < 0)
return r;
src/network/netdev/netdev.h
+6
View File
@@ -179,6 +179,12 @@ typedef struct NetDevVTable {
/* get ifindex of the netdev. */
int (*get_ifindex)(NetDev *netdev, const char *name);
/* provides if MAC address can be set. If this is not set, assumed to be yes. */
bool (*can_set_mac)(NetDev *netdev, const struct hw_addr_data *hw_addr);
/* provides if MTU can be set. If this is not set, assumed to be yes. */
bool (*can_set_mtu)(NetDev *netdev, uint32_t mtu);
/* expected iftype, e.g. ARPHRD_ETHER. */
uint16_t iftype;
src/network/netdev/vxlan.c
+42 -28
View File
@@ -44,12 +44,6 @@ static int netdev_vxlan_fill_message_create(NetDev *netdev, Link *link, sd_netli
int local_family, r;
VxLan *v = VXLAN(netdev);
if (v->vni <= VXLAN_VID_MAX) {
r = sd_netlink_message_append_u32(m, IFLA_VXLAN_ID, v->vni);
if (r < 0)
return r;
}
if (in_addr_is_set(v->group_family, &v->group)) {
if (v->group_family == AF_INET)
r = sd_netlink_message_append_in_addr(m, IFLA_VXLAN_GROUP, &v->group.in);
@@ -83,12 +77,12 @@ static int netdev_vxlan_fill_message_create(NetDev *netdev, Link *link, sd_netli
if (r < 0)
return r;
if (v->inherit) {
r = sd_netlink_message_append_flag(m, IFLA_VXLAN_TTL_INHERIT);
if (r < 0)
return r;
} else {
r = sd_netlink_message_append_u8(m, IFLA_VXLAN_TTL, v->ttl);
r = sd_netlink_message_append_u8(m, IFLA_VXLAN_TTL, v->ttl);
if (r < 0)
return r;
if (v->fdb_ageing != 0) {
r = sd_netlink_message_append_u32(m, IFLA_VXLAN_AGEING, v->fdb_ageing / USEC_PER_SEC);
if (r < 0)
return r;
}
@@ -99,6 +93,34 @@ static int netdev_vxlan_fill_message_create(NetDev *netdev, Link *link, sd_netli
return r;
}
r = sd_netlink_message_append_u32(m, IFLA_VXLAN_LABEL, htobe32(v->flow_label));
if (r < 0)
return r;
if (v->df != _NETDEV_VXLAN_DF_INVALID) {
r = sd_netlink_message_append_u8(m, IFLA_VXLAN_DF, v->df);
if (r < 0)
return r;
}
if (netdev->ifindex > 0)
return 0;
/* The properties below cannot be updated, and the kernel refuses the whole request if one of the
* following attributes is set for an existing interface. */
if (v->vni <= VXLAN_VID_MAX) {
r = sd_netlink_message_append_u32(m, IFLA_VXLAN_ID, v->vni);
if (r < 0)
return r;
}
if (v->inherit) {
r = sd_netlink_message_append_flag(m, IFLA_VXLAN_TTL_INHERIT);
if (r < 0)
return r;
}
r = sd_netlink_message_append_u8(m, IFLA_VXLAN_LEARNING, v->learning);
if (r < 0)
return r;
@@ -119,12 +141,6 @@ static int netdev_vxlan_fill_message_create(NetDev *netdev, Link *link, sd_netli
if (r < 0)
return r;
if (v->fdb_ageing != 0) {
r = sd_netlink_message_append_u32(m, IFLA_VXLAN_AGEING, v->fdb_ageing / USEC_PER_SEC);
if (r < 0)
return r;
}
if (v->max_fdb != 0) {
r = sd_netlink_message_append_u32(m, IFLA_VXLAN_LIMIT, v->max_fdb);
if (r < 0)
@@ -166,10 +182,6 @@ static int netdev_vxlan_fill_message_create(NetDev *netdev, Link *link, sd_netli
return r;
}
r = sd_netlink_message_append_u32(m, IFLA_VXLAN_LABEL, htobe32(v->flow_label));
if (r < 0)
return r;
if (v->group_policy) {
r = sd_netlink_message_append_flag(m, IFLA_VXLAN_GBP);
if (r < 0)
@@ -182,15 +194,16 @@ static int netdev_vxlan_fill_message_create(NetDev *netdev, Link *link, sd_netli
return r;
}
if (v->df != _NETDEV_VXLAN_DF_INVALID) {
r = sd_netlink_message_append_u8(m, IFLA_VXLAN_DF, v->df);
if (r < 0)
return r;
}
return 0;
}
static bool vxlan_can_set_mtu(NetDev *netdev, uint32_t mtu) {
assert(netdev);
/* MTU cannot be updated. Even unchanged, IFLA_MTU attribute cannot be set in the message. */
return netdev->ifindex <= 0;
}
int config_parse_vxlan_address(
const char *unit,
const char *filename,
@@ -431,6 +444,7 @@ const NetDevVTable vxlan_vtable = {
.create_type = NETDEV_CREATE_STACKED,
.is_ready_to_create = netdev_vxlan_is_ready_to_create,
.config_verify = netdev_vxlan_verify,
.can_set_mtu = vxlan_can_set_mtu,
.iftype = ARPHRD_ETHER,
.generate_mac = true,
};