system/NetworkManager
system/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager synced 2024-09-16 06:40:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

core/device: make sriov setting require sriov cap

Browse source 
Make connections that have "sriov" setting incompatible with devices
that lack NM_DEVICE_CAP_SRIOV capability.

Otherwise applying the SR-IOV properties either fails too late, or is
ignored silently.

https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/1432
This commit is contained in:
Lubomir Rintel 2022-10-11 19:06:19 +02:00
parent 227ae41216
commit 59b2ef50e4
1 changed files with 17 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -8784,6 +8784,14 @@ check_connection_compatible(NMDevice *self, NMConnection *connection, GError **e
return FALSE;
}
if (!nm_device_has_capability(self, NM_DEVICE_CAP_SRIOV)
&& nm_connection_get_setting(connection, NM_TYPE_SETTING_SRIOV)) {
nm_utils_error_set_literal(error,
NM_UTILS_ERROR_CONNECTION_AVAILABLE_TEMPORARY,
"device does not support SR-IOV");
return FALSE;
}
conn_iface = nm_manager_get_connection_iface(NM_MANAGER_GET, connection, NULL, NULL, &local);
/* We always need a interface name for virtual devices, but for
@ -9367,14 +9375,17 @@ activate_stage1_device_prepare(NMDevice *self)
nm_device_state_changed(self, NM_DEVICE_STATE_PREPARE, NM_DEVICE_STATE_REASON_NONE);
if (priv->stage1_sriov_state != NM_DEVICE_STAGE_STATE_COMPLETED) {
NMSettingSriov *s_sriov;
NMSettingSriov *s_sriov = NULL;
if (nm_device_sys_iface_state_is_external_or_assume(self)) {
/* pass */
} else if (priv->stage1_sriov_state == NM_DEVICE_STAGE_STATE_PENDING)
} else if (priv->stage1_sriov_state == NM_DEVICE_STAGE_STATE_PENDING) {
return;
else if (priv->ifindex > 0 && nm_device_has_capability(self, NM_DEVICE_CAP_SRIOV)
&& (s_sriov = nm_device_get_applied_setting(self, NM_TYPE_SETTING_SRIOV))) {
} else if (priv->ifindex > 0) {
s_sriov = nm_device_get_applied_setting(self, NM_TYPE_SETTING_SRIOV);
}
if (s_sriov) {
nm_auto_freev NMPlatformVF **plat_vfs = NULL;
gs_free_error GError *error = NULL;
NMSriovVF *vf;
@ -9382,6 +9393,8 @@ activate_stage1_device_prepare(NMDevice *self)
guint num;
guint i;
nm_assert(nm_device_has_capability(self, NM_DEVICE_CAP_SRIOV));
autoprobe = nm_setting_sriov_get_autoprobe_drivers(s_sriov);
if (autoprobe == NM_TERNARY_DEFAULT) {
autoprobe = nm_config_data_get_connection_default_int64(