[patch net-next v4 1/4] netdevice: add SW statistics ndo
From: Jiri Pirko <jiri@resnulli.us>
Date: 2016-06-16 08:37:25
Subsystem:
networking drivers, networking [general], the rest · Maintainers:
Andrew Lunn, "David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Linus Torvalds
From: Nogah Frankel <redacted> Till now we had a ndo statistics function that returned SW statistics. We want to change the "basic" statistics to return HW statistics if available. In this case we need to expose a new ndo to return the SW statistics. Add a new ndo declaration to get SW statistics Add a function that gets SW statistics if a compatible ndo exist Signed-off-by: Nogah Frankel <redacted> Reviewed-by: Ido Schimmel <redacted> Signed-off-by: Jiri Pirko <redacted> --- include/linux/netdevice.h | 13 +++++++++++++ net/core/dev.c | 31 +++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+)
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 890158e..6338e38 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h@@ -890,6 +890,14 @@ struct tc_to_netdev { * field is written atomically. * 3. Update dev->stats asynchronously and atomically, and define * neither operation. + * Driver should return HW statistics, if available. + * + * struct rtnl_link_stats64* (*ndo_get_sw_stats64)(struct net_device *dev, + * struct rtnl_link_stats64 *storage); + * Similar to rtnl_link_stats64 but used to get SW statistics, + * if it is possible to get HW and SW statistics separately. + * If this option isn't valid - driver doesn't need to define + * this function. * * int (*ndo_vlan_rx_add_vid)(struct net_device *dev, __be16 proto, u16 vid); * If device supports VLAN filtering this function is called when a
@@ -1132,6 +1140,9 @@ struct net_device_ops { struct rtnl_link_stats64* (*ndo_get_stats64)(struct net_device *dev, struct rtnl_link_stats64 *storage); + struct rtnl_link_stats64* (*ndo_get_sw_stats64)(struct net_device *dev, + struct rtnl_link_stats64 *storage); + struct net_device_stats* (*ndo_get_stats)(struct net_device *dev); int (*ndo_vlan_rx_add_vid)(struct net_device *dev,
@@ -3779,6 +3790,8 @@ struct rtnl_link_stats64 *dev_get_stats(struct net_device *dev, struct rtnl_link_stats64 *storage); void netdev_stats_to_stats64(struct rtnl_link_stats64 *stats64, const struct net_device_stats *netdev_stats); +int dev_get_sw_stats(struct net_device *dev, struct rtnl_link_stats64 *storage); +bool dev_have_sw_stats(const struct net_device *dev); extern int netdev_max_backlog; extern int netdev_tstamp_prequeue;
diff --git a/net/core/dev.c b/net/core/dev.c
index b148357..087f0ea 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c@@ -7368,6 +7368,8 @@ EXPORT_SYMBOL(netdev_stats_to_stats64); * The device driver may provide its own method by setting * dev->netdev_ops->get_stats64 or dev->netdev_ops->get_stats; * otherwise the internal statistics structure is used. + * If device supports both HW & SW statistics - this function should + * return the HW statistics. */ struct rtnl_link_stats64 *dev_get_stats(struct net_device *dev, struct rtnl_link_stats64 *storage)
@@ -7389,6 +7391,35 @@ struct rtnl_link_stats64 *dev_get_stats(struct net_device *dev, } EXPORT_SYMBOL(dev_get_stats); +/* dev_get_sw_stats - get network device SW statistics + * (if it is possible to get HW & SW statistics separately) + * @dev: device to get statistics from + * @storage: place to store stats + * + * if exist a function to query the netdev SW statistics get it to storage + * return 0 if did, or -EINVAL if this function doesn't exist + */ +int dev_get_sw_stats(struct net_device *dev, + struct rtnl_link_stats64 *storage) +{ + const struct net_device_ops *ops = dev->netdev_ops; + + if (ops->ndo_get_sw_stats64) { + memset(storage, 0, sizeof(*storage)); + ops->ndo_get_sw_stats64(dev, storage); + } else { + return -EINVAL; + } + return 0; +} +EXPORT_SYMBOL(dev_get_sw_stats); + +bool dev_have_sw_stats(const struct net_device *dev) +{ + return dev->netdev_ops->ndo_get_sw_stats64 != NULL; +} +EXPORT_SYMBOL(dev_have_sw_stats); + struct netdev_queue *dev_ingress_queue_create(struct net_device *dev) { struct netdev_queue *queue = dev_ingress_queue(dev);
--
2.5.5