net: rtnetlink: add support for the IFLA_STATS_LINK_XSTATS_SLAVE attribute

This patch adds support for the IFLA_STATS_LINK_XSTATS_SLAVE attribute
which allows to export per-slave statistics if the master device supports
the linkxstats callback. The attribute is passed down to the linkxstats
callback and it is up to the callback user to use it (an example has been
added to the only current user - the bridge). This allows us to query only
specific slaves of master devices like bridge ports and export only what
we're interested in instead of having to dump all ports and searching only
for a single one. This will be used to export per-port IGMP/MLD stats and
also per-port vlan stats in the future, possibly other statistics as well.

Signed-off-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/net/rtnetlink.h b/include/net/rtnetlink.h
index 006a7b81d758a29119a3d7e6458db15f83aa66e6..4113916cc1bb055bf16ba5f53819f2bdeeca2ef0 100644 (file)
--- a/include/net/rtnetlink.h
+++ b/include/net/rtnetlink.h
@@ -98,10 +98,11 @@ struct rtnl_link_ops {
                                                   const struct net_device *dev,
                                                   const struct net_device *slave_dev);
        struct net              *(*get_link_net)(const struct net_device *dev);
-       size_t                  (*get_linkxstats_size)(const struct net_device *dev);
+       size_t                  (*get_linkxstats_size)(const struct net_device *dev,
+                                                      int attr);
        int                     (*fill_linkxstats)(struct sk_buff *skb,
                                                   const struct net_device *dev,
-                                                  int *prividx);
+                                                  int *prividx, int attr);
 };
 
 int __rtnl_link_register(struct rtnl_link_ops *ops);

diff --git a/include/uapi/linux/if_link.h b/include/uapi/linux/if_link.h
index bb36bd5675a7ceb641a597aa4d82d428cdaaf529..db2458ade81c67c88948df7cf0048c53f3d35076 100644 (file)
--- a/include/uapi/linux/if_link.h
+++ b/include/uapi/linux/if_link.h
@@ -822,6 +822,7 @@ enum {
        IFLA_STATS_UNSPEC, /* also used as 64bit pad attribute */
        IFLA_STATS_LINK_64,
        IFLA_STATS_LINK_XSTATS,
+       IFLA_STATS_LINK_XSTATS_SLAVE,
        __IFLA_STATS_MAX,
 };
 

diff --git a/net/bridge/br_netlink.c b/net/bridge/br_netlink.c
index 85e89f693589d1a7e712d9165cdac8147e0bf02c..ed75ff9ff9e6204dccad797ab95123e8747faac1 100644 (file)
--- a/net/bridge/br_netlink.c
+++ b/net/bridge/br_netlink.c
@@ -1234,7 +1234,7 @@ static int br_fill_info(struct sk_buff *skb, const struct net_device *brdev)
        return 0;
 }
 
-static size_t br_get_linkxstats_size(const struct net_device *dev)
+static size_t bridge_get_linkxstats_size(const struct net_device *dev)
 {
        struct net_bridge *br = netdev_priv(dev);
        struct net_bridge_vlan_group *vg;
@@ -1254,8 +1254,30 @@ static size_t br_get_linkxstats_size(const struct net_device *dev)
               nla_total_size(0);
 }
 
-static int br_fill_linkxstats(struct sk_buff *skb, const struct net_device *dev,
-                             int *prividx)
+static size_t brport_get_linkxstats_size(const struct net_device *dev)
+{
+       return nla_total_size(0);
+}
+
+static size_t br_get_linkxstats_size(const struct net_device *dev, int attr)
+{
+       size_t retsize = 0;
+
+       switch (attr) {
+       case IFLA_STATS_LINK_XSTATS:
+               retsize = bridge_get_linkxstats_size(dev);
+               break;
+       case IFLA_STATS_LINK_XSTATS_SLAVE:
+               retsize = brport_get_linkxstats_size(dev);
+               break;
+       }
+
+       return retsize;
+}
+
+static int bridge_fill_linkxstats(struct sk_buff *skb,
+                                 const struct net_device *dev,
+                                 int *prividx)
 {
        struct net_bridge *br = netdev_priv(dev);
        struct net_bridge_vlan_group *vg;
@@ -1298,6 +1320,37 @@ nla_put_failure:
        return -EMSGSIZE;
 }
 
