* [PATCH net-next 3/4] bonding: add ad_info attribute netlink support
@ 2013-12-28 7:15 Scott Feldman
2013-12-28 21:34 ` Jiri Pirko
0 siblings, 1 reply; 2+ messages in thread
From: Scott Feldman @ 2013-12-28 7:15 UTC (permalink / raw)
To: vfalico, fubar, andy; +Cc: netdev, roopa, shm, jiri
Add nested IFLA_BOND_AD_INFO for bonding 802.3ad info.
Signed-off-by: Scott Feldman <sfeldma@cumulusnetworks.com>
---
drivers/net/bonding/bond_netlink.c | 38 ++++++++++++++++++++++++++++++++++++
include/uapi/linux/if_link.h | 12 +++++++++++
2 files changed, 50 insertions(+)
diff --git a/drivers/net/bonding/bond_netlink.c b/drivers/net/bonding/bond_netlink.c
index df66dd8..1b4013b 100644
--- a/drivers/net/bonding/bond_netlink.c
+++ b/drivers/net/bonding/bond_netlink.c
@@ -45,6 +45,7 @@ static const struct nla_policy bond_policy[IFLA_BOND_MAX + 1] = {
[IFLA_BOND_PACKETS_PER_SLAVE] = { .type = NLA_U32 },
[IFLA_BOND_AD_LACP_RATE] = { .type = NLA_U8 },
[IFLA_BOND_AD_SELECT] = { .type = NLA_U8 },
+ [IFLA_BOND_AD_INFO] = { .type = NLA_NESTED },
};
static int bond_validate(struct nlattr *tb[], struct nlattr *data[])
@@ -310,6 +311,12 @@ static size_t bond_get_size(const struct net_device *bond_dev)
nla_total_size(sizeof(u32)) + /* IFLA_BOND_PACKETS_PER_SLAVE */
nla_total_size(sizeof(u8)) + /* IFLA_BOND_AD_LACP_RATE */
nla_total_size(sizeof(u8)) + /* IFLA_BOND_AD_SELECT */
+ nla_total_size(sizeof(struct nlattr)) + /* IFLA_BOND_AD_INFO */
+ nla_total_size(sizeof(u16)) + /* IFLA_BOND_AD_INFO_AGGREGATOR */
+ nla_total_size(sizeof(u16)) + /* IFLA_BOND_AD_INFO_NUM_PORTS */
+ 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*/
0;
}
@@ -423,6 +430,37 @@ static int bond_fill_info(struct sk_buff *skb,
bond->params.ad_select))
goto nla_put_failure;
+ if (bond->params.mode == BOND_MODE_8023AD) {
+ struct ad_info info;
+
+ if (!bond_3ad_get_active_agg_info(bond, &info)) {
+ struct nlattr *nest;
+
+ nest = nla_nest_start(skb, IFLA_BOND_AD_INFO);
+ if (!nest)
+ goto nla_put_failure;
+
+ if (nla_put_u16(skb, IFLA_BOND_AD_INFO_AGGREGATOR,
+ info.aggregator_id))
+ goto nla_put_failure;
+ if (nla_put_u16(skb, IFLA_BOND_AD_INFO_NUM_PORTS,
+ info.ports))
+ goto nla_put_failure;
+ if (nla_put_u16(skb, IFLA_BOND_AD_INFO_ACTOR_KEY,
+ info.actor_key))
+ goto nla_put_failure;
+ if (nla_put_u16(skb, IFLA_BOND_AD_INFO_PARTNER_KEY,
+ info.partner_key))
+ goto nla_put_failure;
+ if (nla_put(skb, IFLA_BOND_AD_INFO_PARTNER_MAC,
+ sizeof(info.partner_system),
+ &info.partner_system))
+ goto nla_put_failure;
+
+ nla_nest_end(skb, nest);
+ }
+ }
+
return 0;
nla_put_failure:
diff --git a/include/uapi/linux/if_link.h b/include/uapi/linux/if_link.h
index 0fbb018..3e6bd3c 100644
--- a/include/uapi/linux/if_link.h
+++ b/include/uapi/linux/if_link.h
@@ -351,11 +351,23 @@ enum {
IFLA_BOND_PACKETS_PER_SLAVE,
IFLA_BOND_AD_LACP_RATE,
IFLA_BOND_AD_SELECT,
+ IFLA_BOND_AD_INFO,
__IFLA_BOND_MAX,
};
#define IFLA_BOND_MAX (__IFLA_BOND_MAX - 1)
+enum {
+ IFLA_BOND_AD_INFO_AGGREGATOR,
+ IFLA_BOND_AD_INFO_NUM_PORTS,
+ IFLA_BOND_AD_INFO_ACTOR_KEY,
+ IFLA_BOND_AD_INFO_PARTNER_KEY,
+ IFLA_BOND_AD_INFO_PARTNER_MAC,
+ __IFLA_BOND_AD_INFO_MAX,
+};
+
+#define IFLA_BOND_AD_INFO_MAX (__IFLA_BOND_AD_INFO_MAX - 1)
+
/* SR-IOV virtual function management section */
enum {
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH net-next 3/4] bonding: add ad_info attribute netlink support
2013-12-28 7:15 [PATCH net-next 3/4] bonding: add ad_info attribute netlink support Scott Feldman
@ 2013-12-28 21:34 ` Jiri Pirko
0 siblings, 0 replies; 2+ messages in thread
From: Jiri Pirko @ 2013-12-28 21:34 UTC (permalink / raw)
To: Scott Feldman; +Cc: vfalico, fubar, andy, netdev, roopa, shm
Sat, Dec 28, 2013 at 08:15:56AM CET, sfeldma@cumulusnetworks.com wrote:
>Add nested IFLA_BOND_AD_INFO for bonding 802.3ad info.
>
>Signed-off-by: Scott Feldman <sfeldma@cumulusnetworks.com>
Signed-off-by: Jiri Pirko <jiri@resnulli.us>
I'm okay with this patch. I think that we need a follow-up patch that
will create a nl event in case one of following values change.
>---
> drivers/net/bonding/bond_netlink.c | 38 ++++++++++++++++++++++++++++++++++++
> include/uapi/linux/if_link.h | 12 +++++++++++
> 2 files changed, 50 insertions(+)
>
>diff --git a/drivers/net/bonding/bond_netlink.c b/drivers/net/bonding/bond_netlink.c
>index df66dd8..1b4013b 100644
>--- a/drivers/net/bonding/bond_netlink.c
>+++ b/drivers/net/bonding/bond_netlink.c
>@@ -45,6 +45,7 @@ static const struct nla_policy bond_policy[IFLA_BOND_MAX + 1] = {
> [IFLA_BOND_PACKETS_PER_SLAVE] = { .type = NLA_U32 },
> [IFLA_BOND_AD_LACP_RATE] = { .type = NLA_U8 },
> [IFLA_BOND_AD_SELECT] = { .type = NLA_U8 },
>+ [IFLA_BOND_AD_INFO] = { .type = NLA_NESTED },
> };
>
> static int bond_validate(struct nlattr *tb[], struct nlattr *data[])
>@@ -310,6 +311,12 @@ static size_t bond_get_size(const struct net_device *bond_dev)
> nla_total_size(sizeof(u32)) + /* IFLA_BOND_PACKETS_PER_SLAVE */
> nla_total_size(sizeof(u8)) + /* IFLA_BOND_AD_LACP_RATE */
> nla_total_size(sizeof(u8)) + /* IFLA_BOND_AD_SELECT */
>+ nla_total_size(sizeof(struct nlattr)) + /* IFLA_BOND_AD_INFO */
>+ nla_total_size(sizeof(u16)) + /* IFLA_BOND_AD_INFO_AGGREGATOR */
>+ nla_total_size(sizeof(u16)) + /* IFLA_BOND_AD_INFO_NUM_PORTS */
>+ 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*/
> 0;
> }
>
>@@ -423,6 +430,37 @@ static int bond_fill_info(struct sk_buff *skb,
> bond->params.ad_select))
> goto nla_put_failure;
>
>+ if (bond->params.mode == BOND_MODE_8023AD) {
>+ struct ad_info info;
>+
>+ if (!bond_3ad_get_active_agg_info(bond, &info)) {
>+ struct nlattr *nest;
>+
>+ nest = nla_nest_start(skb, IFLA_BOND_AD_INFO);
>+ if (!nest)
>+ goto nla_put_failure;
>+
>+ if (nla_put_u16(skb, IFLA_BOND_AD_INFO_AGGREGATOR,
>+ info.aggregator_id))
>+ goto nla_put_failure;
>+ if (nla_put_u16(skb, IFLA_BOND_AD_INFO_NUM_PORTS,
>+ info.ports))
>+ goto nla_put_failure;
>+ if (nla_put_u16(skb, IFLA_BOND_AD_INFO_ACTOR_KEY,
>+ info.actor_key))
>+ goto nla_put_failure;
>+ if (nla_put_u16(skb, IFLA_BOND_AD_INFO_PARTNER_KEY,
>+ info.partner_key))
>+ goto nla_put_failure;
>+ if (nla_put(skb, IFLA_BOND_AD_INFO_PARTNER_MAC,
>+ sizeof(info.partner_system),
>+ &info.partner_system))
>+ goto nla_put_failure;
>+
>+ nla_nest_end(skb, nest);
>+ }
>+ }
>+
> return 0;
>
> nla_put_failure:
>diff --git a/include/uapi/linux/if_link.h b/include/uapi/linux/if_link.h
>index 0fbb018..3e6bd3c 100644
>--- a/include/uapi/linux/if_link.h
>+++ b/include/uapi/linux/if_link.h
>@@ -351,11 +351,23 @@ enum {
> IFLA_BOND_PACKETS_PER_SLAVE,
> IFLA_BOND_AD_LACP_RATE,
> IFLA_BOND_AD_SELECT,
>+ IFLA_BOND_AD_INFO,
> __IFLA_BOND_MAX,
> };
>
> #define IFLA_BOND_MAX (__IFLA_BOND_MAX - 1)
>
>+enum {
>+ IFLA_BOND_AD_INFO_AGGREGATOR,
>+ IFLA_BOND_AD_INFO_NUM_PORTS,
>+ IFLA_BOND_AD_INFO_ACTOR_KEY,
>+ IFLA_BOND_AD_INFO_PARTNER_KEY,
>+ IFLA_BOND_AD_INFO_PARTNER_MAC,
>+ __IFLA_BOND_AD_INFO_MAX,
>+};
>+
>+#define IFLA_BOND_AD_INFO_MAX (__IFLA_BOND_AD_INFO_MAX - 1)
>+
> /* SR-IOV virtual function management section */
>
> enum {
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-12-28 21:34 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-12-28 7:15 [PATCH net-next 3/4] bonding: add ad_info attribute netlink support Scott Feldman
2013-12-28 21:34 ` Jiri Pirko
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).