]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
net: bonding: add broadcast_neighbor netlink option
authorTonghao Zhang <tonghao@bamaicloud.com>
Fri, 27 Jun 2025 13:49:29 +0000 (21:49 +0800)
committerPaolo Abeni <pabeni@redhat.com>
Tue, 8 Jul 2025 08:59:42 +0000 (10:59 +0200)
User can config or display the bonding broadcast_neighbor option via
iproute2/netlink.

Cc: Jay Vosburgh <jv@jvosburgh.net>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Eric Dumazet <edumazet@google.com>
Cc: Jakub Kicinski <kuba@kernel.org>
Cc: Paolo Abeni <pabeni@redhat.com>
Cc: Simon Horman <horms@kernel.org>
Cc: Jonathan Corbet <corbet@lwn.net>
Cc: Andrew Lunn <andrew+netdev@lunn.ch>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Cc: Nikolay Aleksandrov <razor@blackwall.org>
Signed-off-by: Tonghao Zhang <tonghao@bamaicloud.com>
Signed-off-by: Zengbing Tu <tuzengbing@didiglobal.com>
Reviewed-by: Nikolay Aleksandrov <razor@blackwall.org>
Link: https://patch.msgid.link/76b90700ba5b98027dfb51a2f3c5cfea0440a21b.1751031306.git.tonghao@bamaicloud.com
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
drivers/net/bonding/bond_netlink.c
include/uapi/linux/if_link.h

index ac5e402c34bc6cdc5e449c96f9a33db0304f8dd1..57fff2421f1b587de3dfb535867b31091b0c8940 100644 (file)
@@ -124,6 +124,7 @@ static const struct nla_policy bond_policy[IFLA_BOND_MAX + 1] = {
        [IFLA_BOND_MISSED_MAX]          = { .type = NLA_U8 },
        [IFLA_BOND_NS_IP6_TARGET]       = { .type = NLA_NESTED },
        [IFLA_BOND_COUPLED_CONTROL]     = { .type = NLA_U8 },
+       [IFLA_BOND_BROADCAST_NEIGH]     = { .type = NLA_U8 },
 };
 
 static const struct nla_policy bond_slave_policy[IFLA_BOND_SLAVE_MAX + 1] = {
@@ -561,6 +562,16 @@ static int bond_changelink(struct net_device *bond_dev, struct nlattr *tb[],
                        return err;
        }
 
+       if (data[IFLA_BOND_BROADCAST_NEIGH]) {
+               int broadcast_neigh = nla_get_u8(data[IFLA_BOND_BROADCAST_NEIGH]);
+
+               bond_opt_initval(&newval, broadcast_neigh);
+               err = __bond_opt_set(bond, BOND_OPT_BROADCAST_NEIGH, &newval,
+                                    data[IFLA_BOND_BROADCAST_NEIGH], extack);
+               if (err)
+                       return err;
+       }
+
        return 0;
 }
 
@@ -630,6 +641,7 @@ static size_t bond_get_size(const struct net_device *bond_dev)
                nla_total_size(sizeof(struct nlattr)) +
                nla_total_size(sizeof(struct in6_addr)) * BOND_MAX_NS_TARGETS +
                nla_total_size(sizeof(u8)) +    /* IFLA_BOND_COUPLED_CONTROL */
+               nla_total_size(sizeof(u8)) +    /* IFLA_BOND_BROADCAST_NEIGH */
                0;
 }
 
@@ -793,6 +805,10 @@ static int bond_fill_info(struct sk_buff *skb,
                       bond->params.coupled_control))
                goto nla_put_failure;
 
+       if (nla_put_u8(skb, IFLA_BOND_BROADCAST_NEIGH,
+                      bond->params.broadcast_neighbor))
+               goto nla_put_failure;
+
        if (BOND_MODE(bond) == BOND_MODE_8023AD) {
                struct ad_info info;
 
index 873c285996febe62428a88cd269971458748ac04..784ace3a519cd86dac3098df9c2f393e9827c158 100644 (file)
@@ -1535,6 +1535,7 @@ enum {
        IFLA_BOND_MISSED_MAX,
        IFLA_BOND_NS_IP6_TARGET,
        IFLA_BOND_COUPLED_CONTROL,
+       IFLA_BOND_BROADCAST_NEIGH,
        __IFLA_BOND_MAX,
 };