fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-01-06 15:30:14 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

merge: branch 'bg/rh2054933'

Browse source 
https://bugzilla.redhat.com/show_bug.cgi?id=2054933
https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/1569
This commit is contained in:
Beniamino Galvani 2023-04-04 08:22:39 +02:00
commit a2db213a45
8 changed files with 124 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/core/devices/nm-device-bond.c
View file

@ -695,8 +695,13 @@ attach_port(NMDevice *device,
return TRUE;
}
static void
detach_port(NMDevice *device, NMDevice *port, gboolean configure)
static NMTernary
detach_port(NMDevice *device,
NMDevice *port,
gboolean configure,
GCancellable *cancellable,
NMDeviceAttachPortCallback callback,
gpointer user_data)
{
NMDeviceBond *self = NM_DEVICE_BOND(device);
gboolean success;
@ -758,6 +763,8 @@ detach_port(NMDevice *device, NMDevice *port, gboolean configure)
_LOGI(LOGD_BOND, "bond port %s was detached", nm_device_get_ip_iface(port));
}
}
return TRUE;
}
static gboolean

13
src/core/devices/nm-device-bridge.c
View file

@ -1052,8 +1052,13 @@ attach_port(NMDevice *device,
return TRUE;
}
static void
detach_port(NMDevice *device, NMDevice *port, gboolean configure)
static NMTernary
detach_port(NMDevice *device,
NMDevice *port,
gboolean configure,
GCancellable *cancellable,
NMDeviceAttachPortCallback callback,
gpointer user_data)
{
NMDeviceBridge *self = NM_DEVICE_BRIDGE(device);
gboolean success;
@ -1070,7 +1075,7 @@ detach_port(NMDevice *device, NMDevice *port, gboolean configure)
if (ifindex_slave <= 0) {
_LOGD(LOGD_TEAM, "bridge port %s is already detached", nm_device_get_ip_iface(port));
return;
return TRUE;
}
if (configure) {
@ -1086,6 +1091,8 @@ detach_port(NMDevice *device, NMDevice *port, gboolean configure)
} else {
_LOGI(LOGD_BRIDGE, "bridge port %s was detached", nm_device_get_ip_iface(port));
}
return TRUE;
}
static gboolean

11
src/core/devices/nm-device-vrf.c
View file

@ -241,8 +241,13 @@ attach_port(NMDevice *device,
return TRUE;
}
static void
detach_port(NMDevice *device, NMDevice *port, gboolean configure)
static NMTernary
detach_port(NMDevice *device,
NMDevice *port,
gboolean configure,
GCancellable *cancellable,
NMDeviceAttachPortCallback callback,
gpointer user_data)
{
NMDeviceVrf *self = NM_DEVICE_VRF(device);
gboolean success;
@ -277,6 +282,8 @@ detach_port(NMDevice *device, NMDevice *port, gboolean configure)
_LOGI(LOGD_DEVICE, "VRF port %s was detached", nm_device_get_ip_iface(port));
}
}
return TRUE;
}
/*****************************************************************************/

40
src/core/devices/nm-device.c
View file

