Message ID | 7b91f02e6c482210721a5862b184c3dae1828820.1430944053.git.jtoppins@cumulusnetworks.com |
---|---|
State | Superseded, archived |
Delegated to: | David Miller |
Headers | show |
On Wed, May 6, 2015 at 1:41 PM, Jonathan Toppins <jtoppins@cumulusnetworks.com> wrote: > From: Andy Gospodarek <gospo@cumulusnetworks.com> > > Adds netlink support for the following bonding options: > * BOND_OPT_AD_ACTOR_SYS_PRIO > * BOND_OPT_AD_ACTOR_SYSTEM > * BOND_OPT_AD_USER_PORT_KEY > > When setting the actor system mac address we assume the netlink message > contains a binary mac and not a string representation of a mac. > > Signed-off-by: Andy Gospodarek <gospo@cumulusnetworks.com> > [jt: completed the setting side of the netlink attributes] > Signed-off-by: Jonathan Toppins <jtoppins@cumulusnetworks.com> Acked-by: Mahesh Bandewar <maheshb@google.com> Thanks for doing this. --mahesh.. > --- > v2: > * rebased > > drivers/net/bonding/bond_netlink.c | 50 ++++++++++++++++++++++++++++++++++++ > include/uapi/linux/if_link.h | 3 +++ > 2 files changed, 53 insertions(+) > > diff --git a/drivers/net/bonding/bond_netlink.c b/drivers/net/bonding/bond_netlink.c > index 7b11243..c41be5f 100644 > --- a/drivers/net/bonding/bond_netlink.c > +++ b/drivers/net/bonding/bond_netlink.c > @@ -94,6 +94,10 @@ static const struct nla_policy bond_policy[IFLA_BOND_MAX + 1] = { > [IFLA_BOND_AD_LACP_RATE] = { .type = NLA_U8 }, > [IFLA_BOND_AD_SELECT] = { .type = NLA_U8 }, > [IFLA_BOND_AD_INFO] = { .type = NLA_NESTED }, > + [IFLA_BOND_AD_ACTOR_SYS_PRIO] = { .type = NLA_U16 }, > + [IFLA_BOND_AD_USER_PORT_KEY] = { .type = NLA_U16 }, > + [IFLA_BOND_AD_ACTOR_SYSTEM] = { .type = NLA_BINARY, > + .len = ETH_ALEN }, > }; > > static const struct nla_policy bond_slave_policy[IFLA_BOND_SLAVE_MAX + 1] = { > @@ -379,6 +383,36 @@ static int bond_changelink(struct net_device *bond_dev, > if (err) > return err; > } > + if (data[IFLA_BOND_AD_ACTOR_SYS_PRIO]) { > + int actor_sys_prio = > + nla_get_u16(data[IFLA_BOND_AD_ACTOR_SYS_PRIO]); > + > + bond_opt_initval(&newval, actor_sys_prio); > + err = __bond_opt_set(bond, BOND_OPT_AD_ACTOR_SYS_PRIO, &newval); > + if (err) > + return err; > + } > + > + if (data[IFLA_BOND_AD_USER_PORT_KEY]) { > + int port_key = > + nla_get_u16(data[IFLA_BOND_AD_USER_PORT_KEY]); > + > + bond_opt_initval(&newval, port_key); > + err = __bond_opt_set(bond, BOND_OPT_AD_USER_PORT_KEY, &newval); > + if (err) > + return err; > + } > + > + if (data[IFLA_BOND_AD_ACTOR_SYSTEM]) { > + if (nla_len(data[IFLA_BOND_AD_ACTOR_SYSTEM]) != ETH_ALEN) > + return -EINVAL; > + > + bond_opt_initstr(&newval, > + nla_data(data[IFLA_BOND_AD_ACTOR_SYSTEM])); > + err = __bond_opt_set(bond, BOND_OPT_AD_ACTOR_SYSTEM, &newval); > + if (err) > + return err; > + } > return 0; > } > > @@ -426,6 +460,9 @@ static size_t bond_get_size(const struct net_device *bond_dev) > nla_total_size(sizeof(u16)) + /* IFLA_BOND_AD_INFO_ACTOR_KEY */ > nla_total_size(sizeof(u16)) + /* IFLA_BOND_AD_INFO_PARTNER_KEY*/ > nla_total_size(ETH_ALEN) + /* IFLA_BOND_AD_INFO_PARTNER_MAC*/ > + nla_total_size(sizeof(u16)) + /* IFLA_BOND_AD_ACTOR_SYS_PRIO */ > + nla_total_size(sizeof(u16)) + /* IFLA_BOND_AD_USER_PORT_KEY */ > + nla_total_size(ETH_ALEN) + /* IFLA_BOND_AD_ACTOR_SYSTEM */ > 0; > } > > @@ -551,6 +588,19 @@ static int bond_fill_info(struct sk_buff *skb, > if (BOND_MODE(bond) == BOND_MODE_8023AD) { > struct ad_info info; > > + if (nla_put_u16(skb, IFLA_BOND_AD_ACTOR_SYS_PRIO, > + bond->params.ad_actor_sys_prio)) > + goto nla_put_failure; > + > + if (nla_put_u16(skb, IFLA_BOND_AD_USER_PORT_KEY, > + bond->params.ad_user_port_key)) > + goto nla_put_failure; > + > + if (nla_put(skb, IFLA_BOND_AD_ACTOR_SYSTEM, > + sizeof(bond->params.ad_actor_system), > + &bond->params.ad_actor_system)) > + goto nla_put_failure; > + > if (!bond_3ad_get_active_agg_info(bond, &info)) { > struct nlattr *nest; > > diff --git a/include/uapi/linux/if_link.h b/include/uapi/linux/if_link.h > index d9cd192..6d6e502 100644 > --- a/include/uapi/linux/if_link.h > +++ b/include/uapi/linux/if_link.h > @@ -417,6 +417,9 @@ enum { > IFLA_BOND_AD_LACP_RATE, > IFLA_BOND_AD_SELECT, > IFLA_BOND_AD_INFO, > + IFLA_BOND_AD_ACTOR_SYS_PRIO, > + IFLA_BOND_AD_USER_PORT_KEY, > + IFLA_BOND_AD_ACTOR_SYSTEM, > __IFLA_BOND_MAX, > }; > > -- > 1.7.10.4 > > -- > To unsubscribe from this list: send the line "unsubscribe netdev" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/bonding/bond_netlink.c b/drivers/net/bonding/bond_netlink.c index 7b11243..c41be5f 100644 --- a/drivers/net/bonding/bond_netlink.c +++ b/drivers/net/bonding/bond_netlink.c @@ -94,6 +94,10 @@ static const struct nla_policy bond_policy[IFLA_BOND_MAX + 1] = { [IFLA_BOND_AD_LACP_RATE] = { .type = NLA_U8 }, [IFLA_BOND_AD_SELECT] = { .type = NLA_U8 }, [IFLA_BOND_AD_INFO] = { .type = NLA_NESTED }, + [IFLA_BOND_AD_ACTOR_SYS_PRIO] = { .type = NLA_U16 }, + [IFLA_BOND_AD_USER_PORT_KEY] = { .type = NLA_U16 }, + [IFLA_BOND_AD_ACTOR_SYSTEM] = { .type = NLA_BINARY, + .len = ETH_ALEN }, }; static const struct nla_policy bond_slave_policy[IFLA_BOND_SLAVE_MAX + 1] = { @@ -379,6 +383,36 @@ static int bond_changelink(struct net_device *bond_dev, if (err) return err; } + if (data[IFLA_BOND_AD_ACTOR_SYS_PRIO]) { + int actor_sys_prio = + nla_get_u16(data[IFLA_BOND_AD_ACTOR_SYS_PRIO]); + + bond_opt_initval(&newval, actor_sys_prio); + err = __bond_opt_set(bond, BOND_OPT_AD_ACTOR_SYS_PRIO, &newval); + if (err) + return err; + } + + if (data[IFLA_BOND_AD_USER_PORT_KEY]) { + int port_key = + nla_get_u16(data[IFLA_BOND_AD_USER_PORT_KEY]); + + bond_opt_initval(&newval, port_key); + err = __bond_opt_set(bond, BOND_OPT_AD_USER_PORT_KEY, &newval); + if (err) + return err; + } + + if (data[IFLA_BOND_AD_ACTOR_SYSTEM]) { + if (nla_len(data[IFLA_BOND_AD_ACTOR_SYSTEM]) != ETH_ALEN) + return -EINVAL; + + bond_opt_initstr(&newval, + nla_data(data[IFLA_BOND_AD_ACTOR_SYSTEM])); + err = __bond_opt_set(bond, BOND_OPT_AD_ACTOR_SYSTEM, &newval); + if (err) + return err; + } return 0; } @@ -426,6 +460,9 @@ static size_t bond_get_size(const struct net_device *bond_dev) nla_total_size(sizeof(u16)) + /* IFLA_BOND_AD_INFO_ACTOR_KEY */ nla_total_size(sizeof(u16)) + /* IFLA_BOND_AD_INFO_PARTNER_KEY*/ nla_total_size(ETH_ALEN) + /* IFLA_BOND_AD_INFO_PARTNER_MAC*/ + nla_total_size(sizeof(u16)) + /* IFLA_BOND_AD_ACTOR_SYS_PRIO */ + nla_total_size(sizeof(u16)) + /* IFLA_BOND_AD_USER_PORT_KEY */ + nla_total_size(ETH_ALEN) + /* IFLA_BOND_AD_ACTOR_SYSTEM */ 0; } @@ -551,6 +588,19 @@ static int bond_fill_info(struct sk_buff *skb, if (BOND_MODE(bond) == BOND_MODE_8023AD) { struct ad_info info; + if (nla_put_u16(skb, IFLA_BOND_AD_ACTOR_SYS_PRIO, + bond->params.ad_actor_sys_prio)) + goto nla_put_failure; + + if (nla_put_u16(skb, IFLA_BOND_AD_USER_PORT_KEY, + bond->params.ad_user_port_key)) + goto nla_put_failure; + + if (nla_put(skb, IFLA_BOND_AD_ACTOR_SYSTEM, + sizeof(bond->params.ad_actor_system), + &bond->params.ad_actor_system)) + goto nla_put_failure; + if (!bond_3ad_get_active_agg_info(bond, &info)) { struct nlattr *nest; diff --git a/include/uapi/linux/if_link.h b/include/uapi/linux/if_link.h index d9cd192..6d6e502 100644 --- a/include/uapi/linux/if_link.h +++ b/include/uapi/linux/if_link.h @@ -417,6 +417,9 @@ enum { IFLA_BOND_AD_LACP_RATE, IFLA_BOND_AD_SELECT, IFLA_BOND_AD_INFO, + IFLA_BOND_AD_ACTOR_SYS_PRIO, + IFLA_BOND_AD_USER_PORT_KEY, + IFLA_BOND_AD_ACTOR_SYSTEM, __IFLA_BOND_MAX, };