summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSusant Sahani <susant@redhat.com>2014-07-21 18:52:14 +0530
committerTom Gundersen <teg@jklm.no>2014-07-21 20:35:21 +0200
commitfb1021a26db14b199c50e3eed77a1daa371f282e (patch)
tree577bf14218bdf5132809ae05a2230ca6928e5aa7
parent227cdf2c7ca0ab10af60674f929c4beeedb1ae67 (diff)
networkd: bond add support for lacp rate
LacpduTransmitRate option specifies the rate in which link partner to transmit LACPDU packets in 802.3ad mode. Possible values slow : Request partner to transmit LACPDUs every 30 seconds fast : Request partner to transmit LACPDUs every 1 second The default is slow. chages: 1. Added enum bond_lacp_rate_table 2. gperf LacpduTransmitRate Test: conf file: [NetDev] Name=bond1 Kind=bond [Bond] Mode=802.3ad LacpduTransmitRate=fast test: cat /proc/net/bonding/bond1 Ethernet Channel Bonding Driver: v3.7.1 (April 27, 2011) Bonding Mode: IEEE 802.3ad Dynamic link aggregation Transmit Hash Policy: layer2+3 (2) MII Status: up MII Polling Interval (ms): 0 Up Delay (ms): 0 Down Delay (ms): 0 802.3ad info LACP rate: fast Min links: 0 Aggregator selection policy (ad_select): stable bond bond1 has no active aggregator [tomegun: renamed from LacpduTransmitRate to LACPTransmitRate, manpage fixes and dropped bond_ prefix from variables]
-rw-r--r--man/systemd.netdev.xml42
-rw-r--r--src/network/networkd-netdev-bond.c20
-rw-r--r--src/network/networkd-netdev-bond.h13
-rw-r--r--src/network/networkd-netdev-gperf.gperf1
4 files changed, 61 insertions, 15 deletions
diff --git a/man/systemd.netdev.xml b/man/systemd.netdev.xml
index ba212ec065..cea416f94f 100644
--- a/man/systemd.netdev.xml
+++ b/man/systemd.netdev.xml
@@ -408,14 +408,15 @@
<varlistentry>
<term><varname>Mode=</varname></term>
<listitem>
- <para>Specifies one of the bonding policies. The default is balance-rr (round robin).
- <literal>balance-rr</literal>
- <literal>active-backup</literal>
- <literal>balance-xor</literal>
- <literal>broadcast</literal>
- <literal>802.3ad</literal>
- <literal>balance-tlb</literal>
- <literal>balance-alb</literal>
+ <para>Specifies one of the bonding policies. The default is
+ <literal>balance-rr</literal> (round robin). Possible values are
+ <literal>balance-rr</literal>,
+ <literal>active-backup</literal>,
+ <literal>balance-xor</literal>,
+ <literal>broadcast</literal>,
+ <literal>802.3ad</literal>,
+ <literal>balance-tlb</literal>, and
+ <literal>balance-alb</literal>.
</para>
</listitem>
</varlistentry>
@@ -424,17 +425,28 @@
<term><varname>TransmitHashPolicy=</varname></term>
<listitem>
<para>Selects the transmit hash policy to use for slave selection in
- balance-xor, 802.3ad, and tlb modes.
- <literal>layer2</literal>
- <literal>layer3+4</literal>
- <literal>layer2+3</literal>
- <literal>encap2+3</literal>
- <literal>802.3ad</literal>
- <literal>encap3+4</literal>
+ balance-xor, 802.3ad, and tlb modes. Possible values are
+ <literal>layer2</literal>,
+ <literal>layer3+4</literal>,
+ <literal>layer2+3</literal>,
+ <literal>encap2+3</literal>,
+ <literal>802.3ad</literal>, and
+ <literal>encap3+4</literal>.
</para>
</listitem>
</varlistentry>
+ <varlistentry>
+ <term><varname>LACPTransmitRate=</varname></term>
+ <listitem>
+ <para>Specifies the rate with which link partner
+ transmits Link Aggregation Control Protocol Data Unit packets
+ in 802.3ad mode. Possible values are
+ <literal>slow</literal>, which requests partner to transmit LACPDUs every 30 seconds, and
+ <literal>fast</literal>, which requests partner to transmit LACPDUs every second.
+ The default value is <literal>slow</literal>.</para>
+ </listitem>
+ </varlistentry>
</variablelist>
</refsect1>
diff --git a/src/network/networkd-netdev-bond.c b/src/network/networkd-netdev-bond.c
index c4d1fcd17e..e3f3333560 100644
--- a/src/network/networkd-netdev-bond.c
+++ b/src/network/networkd-netdev-bond.c
@@ -57,6 +57,14 @@ DEFINE_CONFIG_PARSE_ENUM(config_parse_bond_xmit_hash_policy,
BondXmitHashPolicy,
"Failed to parse bond transmit hash policy")
+static const char* const bond_lacp_rate_table[_NETDEV_BOND_LACP_RATE_MAX] = {
+ [NETDEV_BOND_LACP_RATE_SLOW] = "slow",
+ [NETDEV_BOND_LACP_RATE_FAST] = "fast",
+};
+
+DEFINE_STRING_TABLE_LOOKUP(bond_lacp_rate, BondLacpRate);
+DEFINE_CONFIG_PARSE_ENUM(config_parse_bond_lacp_rate, bond_lacp_rate, BondLacpRate, "Failed to parse bond lacp rate")
+
static uint8_t bond_mode_to_kernel(BondMode mode) {
switch (mode) {
case NETDEV_BOND_MODE_BALANCE_RR:
@@ -126,6 +134,17 @@ static int netdev_bond_fill_message_create(NetDev *netdev, Link *link, sd_rtnl_m
}
}
+ if (b->lacp_rate != _NETDEV_BOND_LACP_RATE_INVALID &&
+ b->mode == NETDEV_BOND_MODE_802_3AD) {
+ r = sd_rtnl_message_append_u8(m, IFLA_BOND_AD_LACP_RATE, b->lacp_rate );
+ if (r < 0) {
+ log_error_netdev(netdev,
+ "Could not append IFLA_BOND_AD_LACP_RATE attribute: %s",
+ strerror(-r));
+ return r;
+ }
+ }
+
return 0;
}
@@ -137,6 +156,7 @@ static void bond_init(NetDev *netdev) {
b->mode = _NETDEV_BOND_MODE_INVALID;
b->xmit_hash_policy = _NETDEV_BOND_XMIT_HASH_POLICY_INVALID;
+ b->lacp_rate = _NETDEV_BOND_LACP_RATE_INVALID;
}
const NetDevVTable bond_vtable = {
diff --git a/src/network/networkd-netdev-bond.h b/src/network/networkd-netdev-bond.h
index 0e9955ee3d..fea076817a 100644
--- a/src/network/networkd-netdev-bond.h
+++ b/src/network/networkd-netdev-bond.h
@@ -47,11 +47,20 @@ typedef enum BondXmitHashPolicy {
_NETDEV_BOND_XMIT_HASH_POLICY_INVALID = -1
} BondXmitHashPolicy;
+
+typedef enum BondLacpRate {
+ NETDEV_BOND_LACP_RATE_SLOW,
+ NETDEV_BOND_LACP_RATE_FAST,
+ _NETDEV_BOND_LACP_RATE_MAX,
+ _NETDEV_BOND_LACP_RATE_INVALID = -1,
+} BondLacpRate;
+
struct Bond {
NetDev meta;
BondMode mode;
BondXmitHashPolicy xmit_hash_policy;
+ BondLacpRate lacp_rate;
};
extern const NetDevVTable bond_vtable;
@@ -62,5 +71,9 @@ BondMode bond_mode_from_string(const char *d) _pure_;
const char *bond_xmit_hash_policy_to_string(BondXmitHashPolicy d) _const_;
BondXmitHashPolicy bond_xmit_hash_policy_from_string(const char *d) _pure_;
+const char *bond_lacp_rate_to_string(BondLacpRate d) _const_;
+BondLacpRate bond_lacp_rate_from_string(const char *d) _pure_;
+
int config_parse_bond_mode(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
int config_parse_bond_xmit_hash_policy(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
+int config_parse_bond_lacp_rate(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata);
diff --git a/src/network/networkd-netdev-gperf.gperf b/src/network/networkd-netdev-gperf.gperf
index bafdccfc1e..40fae75c42 100644
--- a/src/network/networkd-netdev-gperf.gperf
+++ b/src/network/networkd-netdev-gperf.gperf
@@ -53,3 +53,4 @@ Tap.User, config_parse_string, 0,
Tap.Group, config_parse_string, 0, offsetof(TunTap, group_name)
Bond.Mode, config_parse_bond_mode, 0, offsetof(Bond, mode)
Bond.TransmitHashPolicy, config_parse_bond_xmit_hash_policy, 0, offsetof(Bond, xmit_hash_policy)
+Bond.LACPTransmitRate, config_parse_bond_lacp_rate, 0, offsetof(Bond, lacp_rate)