@ -749,6 +749,9 @@ typedef struct _NMDevicePrivate {
guint check_delete_unrealized_id;
guint32 interface_flags;
guint32 port_detach_count;
NMDeviceStateReason port_detach_reason;
struct {
SriovOp *pending; /* SR-IOV operation currently running */
SriovOp *next; /* next SR-IOV operation scheduled */
@ -869,6 +872,7 @@ static void sriov_op_cb(GError *error, gpointer user_data);
static void device_ifindex_changed_cb(NMManager *manager, NMDevice *device_changed, NMDevice *self);
static gboolean device_link_changed(gpointer user_data);
static gboolean _get_maybe_ipv6_disabled(NMDevice *self);
static void deactivate_ready(NMDevice *self, NMDeviceStateReason reason);
/*****************************************************************************/
@ -6346,6 +6350,21 @@ nm_device_master_enslave_slave(NMDevice *self, NMDevice *slave, NMConnection *co
attach_port_done(self, slave, success);
}
static void
detach_port_cb(NMDevice *self, GError *error, gpointer user_data)
{
nm_auto_unref_object NMDevice *slave = user_data;
NMDevicePrivate *slave_priv = NM_DEVICE_GET_PRIVATE(slave);
nm_assert(slave_priv->port_detach_count > 0);
if (--slave_priv->port_detach_count == 0) {
if (slave_priv->state == NM_DEVICE_STATE_DEACTIVATING) {
deactivate_ready(slave, slave_priv->port_detach_reason);
}
}
}
/**
* nm_device_master_release_slave:
* @self: the master device
@ -6402,10 +6421,20 @@ nm_device_master_release_slave(NMDevice *self,
/* first, let subclasses handle the release ... */
if (info->slave_is_enslaved || nm_device_sys_iface_state_is_external(slave)
|| release_type >= RELEASE_SLAVE_TYPE_CONFIG_FORCE)
NM_DEVICE_GET_CLASS(self)->detach_port(self,
slave,
release_type >= RELEASE_SLAVE_TYPE_CONFIG);
|| release_type >= RELEASE_SLAVE_TYPE_CONFIG_FORCE) {
NMTernary ret;
ret = NM_DEVICE_GET_CLASS(self)->detach_port(self,
slave,
release_type >= RELEASE_SLAVE_TYPE_CONFIG,
NULL,
detach_port_cb,
g_object_ref(slave));
if (ret == NM_TERNARY_DEFAULT) {
slave_priv->port_detach_count++;
slave_priv->port_detach_reason = reason;
}
}
/* raise notifications about the release, including clearing is_enslaved. */
nm_device_slave_notify_release(slave, reason, release_type);
@ -15811,6 +15840,9 @@ deactivate_ready(NMDevice *self, NMDeviceStateReason reason)
{
NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE(self);
if (priv->port_detach_count > 0)
return;
if (priv->dispatcher.call_id)
return;

10
src/core/devices/nm-device.h
View file

@ -389,7 +389,15 @@ typedef struct _NMDeviceClass {
GCancellable *cancellable,
NMDeviceAttachPortCallback callback,
gpointer user_data);
void (*detach_port)(NMDevice *self, NMDevice *port, gboolean configure);
/* This works similarly to attach_port(). However, current
* implementations don't report errors and so the only possible
* return values are TRUE and DEFAULT. */
NMTernary (*detach_port)(NMDevice *self,
NMDevice *port,
gboolean configure,
GCancellable *cancellable,
NMDeviceAttachPortCallback callback,
gpointer user_data);
void (*parent_changed_notify)(NMDevice *self,
int old_ifindex,

13
src/core/devices/ovs/nm-device-ovs-bridge.c
View file

@ -97,9 +97,16 @@ attach_port(NMDevice *device,
return TRUE;
}
static void
detach_port(NMDevice *device, NMDevice *port, gboolean configure)
{}
static NMTernary
detach_port(NMDevice *device,
NMDevice *port,
gboolean configure,
GCancellable *cancellable,
NMDeviceAttachPortCallback callback,
gpointer user_data)
{
return TRUE;
}
void
nm_device_ovs_reapply_connection(NMDevice *self, NMConnection *con_old, NMConnection *con_new)

58
src/core/devices/ovs/nm-device-ovs-port.c
View file

@ -78,10 +78,11 @@ typedef struct {
GCancellable *cancellable;
NMDeviceAttachPortCallback callback;
gpointer callback_user_data;
gboolean add;
} AttachPortData;
static void
add_iface_cb(GError *error, gpointer user_data)
add_del_iface_cb(GError *error, gpointer user_data)
{
AttachPortData *data = user_data;
NMDeviceOvsPort *self;
@ -93,15 +94,17 @@ add_iface_cb(GError *error, gpointer user_data)
} else if (error && !nm_utils_error_is_cancelled_or_disposing(error)) {
self = NM_DEVICE_OVS_PORT(data->device);
_LOGW(LOGD_DEVICE,
"device %s could not be added to a ovs port: %s",
"device %s could not be %s a ovs port: %s",
nm_device_get_iface(data->port),
data->add ? "added to" : "removed from",
error->message);
nm_device_state_changed(data->port,
NM_DEVICE_STATE_FAILED,
NM_DEVICE_STATE_REASON_OVSDB_FAILED);
}
data->callback(data->device, error, data->callback_user_data);
if (data->callback)
data->callback(data->device, error, data->callback_user_data);
g_object_unref(data->device);
g_object_unref(data->port);
@ -178,6 +181,7 @@ attach_port(NMDevice *device,
.cancellable = g_object_ref(cancellable),
.callback = callback,
.callback_user_data = user_data,
.add = TRUE,
};
nm_ovsdb_add_interface(nm_ovsdb_get(),
@ -186,7 +190,7 @@ attach_port(NMDevice *device,
nm_device_get_applied_connection(port),
bridge_device,
port,
add_iface_cb,
add_del_iface_cb,
data);
/* DPDK ports does not have a link after the devbind, so the MTU must be
@ -205,29 +209,19 @@ attach_port(NMDevice *device,
return NM_TERNARY_DEFAULT;
}
static void
del_iface_cb(GError *error, gpointer user_data)
{
NMDevice *slave = user_data;
if (error && !g_error_matches(error, NM_UTILS_ERROR, NM_UTILS_ERROR_CANCELLED_DISPOSING)) {
nm_log_warn(LOGD_DEVICE,
"device %s could not be removed from a ovs port: %s",
nm_device_get_iface(slave),
error->message);
nm_device_state_changed(slave, NM_DEVICE_STATE_FAILED, NM_DEVICE_STATE_REASON_OVSDB_FAILED);
}
g_object_unref(slave);
}
static void
detach_port(NMDevice *device, NMDevice *port, gboolean configure)
static NMTernary
detach_port(NMDevice *device,
NMDevice *port,
gboolean configure,
GCancellable *cancellable,
NMDeviceAttachPortCallback callback,
gpointer user_data)
{
NMDeviceOvsPort *self = NM_DEVICE_OVS_PORT(device);
bool port_not_managed = !NM_IN_SET(nm_device_sys_iface_state_get(port),
NM_DEVICE_SYS_IFACE_STATE_MANAGED,
NM_DEVICE_SYS_IFACE_STATE_ASSUME);
NMTernary ret = TRUE;
_LOGI(LOGD_DEVICE, "detaching ovs interface %s", nm_device_get_ip_iface(port));
@ -236,10 +230,20 @@ detach_port(NMDevice *device, NMDevice *port, gboolean configure)
* to make sure its OVSDB entry is gone.
*/
if (configure || port_not_managed) {
nm_ovsdb_del_interface(nm_ovsdb_get(),
nm_device_get_iface(port),
del_iface_cb,
g_object_ref(port));
AttachPortData *data;
data = g_slice_new(AttachPortData);
*data = (AttachPortData){
.device = g_object_ref(device),
.port = g_object_ref(port),
.cancellable = nm_g_object_ref(cancellable),
.callback = callback,
.callback_user_data = user_data,
.add = FALSE,
};
nm_ovsdb_del_interface(nm_ovsdb_get(), nm_device_get_iface(port), add_del_iface_cb, data);
ret = NM_TERNARY_DEFAULT;
}
if (configure) {
@ -248,6 +252,8 @@ detach_port(NMDevice *device, NMDevice *port, gboolean configure)
if (NM_IS_DEVICE_OVS_INTERFACE(port))
nm_device_update_from_platform_link(port, NULL);
}
return ret;
}
/*****************************************************************************/

11
src/core/devices/team/nm-device-team.c
View file

@ -913,8 +913,13 @@ attach_port(NMDevice *device,
return TRUE;
}
static void
detach_port(NMDevice *device, NMDevice *port, gboolean configure)
static NMTernary
detach_port(NMDevice *device,
NMDevice *port,
gboolean configure,
GCancellable *cancellable,
NMDeviceAttachPortCallback callback,
gpointer user_data)
{
NMDeviceTeam *self = NM_DEVICE_TEAM(device);
NMDeviceTeamPrivate *priv = NM_DEVICE_TEAM_GET_PRIVATE(self);
@ -964,6 +969,8 @@ detach_port(NMDevice *device, NMDevice *port, gboolean configure)
_update_port_config(self, port_iface, "{}");
g_hash_table_remove(priv->port_configs, port_iface);
}
return TRUE;
}
static gboolean