batman-adv: Add get_ethtool_stats() support

Added additional counters in a bat_stats structure, which are exported
through the ethtool api. The counters are specific to batman-adv and
includes:
 forwarded packets and bytes
 management packets and bytes (aggregated OGMs at this point)
 translation table packets

New counters are added by extending "enum bat_counters" in types.h and
adding corresponding  descriptive string(s) to bat_counters_strings in
soft-iface.c.

Counters are increased by calling batadv_add_counter() and incremented
by one by calling batadv_inc_counter().

Signed-off-by: Martin Hundebøll <martin@hundeboll.net>
Signed-off-by: Sven Eckelmann <sven@narfation.org>

1 files changed, 64 insertions, 2 deletions

diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c
index 6e2530b02043..304a7ba09e03 100644
--- a/net/batman-adv/soft-interface.c
+++ b/net/batman-adv/soft-interface.c
@@ -45,6 +45,10 @@ static void bat_get_drvinfo(struct net_device *dev,
 static u32 bat_get_msglevel(struct net_device *dev);
 static void bat_set_msglevel(struct net_device *dev, u32 value);
 static u32 bat_get_link(struct net_device *dev);
+static void batadv_get_strings(struct net_device *dev, u32 stringset, u8 *data);
+static void batadv_get_ethtool_stats(struct net_device *dev,
+                                     struct ethtool_stats *stats, u64 *data);
+static int batadv_get_sset_count(struct net_device *dev, int stringset);
 
 static const struct ethtool_ops bat_ethtool_ops = {
         .get_settings = bat_get_settings,
@@ -52,6 +56,9 @@ static const struct ethtool_ops bat_ethtool_ops = {
         .get_msglevel = bat_get_msglevel,
         .set_msglevel = bat_set_msglevel,
         .get_link = bat_get_link,
+        .get_strings = batadv_get_strings,
+        .get_ethtool_stats = batadv_get_ethtool_stats,
+        .get_sset_count = batadv_get_sset_count,
 };
 
 int my_skb_head_push(struct sk_buff *skb, unsigned int len)
@@ -399,13 +406,18 @@ struct net_device *softif_create(const char *name)
         bat_priv->primary_if = NULL;
         bat_priv->num_ifaces = 0;
 
+        bat_priv->bat_counters = __alloc_percpu(sizeof(uint64_t) * BAT_CNT_NUM,
+                                                __alignof__(uint64_t));
+        if (!bat_priv->bat_counters)
+                goto unreg_soft_iface;
+
         ret = bat_algo_select(bat_priv, bat_routing_algo);
         if (ret < 0)
-                goto unreg_soft_iface;
+                goto free_bat_counters;
 
         ret = sysfs_add_meshif(soft_iface);
         if (ret < 0)
-                goto unreg_soft_iface;
+                goto free_bat_counters;
 
         ret = debugfs_add_meshif(soft_iface);
         if (ret < 0)
@@ -421,6 +433,8 @@ unreg_debugfs:
         debugfs_del_meshif(soft_iface);
 unreg_sysfs:
         sysfs_del_meshif(soft_iface);
+free_bat_counters:
+        free_percpu(bat_priv->bat_counters);
 unreg_soft_iface:
         unregister_netdevice(soft_iface);
         return NULL;
@@ -486,3 +500,51 @@ static u32 bat_get_link(struct net_device *dev)
 {
         return 1;
 }
+
+/* Inspired by drivers/net/ethernet/dlink/sundance.c:1702
+ * Declare each description string in struct.name[] to get fixed sized buffer
+ * and compile time checking for strings longer than ETH_GSTRING_LEN.
+ */
+static const struct {
+        const char name[ETH_GSTRING_LEN];
+} bat_counters_strings[] = {
+        { "forward" },
+        { "forward_bytes" },
+        { "mgmt_tx" },
+        { "mgmt_tx_bytes" },
+        { "mgmt_rx" },
+        { "mgmt_rx_bytes" },
+        { "tt_request_tx" },
+        { "tt_request_rx" },
+        { "tt_response_tx" },
+        { "tt_response_rx" },
+        { "tt_roam_adv_tx" },
+        { "tt_roam_adv_rx" },
+};
+
+static void batadv_get_strings(struct net_device *dev, uint32_t stringset,
+                               uint8_t *data)
+{
+        if (stringset == ETH_SS_STATS)
+                memcpy(data, bat_counters_strings,
+                       sizeof(bat_counters_strings));
+}
+
+static void batadv_get_ethtool_stats(struct net_device *dev,
+                                     struct ethtool_stats *stats,
+                                     uint64_t *data)
+{
+        struct bat_priv *bat_priv = netdev_priv(dev);
+        int i;
+
+        for (i = 0; i < BAT_CNT_NUM; i++)
+                data[i] = batadv_sum_counter(bat_priv, i);
+}
+
+static int batadv_get_sset_count(struct net_device *dev, int stringset)
+{
+        if (stringset == ETH_SS_STATS)
+                return BAT_CNT_NUM;
+
+        return -EOPNOTSUPP;
+}