system/NetworkManager
system/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager synced 2024-07-21 10:14:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

device: support ethtool channels properties

Browse source 
Apply the new ethtool channels properties when activating a device,
and reset them on disconnect.
This commit is contained in:
Beniamino Galvani 2023-10-11 19:11:54 +02:00 committed by Íñigo Huguet
parent c3e538e1cd
commit 6c41cb3a58
1 changed files with 102 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -303,6 +303,7 @@ typedef struct {
NMEthtoolCoalesceState *coalesce;
NMEthtoolRingState *ring;
NMEthtoolPauseState *pause;
NMEthtoolChannelsState *channels;
} EthtoolState;
typedef enum {
@ -2603,6 +2604,104 @@ _ethtool_ring_set(NMDevice *self,
_LOGD(LOGD_DEVICE, "ethtool: ring settings successfully set");
}
static void
_ethtool_channels_reset(NMDevice *self, NMPlatform *platform, EthtoolState *ethtool_state)
{
gs_free NMEthtoolChannelsState *channels = NULL;
nm_assert(NM_IS_DEVICE(self));
nm_assert(NM_IS_PLATFORM(platform));
nm_assert(ethtool_state);
channels = g_steal_pointer(&ethtool_state->channels);
if (!channels)
return;
if (!nm_platform_ethtool_set_channels(platform, ethtool_state->ifindex, channels))
_LOGW(LOGD_DEVICE, "ethtool: failure resetting one or more channels settings");
else
_LOGD(LOGD_DEVICE, "ethtool: channels settings successfully reset");
}
static void
_ethtool_channels_set(NMDevice *self,
NMPlatform *platform,
EthtoolState *ethtool_state,
NMSettingEthtool *s_ethtool)
{
NMEthtoolChannelsState channels_old;
NMEthtoolChannelsState channels_new;
GHashTable *hash;
GHashTableIter iter;
const char *name;
GVariant *variant;
gboolean has_old = FALSE;
nm_assert(NM_IS_DEVICE(self));
nm_assert(NM_IS_PLATFORM(platform));
nm_assert(NM_IS_SETTING_ETHTOOL(s_ethtool));
nm_assert(ethtool_state);
nm_assert(!ethtool_state->channels);
hash = _nm_setting_option_hash(NM_SETTING(s_ethtool), FALSE);
if (!hash)
return;
g_hash_table_iter_init(&iter, hash);
while (g_hash_table_iter_next(&iter, (gpointer *) &name, (gpointer *) &variant)) {
NMEthtoolID ethtool_id = nm_ethtool_id_get_by_name(name);
guint32 u32;
if (!nm_ethtool_id_is_channels(ethtool_id))
continue;
nm_assert(g_variant_is_of_type(variant, G_VARIANT_TYPE_UINT32));
if (!has_old) {
if (!nm_platform_ethtool_get_link_channels(platform,
ethtool_state->ifindex,
&channels_old)) {
_LOGW(LOGD_DEVICE,
"ethtool: failure setting channels options (cannot read existing setting)");
return;
}
has_old = TRUE;
channels_new = channels_old;
}
u32 = g_variant_get_uint32(variant);
switch (ethtool_id) {
case NM_ETHTOOL_ID_CHANNELS_RX:
channels_new.rx = u32;
break;
case NM_ETHTOOL_ID_CHANNELS_TX:
channels_new.tx = u32;
break;
case NM_ETHTOOL_ID_CHANNELS_OTHER:
channels_new.other = u32;
break;
case NM_ETHTOOL_ID_CHANNELS_COMBINED:
channels_new.combined = u32;
break;
default:
nm_assert_not_reached();
}
}
if (!has_old)
return;
ethtool_state->channels = nm_memdup(&channels_old, sizeof(channels_old));
if (!nm_platform_ethtool_set_channels(platform, ethtool_state->ifindex, &channels_new)) {
_LOGW(LOGD_DEVICE, "ethtool: failure setting channels settings");
return;
}
_LOGD(LOGD_DEVICE, "ethtool: channels settings successfully set");
}
static void
_ethtool_pause_reset(NMDevice *self, NMPlatform *platform, EthtoolState *ethtool_state)
{
@ -2724,6 +2823,7 @@ _ethtool_state_reset(NMDevice *self)
_ethtool_coalesce_reset(self, platform, ethtool_state);
_ethtool_ring_reset(self, platform, ethtool_state);
_ethtool_pause_reset(self, platform, ethtool_state);
_ethtool_channels_reset(self, platform, ethtool_state);
}
static void
@ -2758,9 +2858,10 @@ _ethtool_state_set(NMDevice *self)
_ethtool_coalesce_set(self, platform, ethtool_state, s_ethtool);
_ethtool_ring_set(self, platform, ethtool_state, s_ethtool);
_ethtool_pause_set(self, platform, ethtool_state, s_ethtool);
_ethtool_channels_set(self, platform, ethtool_state, s_ethtool);
if (ethtool_state->features || ethtool_state->coalesce || ethtool_state->ring
|| ethtool_state->pause)
|| ethtool_state->pause || ethtool_state->channels)
priv->ethtool_state = g_steal_pointer(&ethtool_state);
}