[PATCH net-next v3 2/4] netdevsim: support ethtool ring and coalesce settings

[Antonio Cardace]

Add ethtool ring and coalesce settings support for testing.

Signed-off-by: Antonio Cardace <acard...@redhat.com>
---
 drivers/net/netdevsim/ethtool.c   | 82 ++++++++++++++++++++++++++-----
 drivers/net/netdevsim/netdevsim.h |  9 +++-
 2 files changed, 79 insertions(+), 12 deletions(-)

diff --git a/drivers/net/netdevsim/ethtool.c b/drivers/net/netdevsim/ethtool.c
index f1884d90a876..169154dba0cc 100644
--- a/drivers/net/netdevsim/ethtool.c
+++ b/drivers/net/netdevsim/ethtool.c
@@ -13,9 +13,9 @@ nsim_get_pause_stats(struct net_device *dev,
 {
        struct netdevsim *ns = netdev_priv(dev);
 
-       if (ns->ethtool.report_stats_rx)
+       if (ns->ethtool.pauseparam.report_stats_rx)
                pause_stats->rx_pause_frames = 1;
-       if (ns->ethtool.report_stats_tx)
+       if (ns->ethtool.pauseparam.report_stats_tx)
                pause_stats->tx_pause_frames = 2;
 }
 
@@ -25,8 +25,8 @@ nsim_get_pauseparam(struct net_device *dev, struct 
ethtool_pauseparam *pause)
        struct netdevsim *ns = netdev_priv(dev);
 
        pause->autoneg = 0; /* We don't support ksettings, so can't pretend */
-       pause->rx_pause = ns->ethtool.rx;
-       pause->tx_pause = ns->ethtool.tx;
+       pause->rx_pause = ns->ethtool.pauseparam.rx;
+       pause->tx_pause = ns->ethtool.pauseparam.tx;
 }
 
 static int
@@ -37,28 +37,88 @@ nsim_set_pauseparam(struct net_device *dev, struct 
ethtool_pauseparam *pause)
        if (pause->autoneg)
                return -EINVAL;
 
-       ns->ethtool.rx = pause->rx_pause;
-       ns->ethtool.tx = pause->tx_pause;
+       ns->ethtool.pauseparam.rx = pause->rx_pause;
+       ns->ethtool.pauseparam.tx = pause->tx_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,
+       .get_pause_stats                = nsim_get_pause_stats,
+       .get_pauseparam                 = nsim_get_pauseparam,
+       .set_pauseparam                 = nsim_set_pauseparam,
+       .supported_coalesce_params      = ETHTOOL_COALESCE_ALL_PARAMS,
+       .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);
        debugfs_create_bool("report_stats_rx", 0600, dir,
-                           &ns->ethtool.report_stats_rx);
+                           &ns->ethtool.pauseparam.report_stats_rx);
        debugfs_create_bool("report_stats_tx", 0600, dir,
-                           &ns->ethtool.report_stats_tx);
+                           &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 827fc80f50a0..b023dc0a4259 100644
--- 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>
@@ -51,13 +52,19 @@ struct nsim_ipsec {
        u32 ok;
 };
 
-struct nsim_ethtool {
+struct nsim_ethtool_pauseparam {
        bool rx;
        bool tx;
        bool report_stats_rx;
        bool report_stats_tx;
 };
 
+struct nsim_ethtool {
+       struct nsim_ethtool_pauseparam pauseparam;
+       struct ethtool_coalesce coalesce;
+       struct ethtool_ringparam ring;
+};
+
 struct netdevsim {
        struct net_device *netdev;
        struct nsim_dev *nsim_dev;
-- 
2.28.0