netdevsim: support ethtool ring and coalesce settings

Add ethtool ring and coalesce settings support for testing.

Signed-off-by: Antonio Cardace <acardace@redhat.com>
Reviewed-by: Michal Kubecek <mkubecek@suse.cz>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/netdevsim/ethtool.c b/drivers/net/netdevsim/ethtool.c
index 4f074bf..166f0d6 100644 (file)
--- a/drivers/net/netdevsim/ethtool.c
+++ b/drivers/net/netdevsim/ethtool.c
@@ -42,18 +42,68 @@ nsim_set_pauseparam(struct net_device *dev, struct ethtool_pauseparam *pause)
        return 0;
 }
 
+static int nsim_get_coalesce(struct net_device *dev,
+                            struct ethtool_coalesce *coal)
+{
+       struct netdevsim *ns = netdev_priv(dev);
+
+       memcpy(coal, &ns->ethtool.coalesce, sizeof(ns->ethtool.coalesce));
+       return 0;
+}
+
+static int nsim_set_coalesce(struct net_device *dev,
+                            struct ethtool_coalesce *coal)
+{
+       struct netdevsim *ns = netdev_priv(dev);
+
+       memcpy(&ns->ethtool.coalesce, coal, sizeof(ns->ethtool.coalesce));
+       return 0;
+}
+
+static void nsim_get_ringparam(struct net_device *dev,
+                              struct ethtool_ringparam *ring)
+{
+       struct netdevsim *ns = netdev_priv(dev);
+
+       memcpy(ring, &ns->ethtool.ring, sizeof(ns->ethtool.ring));
+}
+
+static int nsim_set_ringparam(struct net_device *dev,
+                             struct ethtool_ringparam *ring)
+{
+       struct netdevsim *ns = netdev_priv(dev);
+
+       memcpy(&ns->ethtool.ring, ring, sizeof(ns->ethtool.ring));
+       return 0;
+}
+
 static const struct ethtool_ops nsim_ethtool_ops = {
-       .get_pause_stats        = nsim_get_pause_stats,
-       .get_pauseparam         = nsim_get_pauseparam,
-       .set_pauseparam         = nsim_set_pauseparam,
+       .supported_coalesce_params      = ETHTOOL_COALESCE_ALL_PARAMS,
+       .get_pause_stats                = nsim_get_pause_stats,
+       .get_pauseparam                 = nsim_get_pauseparam,
+       .set_pauseparam                 = nsim_set_pauseparam,
+       .set_coalesce                   = nsim_set_coalesce,
+       .get_coalesce                   = nsim_get_coalesce,
+       .get_ringparam                  = nsim_get_ringparam,
+       .set_ringparam                  = nsim_set_ringparam,
 };
 
+static void nsim_ethtool_ring_init(struct netdevsim *ns)
+{
+       ns->ethtool.ring.rx_max_pending = 4096;
+       ns->ethtool.ring.rx_jumbo_max_pending = 4096;
+       ns->ethtool.ring.rx_mini_max_pending = 4096;
+       ns->ethtool.ring.tx_max_pending = 4096;
+}
+
 void nsim_ethtool_init(struct netdevsim *ns)
 {
        struct dentry *ethtool, *dir;
 
        ns->netdev->ethtool_ops = &nsim_ethtool_ops;
 
+       nsim_ethtool_ring_init(ns);
+
        ethtool = debugfs_create_dir("ethtool", ns->nsim_dev_port->ddir);
 
        dir = debugfs_create_dir("pause", ethtool);
@@ -61,4 +111,14 @@ void nsim_ethtool_init(struct netdevsim *ns)
                            &ns->ethtool.pauseparam.report_stats_rx);
        debugfs_create_bool("report_stats_tx", 0600, dir,
                            &ns->ethtool.pauseparam.report_stats_tx);
+
+       dir = debugfs_create_dir("ring", ethtool);
+       debugfs_create_u32("rx_max_pending", 0600, dir,
+                          &ns->ethtool.ring.rx_max_pending);
+       debugfs_create_u32("rx_jumbo_max_pending", 0600, dir,
+                          &ns->ethtool.ring.rx_jumbo_max_pending);
+       debugfs_create_u32("rx_mini_max_pending", 0600, dir,
+                          &ns->ethtool.ring.rx_mini_max_pending);
+       debugfs_create_u32("tx_max_pending", 0600, dir,
+                          &ns->ethtool.ring.tx_max_pending);
 }

diff --git a/drivers/net/netdevsim/netdevsim.h b/drivers/net/netdevsim/netdevsim.h
index 700ac59..19b1e6e 100644 (file)
--- a/drivers/net/netdevsim/netdevsim.h
+++ b/drivers/net/netdevsim/netdevsim.h
@@ -15,6 +15,7 @@
 
 #include <linux/debugfs.h>
 #include <linux/device.h>
+#include <linux/ethtool.h>
 #include <linux/kernel.h>
 #include <linux/list.h>
 #include <linux/netdevice.h>
@@ -60,6 +61,8 @@ struct nsim_ethtool_pauseparam {
 
 struct nsim_ethtool {
        struct nsim_ethtool_pauseparam pauseparam;
+       struct ethtool_coalesce coalesce;
+       struct ethtool_ringparam ring;
 };
 
 struct netdevsim {