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

core: use the sriov.preserve-on-down property

Browse Source
This commit is contained in:
Beniamino Galvani
2025-05-19 15:39:45 +02:00
parent eb0a22a162
commit c70b4a98a3
2 changed files with 30 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
man/NetworkManager.conf.xml
View File

@@ -1093,6 +1093,12 @@ ipv6.ip6-privacy=0
<term><varname>sriov.autoprobe-drivers</varname></term> <term><varname>sriov.autoprobe-drivers</varname></term>
<listitem><para>If left unspecified, drivers are autoprobed when the SR-IOV VF gets created.</para></listitem> <listitem><para>If left unspecified, drivers are autoprobed when the SR-IOV VF gets created.</para></listitem>
</varlistentry> </varlistentry>
<varlistentry>
<term><varname>sriov.preserve-on-down</varname></term>
<listitem><para>Set to 0 or 1 to select whether the SR-IOV parameters are
preserved when the connection is deactivated. If left unspecified, default
to 0 (parameters are not preserved). </para></listitem>
</varlistentry>
<varlistentry> <varlistentry>
<term><varname>vpn.timeout</varname></term> <term><varname>vpn.timeout</varname></term>
<listitem><para>If left unspecified, default value of 60 seconds is used.</para></listitem> <listitem><para>If left unspecified, default value of 60 seconds is used.</para></listitem>

26
src/core/devices/nm-device.c
View File

@@ -1416,6 +1416,26 @@ _prop_get_connection_mdns(NMDevice *self)
NM_SETTING_CONNECTION_MDNS_DEFAULT); NM_SETTING_CONNECTION_MDNS_DEFAULT);
} }
static gboolean
_prop_get_sriov_preserve_on_down(NMDevice *self, NMSettingSriov *s_sriov)
{
NMSriovPreserveOnDown preserve;
g_return_val_if_fail(NM_IS_DEVICE(self), FALSE);
g_return_val_if_fail(NM_IS_SETTING_SRIOV(s_sriov), FALSE);
preserve = nm_setting_sriov_get_preserve_on_down(s_sriov);
if (NM_IN_SET(preserve, NM_SRIOV_PRESERVE_ON_DOWN_NO, NM_SRIOV_PRESERVE_ON_DOWN_YES))
return preserve;
return nm_config_data_get_connection_default_int64(NM_CONFIG_GET_DATA,
NM_CON_DEFAULT("sriov.preserve-on-down"),
self,
NM_SRIOV_PRESERVE_ON_DOWN_NO,
NM_SRIOV_PRESERVE_ON_DOWN_YES,
NM_SRIOV_PRESERVE_ON_DOWN_NO);
}
static NMSettingConnectionLlmnr static NMSettingConnectionLlmnr
_prop_get_connection_llmnr(NMDevice *self) _prop_get_connection_llmnr(NMDevice *self)
{ {
@@ -17478,7 +17498,8 @@ _set_state_full(NMDevice *self, NMDeviceState state, NMDeviceStateReason reason,
} }
if (priv->ifindex > 0 if (priv->ifindex > 0
&& (s_sriov = nm_device_get_applied_setting(self, NM_TYPE_SETTING_SRIOV))) { && (s_sriov = nm_device_get_applied_setting(self, NM_TYPE_SETTING_SRIOV))
&& (!_prop_get_sriov_preserve_on_down(self, s_sriov))) {
priv->sriov_reset_pending++; priv->sriov_reset_pending++;
sriov_op_queue(self, sriov_op_queue(self,
0, 0,
@@ -17533,7 +17554,8 @@ _set_state_full(NMDevice *self, NMDeviceState state, NMDeviceStateReason reason,
nm_settings_connection_update_timestamp(sett_conn, (guint64) 0); nm_settings_connection_update_timestamp(sett_conn, (guint64) 0);
if (priv->ifindex > 0 if (priv->ifindex > 0
&& (s_sriov = nm_device_get_applied_setting(self, NM_TYPE_SETTING_SRIOV))) { && (s_sriov = nm_device_get_applied_setting(self, NM_TYPE_SETTING_SRIOV))
&& (!_prop_get_sriov_preserve_on_down(self, s_sriov))) {
priv->sriov_reset_pending++; priv->sriov_reset_pending++;
sriov_op_queue(self, sriov_op_queue(self,
0, 0,