+static int brport_fill_linkxstats(struct sk_buff *skb,
+                                 const struct net_device *dev,
+                                 int *prividx)
+{
+       struct nlattr *nest;
+
+       nest = nla_nest_start(skb, LINK_XSTATS_TYPE_BRIDGE);
+       if (!nest)
+               return -EMSGSIZE;
+       nla_nest_end(skb, nest);
+
+       return 0;
+}
+
+static int br_fill_linkxstats(struct sk_buff *skb, const struct net_device *dev,
+                             int *prividx, int attr)
+{
+       int ret = -EINVAL;
+
+       switch (attr) {
+       case IFLA_STATS_LINK_XSTATS:
+               ret = bridge_fill_linkxstats(skb, dev, prividx);
+               break;
+       case IFLA_STATS_LINK_XSTATS_SLAVE:
+               ret = brport_fill_linkxstats(skb, dev, prividx);
+               break;
+       }
+
+       return ret;
+}
+
 static struct rtnl_af_ops br_af_ops __read_mostly = {
        .family                 = AF_BRIDGE,
        .get_link_af_size       = br_get_link_af_size_filtered,

diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
index eb49ca24274abc9238f6594f681cb9999543c1ec..cfed7bc14ee6d93a97fc0eb9b0bc896044671cb1 100644 (file)
--- a/net/core/rtnetlink.c
+++ b/net/core/rtnetlink.c
@@ -3519,7 +3519,32 @@ static int rtnl_fill_statsinfo(struct sk_buff *skb, struct net_device *dev,
                        if (!attr)
                                goto nla_put_failure;
 
-                       err = ops->fill_linkxstats(skb, dev, prividx);
+                       err = ops->fill_linkxstats(skb, dev, prividx, *idxattr);
+                       nla_nest_end(skb, attr);
+                       if (err)
+                               goto nla_put_failure;
+                       *idxattr = 0;
+               }
+       }
+
+       if (stats_attr_valid(filter_mask, IFLA_STATS_LINK_XSTATS_SLAVE,
+                            *idxattr)) {
+               const struct rtnl_link_ops *ops = NULL;
+               const struct net_device *master;
+
+               master = netdev_master_upper_dev_get(dev);
+               if (master)
+                       ops = master->rtnl_link_ops;
+               if (ops && ops->fill_linkxstats) {
+                       int err;
+
+                       *idxattr = IFLA_STATS_LINK_XSTATS_SLAVE;
+                       attr = nla_nest_start(skb,
+                                             IFLA_STATS_LINK_XSTATS_SLAVE);
+                       if (!attr)
+                               goto nla_put_failure;
+
+                       err = ops->fill_linkxstats(skb, dev, prividx, *idxattr);
                        nla_nest_end(skb, attr);
                        if (err)
                                goto nla_put_failure;
@@ -3555,14 +3580,35 @@ static size_t if_nlmsg_stats_size(const struct net_device *dev,
 
        if (stats_attr_valid(filter_mask, IFLA_STATS_LINK_XSTATS, 0)) {
                const struct rtnl_link_ops *ops = dev->rtnl_link_ops;
+               int attr = IFLA_STATS_LINK_XSTATS;
 
                if (ops && ops->get_linkxstats_size) {
-                       size += nla_total_size(ops->get_linkxstats_size(dev));
+                       size += nla_total_size(ops->get_linkxstats_size(dev,
+                                                                       attr));
                        /* for IFLA_STATS_LINK_XSTATS */
                        size += nla_total_size(0);
                }
        }
 
+       if (stats_attr_valid(filter_mask, IFLA_STATS_LINK_XSTATS_SLAVE, 0)) {
+               struct net_device *_dev = (struct net_device *)dev;
+               const struct rtnl_link_ops *ops = NULL;
+               const struct net_device *master;
+
+               /* netdev_master_upper_dev_get can't take const */
+               master = netdev_master_upper_dev_get(_dev);
+               if (master)
+                       ops = master->rtnl_link_ops;
+               if (ops && ops->get_linkxstats_size) {
+                       int attr = IFLA_STATS_LINK_XSTATS_SLAVE;
+
+                       size += nla_total_size(ops->get_linkxstats_size(dev,
+                                                                       attr));
+                       /* for IFLA_STATS_LINK_XSTATS_SLAVE */
+                       size += nla_total_size(0);
+               }
+       }
+
        return size;
 }