system/NetworkManager
system/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager synced 2024-07-09 04:05:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

initrd: add support for rd.net.dhcp.dscp property

Browse Source 
Add a new kernel command line option, so that the DSCP value can by
changed even in early boot.
This commit is contained in:
Beniamino Galvani 2023-12-21 13:40:38 +01:00
parent 3cf6a805ba
commit d920b48a5f
3 changed files with 53 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
man/nm-initrd-generator.xml
View File

@ -160,6 +160,7 @@
<member><option>rd.net.timeout.dhcp</option></member>
<member><option>rd.net.dhcp.retry</option></member>
<member><option>rd.net.dhcp.vendor-class</option></member>
<member><option>rd.net.dhcp.dscp</option></member>
<member><option>rd.net.timeout.carrier</option></member>
<member><option>rd.znet</option></member>
<member><option>rd.znet_ifname</option></member>
@ -223,6 +224,15 @@
<replaceable>SPEED</replaceable> accepts positive integer values.
</para>
</listitem>
<listitem>
<para>NetworkManager supports the
<option>rd.net.dhcp.dscp</option>={<replaceable>CS0</replaceable>|<replaceable>CS4</replaceable>|<replaceable>CS6</replaceable>}
kernel command line option to set a specific DSCP (TOS) value
in the IP header of DHCP messages.
</para>
</listitem>
</itemizedlist>
</refsect1>

16
src/nm-initrd-generator/nmi-cmdline-reader.c
View File

@ -39,6 +39,7 @@ typedef struct {
gboolean ignore_auto_dns;
int dhcp_timeout;
char *dhcp4_vci;
char *dhcp_dscp;
gint64 carrier_timeout_sec;
} Reader;
@ -73,6 +74,7 @@ reader_destroy(Reader *reader, gboolean free_hash)
nm_clear_g_free(&reader->hostname);
g_hash_table_unref(reader->znet_ifnames);
nm_clear_g_free(&reader->dhcp4_vci);
nm_clear_g_free(&reader->dhcp_dscp);
nm_g_slice_free(reader);
if (!free_hash)
return g_steal_pointer(&hash);
@ -122,6 +124,8 @@ reader_create_connection(Reader *reader,
reader->dhcp_timeout,
NM_SETTING_IP4_CONFIG_DHCP_VENDOR_CLASS_IDENTIFIER,
reader->dhcp4_vci,
NM_SETTING_IP_CONFIG_DHCP_DSCP,
reader->dhcp_dscp,
NM_SETTING_IP_CONFIG_REQUIRED_TIMEOUT,
NMI_IP_REQUIRED_TIMEOUT_MSEC,
NULL);
@ -1289,6 +1293,8 @@ _normalize_conn(gpointer key, gpointer value, gpointer user_data)
NULL,
NM_SETTING_IP4_CONFIG_DHCP_VENDOR_CLASS_IDENTIFIER,
NULL,
NM_SETTING_IP_CONFIG_DHCP_DSCP,
NULL,
NULL);
}
}
@ -1429,6 +1435,13 @@ nmi_cmdline_reader_parse(const char *etc_connections_dir,
} else if (nm_streq(tag, "rd.net.dhcp.vendor-class")) {
if (nm_utils_validate_dhcp4_vendor_class_id(argument, NULL))
nm_strdup_reset(&reader->dhcp4_vci, argument);
} else if (nm_streq(tag, "rd.net.dhcp.dscp")) {
gs_free_error GError *error = NULL;
if (nm_utils_validate_dhcp_dscp(argument, &error))
nm_strdup_reset(&reader->dhcp_dscp, argument);
else
_LOGW(LOGD_CORE, "Ignoring 'rd.net.dhcp.dscp=%s': %s", argument, error->message);
} else if (nm_streq(tag, "rd.net.timeout.carrier")) {
reader->carrier_timeout_sec =
_nm_utils_ascii_str_to_int64(argument, 10, 0, G_MAXINT32, 0);
@ -1491,8 +1504,9 @@ nmi_cmdline_reader_parse(const char *etc_connections_dir,
} else if (g_ascii_strcasecmp(tag, "BOOTIF") == 0) {
nm_clear_g_free(&bootif_val);
bootif_val = g_strdup(argument);
} else if (nm_streq(tag, "rd.ethtool"))
} else if (nm_streq(tag, "rd.ethtool")) {
reader_parse_ethtool(reader, argument);
}
}
for (i = 0; i < reader->vlan_parents->len; i++) {

28
src/nm-initrd-generator/tests/test-cmdline-reader.c
View File

@ -2354,6 +2354,33 @@ test_dhcp_vendor_class_id(void)
g_assert(nm_setting_ip4_config_get_dhcp_vendor_class_identifier(s_ip4) == NULL);
}
static void
test_dhcp_dscp(void)
{
const char *const *ARGV;
gs_unref_object NMConnection *connection = NULL;
NMSettingIPConfig *s_ip4;
ARGV = NM_MAKE_STRV("rd.net.dhcp.dscp=CS4", "ip=eno1:dhcp");
connection = _parse_con(ARGV, "eno1");
s_ip4 = NM_SETTING_IP_CONFIG(nm_connection_get_setting_ip4_config(connection));
g_assert_cmpstr(nm_setting_ip_config_get_dhcp_dscp(s_ip4), ==, "CS4");
g_clear_object(&connection);
ARGV = NM_MAKE_STRV("rd.net.dhcp.dscp=CS0", "ip=eno1:dhcp");
connection = _parse_con(ARGV, "eno1");
s_ip4 = NM_SETTING_IP_CONFIG(nm_connection_get_setting_ip4_config(connection));
g_assert_cmpstr(nm_setting_ip_config_get_dhcp_dscp(s_ip4), ==, "CS0");
g_clear_object(&connection);
ARGV = NM_MAKE_STRV("ip=eno1:dhcp");
connection = _parse_con(ARGV, "eno1");
s_ip4 = NM_SETTING_IP_CONFIG(nm_connection_get_setting_ip4_config(connection));
g_assert_cmpstr(nm_setting_ip_config_get_dhcp_dscp(s_ip4), ==, NULL);
}
static void
test_infiniband_iface(void)
{
@ -2652,6 +2679,7 @@ main(int argc, char **argv)
g_test_add_func("/initrd/cmdline/neednet/no_args", test_neednet_no_args);
g_test_add_func("/initrd/cmdline/neednet/args", test_neednet_args);
g_test_add_func("/initrd/cmdline/dhcp/vendor_class_id", test_dhcp_vendor_class_id);
g_test_add_func("/initrd/cmdline/dhcp/dscp", test_dhcp_dscp);
g_test_add_func("/initrd/cmdline/infiniband/iface", test_infiniband_iface);
g_test_add_func("/initrd/cmdline/infiniband/mac", test_infiniband_mac);
g_test_add_func("/initrd/cmdline/infiniband/pkey", test_infiniband_pkey);