networkd: Add bridge port path cost

This patch add support to specify path cost of the
bridge port to be configured via conf file.

Exampe: conf

file: br.netdev

[NetDev]
Name=br-test
Kind=bridge

file: br.network
[Match]
Name=em1

[Network]
Bridge=br-test

[BridgePort]
Cost=332

 bridge link
2: em1 state UP : <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 master
br-test state disabled priority 32 cost 332

diff --git a/man/systemd.network.xml b/man/systemd.network.xml
index 4cc13b2afcbea6e1942866c43b8430e2a139d0da..c9c946c00a5163dadcc0623ef0c469f2faf48dab 100644 (file)
--- a/man/systemd.network.xml
+++ b/man/systemd.network.xml
@@ -504,6 +504,19 @@
 
         </refsect1>
 
+        <refsect1>
+                <title>[BridgePort] Section Options</title>
+                        <para>The <literal>[BridgePort]</literal> section accepts the following keys.</para>
+                        <variablelist class='network-directives'>
+                                <varlistentry>
+                                        <term><varname>Cost=</varname></term>
+                                        <listitem>
+                                          <para>Each port in a bridge may have different speed. Cost is used to decide which link to use. Faster interfaces should have lower costs</para>
+                                        </listitem>
+                                </varlistentry>
+                        </variablelist>
+        </refsect1>
+
         <refsect1>
                 <title>Example</title>
                 <example>

diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c
index 2eb0925d7373199f6c83add28f0e3ab50b27189e..a4f8c59e09d1e3e49516c406731bf7fb83a0747d 100644 (file)
--- a/src/network/networkd-link.c
+++ b/src/network/networkd-link.c
@@ -685,6 +685,27 @@ int link_address_drop_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata)
         return 1;
 }
 
+static int link_set_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) {
+        _cleanup_link_unref_ Link *link = userdata;
+        int r;
+
+        log_debug_link(link, "set link");
+
+        r = sd_rtnl_message_get_errno(m);
+        if (r < 0 && r != -EEXIST) {
+                log_struct_link(LOG_ERR, link,
+                                "MESSAGE=%-*s: could not join netdev: %s",
+                                IFNAMSIZ,
+                                link->ifname, strerror(-r),
+                                "ERRNO=%d", -r,
+                                NULL);
+                link_enter_failed(link);
+                return 1;
+        }
+
+        return 0;
+}
+
 static int set_hostname_handler(sd_bus *bus, sd_bus_message *m, void *userdata,
                                 sd_bus_error *ret_error) {
         _cleanup_link_unref_ Link *link = userdata;
@@ -802,6 +823,69 @@ int link_set_mtu(Link *link, uint32_t mtu) {
         return 0;
 }
 
+static int link_set_bridge(Link *link) {
+        _cleanup_rtnl_message_unref_ sd_rtnl_message *req = NULL;
+        int r;
+
+        assert(link);
+        assert(link->network);
+
+        if(link->network->cost == 0)
+                return 0;
+
+        r = sd_rtnl_message_new_link(link->manager->rtnl, &req,
+                                     RTM_SETLINK, link->ifindex);
+        if (r < 0) {
+                log_error_link(link, "Could not allocate RTM_SETLINK message");
+                return r;
+        }
+
+        r = sd_rtnl_message_link_set_family(req, PF_BRIDGE);
+        if (r < 0) {
+                log_error_link(link,
+                               "Could not set message family %s", strerror(-r));
+                return r;
+        }
+
+        r = sd_rtnl_message_open_container(req, IFLA_PROTINFO);
+        if (r < 0) {
+                log_error_link(link,
+                               "Could not append IFLA_PROTINFO attribute: %s",
+                               strerror(-r));
+                return r;
+        }
+
+        if(link->network->cost != 0) {
+                r = sd_rtnl_message_append_u32(req, IFLA_BRPORT_COST, link->network->cost);
+                if (r < 0) {
+                        log_error_link(link,
+                                       "Could not append IFLA_BRPORT_COST attribute: %s",
+                                       strerror(-r));
+                        return r;
+                }
+        }
+
+        r = sd_rtnl_message_close_container(req);
+        if (r < 0) {
+                log_error_link(link,
+                               "Could not append IFLA_LINKINFO attribute: %s",
+                               strerror(-r));
+                return r;
+        }
+
+        r = sd_rtnl_call_async(link->manager->rtnl, req, link_set_handler, link, 0, NULL);
+        if (r < 0) {
+                log_error_link(link,
+                               "Could not send rtnetlink message: %s",
+                               strerror(-r));
+                return r;
+        }
+
+        link_ref(link);
+
+        return r;
+}
+
 static void dhcp6_handler(sd_dhcp6_client *client, int event, void *userdata) {
         Link *link = userdata;
 
@@ -1037,6 +1121,15 @@ static int link_joined(Link *link) {
                 }
         }
 
+        if(link->network->bridge) {
+                r = link_set_bridge(link);
+                if (r < 0) {
+                        log_error_link(link,
+                                       "Could not set bridge message: %s",
+                                       strerror(-r));
+                }
+        }
+
         return link_enter_set_addresses(link);
 }
 

