ip: bond: add peer notification delay support

Ability to tweak the delay between gratuitous ND/ARP packets has been
added in kernel commit 07a4ddec3ce9 ("bonding: add an option to
specify a delay between peer notifications"), through
IFLA_BOND_PEER_NOTIF_DELAY attribute. Add support to set and show this
value.

Example:

    $ ip -d link set bond0 type bond peer_notify_delay 1000
    $ ip -d link l dev bond0
    2: bond0: <BROADCAST,MULTICAST,MASTER,UP,LOWER_UP> mtu 1500 qdisc noqueue
    state UP mode DEFAULT group default qlen 1000
        link/ether 50:54:33:00:00:01 brd ff:ff:ff:ff:ff:ff
        bond mode active-backup active_slave eth0 miimon 100 updelay 0
    downdelay 0 peer_notify_delay 1000 use_carrier 1 arp_interval 0
    arp_validate none arp_all_targets any primary eth0
    primary_reselect always fail_over_mac active xmit_hash_policy
    layer2 resend_igmp 1 num_grat_arp 5 all_slaves_active 0 min_links
    0 lp_interval 1 packets_per_slave 1 lacp_rate slow ad_select
    stable tlb_dynamic_lb 1 addrgenmode eu

Signed-off-by: Vincent Bernat <vincent@bernat.ch>
Reviewed-by: Stephen Hemminger <stephen@networkplumber.org>
Signed-off-by: David Ahern <dsahern@gmail.com>

diff --git a/ip/iplink_bond.c b/ip/iplink_bond.c
index c60f0e8ad0a0d953d3d94e7d9c85e0b44c278e1a..585b6be14c8178b3ade0e10b929d447733324914 100644 (file)
--- a/ip/iplink_bond.c
+++ b/ip/iplink_bond.c
@@ -120,6 +120,7 @@ static void print_explain(FILE *f)
                "Usage: ... bond [ mode BONDMODE ] [ active_slave SLAVE_DEV ]\n"
                "                [ clear_active_slave ] [ miimon MIIMON ]\n"
                "                [ updelay UPDELAY ] [ downdelay DOWNDELAY ]\n"
+               "                [ peer_notify_delay DELAY ]\n"
                "                [ use_carrier USE_CARRIER ]\n"
                "                [ arp_interval ARP_INTERVAL ]\n"
                "                [ arp_validate ARP_VALIDATE ]\n"
@@ -165,7 +166,7 @@ static int bond_parse_opt(struct link_util *lu, int argc, char **argv,
        __u8 xmit_hash_policy, num_peer_notif, all_slaves_active;
        __u8 lacp_rate, ad_select, tlb_dynamic_lb;
        __u16 ad_user_port_key, ad_actor_sys_prio;
-       __u32 miimon, updelay, downdelay, arp_interval, arp_validate;
+       __u32 miimon, updelay, downdelay, peer_notify_delay, arp_interval, arp_validate;
        __u32 arp_all_targets, resend_igmp, min_links, lp_interval;
        __u32 packets_per_slave;
        unsigned int ifindex;
@@ -200,6 +201,11 @@ static int bond_parse_opt(struct link_util *lu, int argc, char **argv,
                        if (get_u32(&downdelay, *argv, 0))
                                invarg("invalid downdelay", *argv);
                        addattr32(n, 1024, IFLA_BOND_DOWNDELAY, downdelay);
+               } else if (matches(*argv, "peer_notify_delay") == 0) {
+                       NEXT_ARG();
+                       if (get_u32(&peer_notify_delay, *argv, 0))
+                               invarg("invalid peer_notify_delay", *argv);
+                       addattr32(n, 1024, IFLA_BOND_PEER_NOTIF_DELAY, peer_notify_delay);
                } else if (matches(*argv, "use_carrier") == 0) {
                        NEXT_ARG();
                        if (get_u8(&use_carrier, *argv, 0))
@@ -410,6 +416,12 @@ static void bond_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[])
                           "downdelay %u ",
                           rta_getattr_u32(tb[IFLA_BOND_DOWNDELAY]));
 
+       if (tb[IFLA_BOND_PEER_NOTIF_DELAY])
+               print_uint(PRINT_ANY,
+                          "peer_notify_delay",
+                          "peer_notify_delay %u ",
+                          rta_getattr_u32(tb[IFLA_BOND_PEER_NOTIF_DELAY]));
+
        if (tb[IFLA_BOND_USE_CARRIER])
                print_uint(PRINT_ANY,
                           "use_carrier",