colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bridge: change the signature for nm_platform_link_set_bridge_vlans()

Browse Source 
Currently, nm_platform_link_set_bridge_vlans() accepts an array of
pointers to vlan objects; to avoid multiple allocations,
setting_vlans_to_platform() creates the array by piggybacking the
actual data after the pointers array.

In the next commits, the array will need to be manipulated and
extended, which is difficult with the current structure. Instead, pass
separately an array of objects and its size.
This commit is contained in:
Beniamino Galvani
2024-07-25 09:49:18 +02:00
committed by Íñigo Huguet
parent 7d3bfb101f
commit e00c81b153
4 changed files with 70 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
src/core/devices/nm-device-bridge.c
View File

@@ -419,20 +419,18 @@ static const Option controller_options[] = {
0, 0,
}}; }};
static const NMPlatformBridgeVlan ** static NMPlatformBridgeVlan *
setting_vlans_to_platform(GPtrArray *array) setting_vlans_to_platform(GPtrArray *array, guint *out_len)
{ {
NMPlatformBridgeVlan **arr; NMPlatformBridgeVlan *arr;
NMPlatformBridgeVlan *p_data; guint i;
guint i;
if (!array || !array->len) if (!array || !array->len) {
*out_len = 0;
return NULL; return NULL;
}
G_STATIC_ASSERT_EXPR(_nm_alignof(NMPlatformBridgeVlan *) >= _nm_alignof(NMPlatformBridgeVlan)); arr = g_new(NMPlatformBridgeVlan, array->len);
arr = g_malloc((sizeof(NMPlatformBridgeVlan *) * (array->len + 1))
+ (sizeof(NMPlatformBridgeVlan) * (array->len)));
p_data = (NMPlatformBridgeVlan *) &arr[array->len + 1];
for (i = 0; i < array->len; i++) { for (i = 0; i < array->len; i++) {
NMBridgeVlan *vlan = array->pdata[i]; NMBridgeVlan *vlan = array->pdata[i];
@@ -440,16 +438,16 @@ setting_vlans_to_platform(GPtrArray *array)
nm_bridge_vlan_get_vid_range(vlan, &vid_start, &vid_end); nm_bridge_vlan_get_vid_range(vlan, &vid_start, &vid_end);
p_data[i] = (NMPlatformBridgeVlan){ arr[i] = (NMPlatformBridgeVlan){
.vid_start = vid_start, .vid_start = vid_start,
.vid_end = vid_end, .vid_end = vid_end,
.pvid = nm_bridge_vlan_is_pvid(vlan), .pvid = nm_bridge_vlan_is_pvid(vlan),
.untagged = nm_bridge_vlan_is_untagged(vlan), .untagged = nm_bridge_vlan_is_untagged(vlan),
}; };
arr[i] = &p_data[i];
} }
arr[i] = NULL;
return (const NMPlatformBridgeVlan **) arr; *out_len = array->len;
return arr;
} }
static void static void
@@ -639,15 +637,16 @@ is_bridge_pvid_changed(NMDevice *device, NMSettingBridge *s_bridge)
static gboolean static gboolean
bridge_set_vlan_options(NMDevice *device, NMSettingBridge *s_bridge, gboolean is_reapply) bridge_set_vlan_options(NMDevice *device, NMSettingBridge *s_bridge, gboolean is_reapply)
{ {
NMDeviceBridge *self = NM_DEVICE_BRIDGE(device); NMDeviceBridge *self = NM_DEVICE_BRIDGE(device);
gconstpointer hwaddr; gconstpointer hwaddr;
size_t length; size_t length;
gboolean enabled; gboolean enabled;
guint16 pvid; guint16 pvid;
NMPlatform *plat; NMPlatform *plat;
int ifindex; int ifindex;
gs_unref_ptrarray GPtrArray *vlans = NULL; gs_unref_ptrarray GPtrArray *vlans = NULL;
gs_free const NMPlatformBridgeVlan **plat_vlans = NULL; gs_free NMPlatformBridgeVlan *plat_vlans = NULL;
guint num_vlans;
if (self->vlan_configured) if (self->vlan_configured)
return TRUE; return TRUE;
@@ -664,7 +663,7 @@ bridge_set_vlan_options(NMDevice *device, NMSettingBridge *s_bridge, gboolean is
.vlan_filtering_val = FALSE, .vlan_filtering_val = FALSE,
.vlan_default_pvid_has = TRUE, .vlan_default_pvid_has = TRUE,
.vlan_default_pvid_val = 1})); .vlan_default_pvid_val = 1}));
nm_platform_link_set_bridge_vlans(plat, ifindex, FALSE, NULL); nm_platform_link_set_bridge_vlans(plat, ifindex, FALSE, NULL, 0);
return TRUE; return TRUE;
} }
@@ -696,7 +695,7 @@ bridge_set_vlan_options(NMDevice *device, NMSettingBridge *s_bridge, gboolean is
.vlan_default_pvid_val = 0})); .vlan_default_pvid_val = 0}));
/* Clear all existing VLANs */ /* Clear all existing VLANs */
if (!nm_platform_link_set_bridge_vlans(plat, ifindex, FALSE, NULL)) if (!nm_platform_link_set_bridge_vlans(plat, ifindex, FALSE, NULL, 0))
return FALSE; return FALSE;
/* Now set the default PVID. After this point the kernel creates /* Now set the default PVID. After this point the kernel creates
@@ -714,8 +713,9 @@ bridge_set_vlan_options(NMDevice *device, NMSettingBridge *s_bridge, gboolean is
/* Create VLANs only after setting the default PVID, so that /* Create VLANs only after setting the default PVID, so that
* any PVID VLAN overrides the bridge's default PVID. */ * any PVID VLAN overrides the bridge's default PVID. */
g_object_get(s_bridge, NM_SETTING_BRIDGE_VLANS, &vlans, NULL); g_object_get(s_bridge, NM_SETTING_BRIDGE_VLANS, &vlans, NULL);
plat_vlans = setting_vlans_to_platform(vlans); plat_vlans = setting_vlans_to_platform(vlans, &num_vlans);
if (plat_vlans && !nm_platform_link_set_bridge_vlans(plat, ifindex, FALSE, plat_vlans)) if (plat_vlans
&& !nm_platform_link_set_bridge_vlans(plat, ifindex, FALSE, plat_vlans, num_vlans))
return FALSE; return FALSE;
nm_platform_link_set_bridge_info(plat, nm_platform_link_set_bridge_info(plat,
@@ -937,13 +937,14 @@ attach_port(NMDevice *device,
bridge_set_vlan_options(device, s_bridge, FALSE); bridge_set_vlan_options(device, s_bridge, FALSE);
if (nm_setting_bridge_get_vlan_filtering(s_bridge)) { if (nm_setting_bridge_get_vlan_filtering(s_bridge)) {
gs_free const NMPlatformBridgeVlan **plat_vlans = NULL; gs_free NMPlatformBridgeVlan *plat_vlans = NULL;
gs_unref_ptrarray GPtrArray *vlans = NULL; gs_unref_ptrarray GPtrArray *vlans = NULL;
guint num_vlans;
if (s_port) if (s_port)
g_object_get(s_port, NM_SETTING_BRIDGE_PORT_VLANS, &vlans, NULL); g_object_get(s_port, NM_SETTING_BRIDGE_PORT_VLANS, &vlans, NULL);
plat_vlans = setting_vlans_to_platform(vlans); plat_vlans = setting_vlans_to_platform(vlans, &num_vlans);
/* Since the link was just enportd, there are no existing VLANs /* Since the link was just enportd, there are no existing VLANs
* (except for the default one) and so there's no need to flush. */ * (except for the default one) and so there's no need to flush. */
@@ -952,7 +953,8 @@ attach_port(NMDevice *device,
&& !nm_platform_link_set_bridge_vlans(nm_device_get_platform(port), && !nm_platform_link_set_bridge_vlans(nm_device_get_platform(port),
nm_device_get_ifindex(port), nm_device_get_ifindex(port),
TRUE, TRUE,
plat_vlans)) plat_vlans,
num_vlans))
return FALSE; return FALSE;
} }

19
src/libnm-platform/nm-linux-platform.c
View File

@@ -9505,17 +9505,20 @@ nla_put_failure:
} }
static gboolean static gboolean
link_set_bridge_vlans(NMPlatform *platform, link_set_bridge_vlans(NMPlatform *platform,
int ifindex, int ifindex,
gboolean on_controller, gboolean on_controller,
const NMPlatformBridgeVlan *const *vlans) const NMPlatformBridgeVlan *vlans,
guint num_vlans)
{ {
nm_auto_nlmsg struct nl_msg *nlmsg = NULL; nm_auto_nlmsg struct nl_msg *nlmsg = NULL;
struct nlattr *list; struct nlattr *list;
struct bridge_vlan_info vinfo = {}; struct bridge_vlan_info vinfo = {};
guint i; guint i;
nlmsg = _nl_msg_new_link_full(vlans ? RTM_SETLINK : RTM_DELLINK, nm_assert(num_vlans == 0 || vlans);
nlmsg = _nl_msg_new_link_full(num_vlans > 0 ? RTM_SETLINK : RTM_DELLINK,
0, 0,
ifindex, ifindex,
NULL, NULL,
@@ -9533,10 +9536,10 @@ link_set_bridge_vlans(NMPlatform *platform,
IFLA_BRIDGE_FLAGS, IFLA_BRIDGE_FLAGS,
on_controller ? BRIDGE_FLAGS_CONTROLLER : BRIDGE_FLAGS_SELF); on_controller ? BRIDGE_FLAGS_CONTROLLER : BRIDGE_FLAGS_SELF);
if (vlans) { if (num_vlans > 0) {
/* Add VLANs */ /* Add VLANs */
for (i = 0; vlans[i]; i++) { for (i = 0; i < num_vlans; i++) {
const NMPlatformBridgeVlan *vlan = vlans[i]; const NMPlatformBridgeVlan *vlan = &vlans[i];
gboolean is_range = vlan->vid_start != vlan->vid_end; gboolean is_range = vlan->vid_start != vlan->vid_end;
vinfo.vid = vlan->vid_start; vinfo.vid = vlan->vid_start;

32
src/libnm-platform/nm-platform.c
View File

@@ -2070,10 +2070,11 @@ nm_platform_link_set_sriov_vfs(NMPlatform *self, int ifindex, const NMPlatformVF
} }
gboolean gboolean
nm_platform_link_set_bridge_vlans(NMPlatform *self, nm_platform_link_set_bridge_vlans(NMPlatform *self,
int ifindex, int ifindex,
gboolean on_controller, gboolean on_controller,
const NMPlatformBridgeVlan *const *vlans) const NMPlatformBridgeVlan *vlans,
guint num_vlans)
{ {
guint i; guint i;
_CHECK_SELF(self, klass, FALSE); _CHECK_SELF(self, klass, FALSE);
@@ -2085,9 +2086,9 @@ nm_platform_link_set_bridge_vlans(NMPlatform *self,
vlans ? "setting" : "clearing", vlans ? "setting" : "clearing",
on_controller ? "controller" : "self"); on_controller ? "controller" : "self");
if (vlans) { if (vlans) {
for (i = 0; vlans[i]; i++) { for (i = 0; i < num_vlans; i++) {
char sbuf[NM_UTILS_TO_STRING_BUFFER_SIZE]; char sbuf[NM_UTILS_TO_STRING_BUFFER_SIZE];
const NMPlatformBridgeVlan *vlan = vlans[i]; const NMPlatformBridgeVlan *vlan = &vlans[i];
_LOG3D("link: bridge VLAN %s", _LOG3D("link: bridge VLAN %s",
nm_platform_bridge_vlan_to_string(vlan, sbuf, sizeof(sbuf))); nm_platform_bridge_vlan_to_string(vlan, sbuf, sizeof(sbuf)));
@@ -2095,7 +2096,7 @@ nm_platform_link_set_bridge_vlans(NMPlatform *self,
} }
} }
return klass->link_set_bridge_vlans(self, ifindex, on_controller, vlans); return klass->link_set_bridge_vlans(self, ifindex, on_controller, vlans, num_vlans);
} }
gboolean gboolean
@@ -6148,9 +6149,9 @@ nm_platform_link_to_string(const NMPlatformLink *link, char *buf, gsize len)
link->initialized ? " init" : " not-init", link->initialized ? " init" : " not-init",
link->inet6_addr_gen_mode_inv ? " addrgenmode " : "", link->inet6_addr_gen_mode_inv ? " addrgenmode " : "",
link->inet6_addr_gen_mode_inv ? nm_platform_link_inet6_addrgenmode2str( link->inet6_addr_gen_mode_inv ? nm_platform_link_inet6_addrgenmode2str(
_nm_platform_uint8_inv(link->inet6_addr_gen_mode_inv), _nm_platform_uint8_inv(link->inet6_addr_gen_mode_inv),
str_addrmode, str_addrmode,
sizeof(str_addrmode)) sizeof(str_addrmode))
: "", : "",
str_address[0] ? " addr " : "", str_address[0] ? " addr " : "",
str_address[0] ? str_address : "", str_address[0] ? str_address : "",
@@ -7386,12 +7387,11 @@ nm_platform_ip6_route_to_string(const NMPlatformIP6Route *route, char *buf, gsiz
route->lock_mtu ? "lock " : "", route->lock_mtu ? "lock " : "",
route->mtu) route->mtu)
: "", : "",
route->rt_pref route->rt_pref ? nm_sprintf_buf(
? nm_sprintf_buf( str_pref,
str_pref, " pref %s",
" pref %s", nm_icmpv6_router_pref_to_string(route->rt_pref, str_pref2, sizeof(str_pref2)))
nm_icmpv6_router_pref_to_string(route->rt_pref, str_pref2, sizeof(str_pref2))) : "");
: "");
return buf; return buf;
} }

18
src/libnm-platform/nm-platform.h
View File

@@ -1185,10 +1185,11 @@ typedef struct {
gpointer callback_data, gpointer callback_data,
GCancellable *cancellable); GCancellable *cancellable);
gboolean (*link_set_sriov_vfs)(NMPlatform *self, int ifindex, const NMPlatformVF *const *vfs); gboolean (*link_set_sriov_vfs)(NMPlatform *self, int ifindex, const NMPlatformVF *const *vfs);
gboolean (*link_set_bridge_vlans)(NMPlatform *self, gboolean (*link_set_bridge_vlans)(NMPlatform *self,
int ifindex, int ifindex,
gboolean on_controller, gboolean on_controller,
const NMPlatformBridgeVlan *const *vlans); const NMPlatformBridgeVlan *vlans,
guint num_vlans);
gboolean (*link_set_bridge_info)(NMPlatform *self, gboolean (*link_set_bridge_info)(NMPlatform *self,
int ifindex, int ifindex,
const NMPlatformLinkSetBridgeInfoData *bridge_info); const NMPlatformLinkSetBridgeInfoData *bridge_info);
@@ -2049,10 +2050,11 @@ void nm_platform_link_set_sriov_params_async(NMPlatform *self,
gboolean gboolean
nm_platform_link_set_sriov_vfs(NMPlatform *self, int ifindex, const NMPlatformVF *const *vfs); nm_platform_link_set_sriov_vfs(NMPlatform *self, int ifindex, const NMPlatformVF *const *vfs);
gboolean nm_platform_link_set_bridge_vlans(NMPlatform *self, gboolean nm_platform_link_set_bridge_vlans(NMPlatform *self,
int ifindex, int ifindex,
gboolean on_controller, gboolean on_controller,
const NMPlatformBridgeVlan *const *vlans); const NMPlatformBridgeVlan *vlans,
guint num_vlans);
gboolean nm_platform_link_set_bridge_info(NMPlatform *self, gboolean nm_platform_link_set_bridge_info(NMPlatform *self,
int ifindex, int ifindex,
const NMPlatformLinkSetBridgeInfoData *bridge_info); const NMPlatformLinkSetBridgeInfoData *bridge_info);