diff --git a/src/network/networkd-network-gperf.gperf b/src/network/networkd-network-gperf.gperf
index a73646187ea3fa060fc6c21da1a1ed7225b262de..1aef09007af66ea1bec3aa914555d0de381635d4 100644 (file)
--- a/src/network/networkd-network-gperf.gperf
+++ b/src/network/networkd-network-gperf.gperf
@@ -58,6 +58,7 @@ DHCP.RequestBroadcast,       config_parse_bool,                  0,
 DHCP.CriticalConnection,     config_parse_bool,                  0,                             offsetof(Network, dhcp_critical)
 DHCP.VendorClassIdentifier,  config_parse_string,                0,                             offsetof(Network, dhcp_vendor_class_identifier)
 DHCP.RouteMetric,            config_parse_unsigned,              0,                             offsetof(Network, dhcp_route_metric)
+BridgePort.Cost,             config_parse_unsigned,              0,                             offsetof(Network, cost)
 /* backwards compatibility: do not add new entries to this section */
 DHCPv4.UseDNS,               config_parse_bool,                  0,                             offsetof(Network, dhcp_dns)
 DHCPv4.UseMTU,               config_parse_bool,                  0,                             offsetof(Network, dhcp_mtu)

diff --git a/src/network/networkd-network.c b/src/network/networkd-network.c
index e4bb1b03f08879810ef4cc51e888814784897cdf..6cfae75029036a0eab20df87a3731ef5384ef6c8 100644 (file)
--- a/src/network/networkd-network.c
+++ b/src/network/networkd-network.c
@@ -90,7 +90,7 @@ static int network_load_one(Manager *manager, const char *filename) {
         network->llmnr = LLMNR_SUPPORT_YES;
 
         r = config_parse(NULL, filename, file,
-                         "Match\0Network\0Address\0Route\0DHCP\0DHCPv4\0",
+                         "Match\0Network\0Address\0Route\0DHCP\0DHCPv4\0BridgePort\0",
                          config_item_perf_lookup, network_network_gperf_lookup,
                          false, false, true, network);
         if (r < 0)

diff --git a/src/network/networkd.h b/src/network/networkd.h
index c0d32c4a6b1e186321a6e4b4edf2f87f7c6f560a..1297ef98a73cff52ed6fb03f83d3aed266c9bff7 100644 (file)
--- a/src/network/networkd.h
+++ b/src/network/networkd.h
@@ -106,6 +106,8 @@ struct Network {
 
         bool dhcp_server;
 
+        unsigned cost;
+
         LIST_HEAD(Address, static_addresses);
         LIST_HEAD(Route, static_routes);