net/mlx5e: Implement ethtool callbacks for supporting per-queue coalescing

Use mlx5 on-the-fly coalescing configuration support to enable individual
channel configuration.

Co-developed-by: Nabil S. Alramli <dev@nalramli.com>
Signed-off-by: Nabil S. Alramli <dev@nalramli.com>
Co-developed-by: Joe Damato <jdamato@fastly.com>
Signed-off-by: Joe Damato <jdamato@fastly.com>
Signed-off-by: Rahul Rameshbabu <rrameshbabu@nvidia.com>
Reviewed-by: Saeed Mahameed <saeedm@nvidia.com>
Signed-off-by: Tariq Toukan <tariqt@nvidia.com>
Link: https://lore.kernel.org/r/20240419080445.417574-6-tariqt@nvidia.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en.h b/drivers/net/ethernet/mellanox/mlx5/core/en.h
index eb09778327cce6420e41b39c4eda68b050bdaf11..f8bd9dbf59cd6aa8631ce56e0632dd2569e4c586 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en.h
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en.h
@@ -1199,6 +1199,10 @@ int mlx5e_ethtool_set_coalesce(struct mlx5e_priv *priv,
                               struct ethtool_coalesce *coal,
                               struct kernel_ethtool_coalesce *kernel_coal,
                               struct netlink_ext_ack *extack);
+int mlx5e_get_per_queue_coalesce(struct net_device *dev, u32 queue,
+                                struct ethtool_coalesce *coal);
+int mlx5e_set_per_queue_coalesce(struct net_device *dev, u32 queue,
+                                struct ethtool_coalesce *coal);
 u32 mlx5e_ethtool_get_rxfh_key_size(struct mlx5e_priv *priv);
 u32 mlx5e_ethtool_get_rxfh_indir_size(struct mlx5e_priv *priv);
 int mlx5e_ethtool_get_ts_info(struct mlx5e_priv *priv,

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c b/drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c
index c968874569cc4c9631f052586ded957cd248faf1..1eb3a712930b920575479a18d903d682446b83d2 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c
@@ -589,6 +589,68 @@ static int mlx5e_get_coalesce(struct net_device *netdev,
        return mlx5e_ethtool_get_coalesce(priv, coal, kernel_coal);
 }
 
+static int mlx5e_ethtool_get_per_queue_coalesce(struct mlx5e_priv *priv, u32 queue,
+                                               struct ethtool_coalesce *coal)
+{
+       struct dim_cq_moder cur_moder;
+       struct mlx5e_channels *chs;
+       struct mlx5e_channel *c;
+
+       if (!MLX5_CAP_GEN(priv->mdev, cq_moderation))
+               return -EOPNOTSUPP;
+
+       mutex_lock(&priv->state_lock);
+
+       chs = &priv->channels;
+       if (chs->num <= queue) {
+               mutex_unlock(&priv->state_lock);
+               return -EINVAL;
+       }
+
+       c = chs->c[queue];
+
+       coal->use_adaptive_rx_coalesce = !!c->rq.dim;
+       if (coal->use_adaptive_rx_coalesce) {
+               cur_moder = net_dim_get_rx_moderation(c->rq.dim->mode,
+                                                     c->rq.dim->profile_ix);
+
+               coal->rx_coalesce_usecs = cur_moder.usec;
+               coal->rx_max_coalesced_frames = cur_moder.pkts;
+       } else {
+               coal->rx_coalesce_usecs = c->rx_cq_moder.usec;
+               coal->rx_max_coalesced_frames = c->rx_cq_moder.pkts;
+       }
+
+       coal->use_adaptive_tx_coalesce = !!c->sq[0].dim;
+       if (coal->use_adaptive_tx_coalesce) {
+               /* NOTE: Will only display DIM coalesce profile information of
+                * first channel. The current interface cannot display this
+                * information for all tc.
+                */
+               cur_moder = net_dim_get_tx_moderation(c->sq[0].dim->mode,
+                                                     c->sq[0].dim->profile_ix);
+
+               coal->tx_coalesce_usecs = cur_moder.usec;
+               coal->tx_max_coalesced_frames = cur_moder.pkts;
+
+       } else {
+               coal->tx_coalesce_usecs = c->tx_cq_moder.usec;
+               coal->tx_max_coalesced_frames = c->tx_cq_moder.pkts;
+       }
+
+       mutex_unlock(&priv->state_lock);
+
+       return 0;
+}
+
+int mlx5e_get_per_queue_coalesce(struct net_device *dev, u32 queue,
+                                struct ethtool_coalesce *coal)
+{
+       struct mlx5e_priv *priv = netdev_priv(dev);
+
+       return mlx5e_ethtool_get_per_queue_coalesce(priv, queue, coal);
+}
+
 #define MLX5E_MAX_COAL_TIME            MLX5_MAX_CQ_PERIOD
 #define MLX5E_MAX_COAL_FRAMES          MLX5_MAX_CQ_COUNT
 
@@ -747,6 +809,88 @@ static int mlx5e_set_coalesce(struct net_device *netdev,
        return mlx5e_ethtool_set_coalesce(priv, coal, kernel_coal, extack);
 }
 
+static int mlx5e_ethtool_set_per_queue_coalesce(struct mlx5e_priv *priv, u32 queue,
+                                               struct ethtool_coalesce *coal)
+{
+       struct mlx5_core_dev *mdev = priv->mdev;
+       bool rx_dim_enabled, tx_dim_enabled;
+       struct mlx5e_channels *chs;
+       struct mlx5e_channel *c;
+       int err = 0;
+       int tc;
+
+       if (!MLX5_CAP_GEN(mdev, cq_moderation))
+               return -EOPNOTSUPP;
+
+       if (coal->tx_coalesce_usecs > MLX5E_MAX_COAL_TIME ||
+           coal->rx_coalesce_usecs > MLX5E_MAX_COAL_TIME) {
+               netdev_info(priv->netdev, "%s: maximum coalesce time supported is %lu usecs\n",
+                           __func__, MLX5E_MAX_COAL_TIME);
+               return -ERANGE;
+       }
+
+       if (coal->tx_max_coalesced_frames > MLX5E_MAX_COAL_FRAMES ||
+           coal->rx_max_coalesced_frames > MLX5E_MAX_COAL_FRAMES) {
+               netdev_info(priv->netdev, "%s: maximum coalesced frames supported is %lu\n",
+                           __func__, MLX5E_MAX_COAL_FRAMES);
+               return -ERANGE;
+       }
+
+       rx_dim_enabled = !!coal->use_adaptive_rx_coalesce;
+       tx_dim_enabled = !!coal->use_adaptive_tx_coalesce;
+
+       mutex_lock(&priv->state_lock);
+
+       chs = &priv->channels;
+       if (chs->num <= queue) {
+               mutex_unlock(&priv->state_lock);
+               return -EINVAL;
+       }
+
+       c = chs->c[queue];
+
+       err = mlx5e_dim_rx_change(&c->rq, rx_dim_enabled);
+       if (err)
+               goto state_unlock;
+
+       for (tc = 0; tc < c->num_tc; tc++) {
+               err = mlx5e_dim_tx_change(&c->sq[tc], tx_dim_enabled);
+               if (err)
+                       goto state_unlock;
+       }
+
+       if (!rx_dim_enabled) {
+               c->rx_cq_moder.usec = coal->rx_coalesce_usecs;
+               c->rx_cq_moder.pkts = coal->rx_max_coalesced_frames;
+
+               mlx5_core_modify_cq_moderation(mdev, &c->rq.cq.mcq,
+                                              coal->rx_coalesce_usecs,
+                                              coal->rx_max_coalesced_frames);
+       }
+
+       if (!tx_dim_enabled) {
+               c->tx_cq_moder.usec = coal->tx_coalesce_usecs;
+               c->tx_cq_moder.pkts = coal->tx_max_coalesced_frames;
+
+               for (tc = 0; tc < c->num_tc; tc++)
+                       mlx5_core_modify_cq_moderation(mdev, &c->sq[tc].cq.mcq,
+                                                      coal->tx_coalesce_usecs,
+                                                      coal->tx_max_coalesced_frames);
+       }
+
+state_unlock:
+       mutex_unlock(&priv->state_lock);
+       return err;
+}
+
+int mlx5e_set_per_queue_coalesce(struct net_device *dev, u32 queue,
+                                struct ethtool_coalesce *coal)
+{
+       struct mlx5e_priv *priv = netdev_priv(dev);
+
+       return mlx5e_ethtool_set_per_queue_coalesce(priv, queue, coal);
+}
+
 static void ptys2ethtool_supported_link(struct mlx5_core_dev *mdev,
                                        unsigned long *supported_modes,
                                        u32 eth_proto_cap)
@@ -2472,6 +2616,8 @@ const struct ethtool_ops mlx5e_ethtool_ops = {
        .set_channels      = mlx5e_set_channels,
        .get_coalesce      = mlx5e_get_coalesce,
        .set_coalesce      = mlx5e_set_coalesce,
+       .get_per_queue_coalesce = mlx5e_get_per_queue_coalesce,
+       .set_per_queue_coalesce = mlx5e_set_per_queue_coalesce,
        .get_link_ksettings  = mlx5e_get_link_ksettings,
        .set_link_ksettings  = mlx5e_set_link_ksettings,
        .get_rxfh_key_size   = mlx5e_get_rxfh_key_size,

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c b/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c
index 6477b91ff5125d7f79daad65e1dcb1f45ac27297..8790d57dc6dbf0bc466ec7bdef66680ec2a587a8 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c
@@ -428,6 +428,8 @@ static const struct ethtool_ops mlx5e_rep_ethtool_ops = {
        .set_channels      = mlx5e_rep_set_channels,
        .get_coalesce      = mlx5e_rep_get_coalesce,
        .set_coalesce      = mlx5e_rep_set_coalesce,
+       .get_per_queue_coalesce = mlx5e_get_per_queue_coalesce,
+       .set_per_queue_coalesce = mlx5e_set_per_queue_coalesce,
        .get_rxfh_key_size   = mlx5e_rep_get_rxfh_key_size,
        .get_rxfh_indir_size = mlx5e_rep_get_rxfh_indir_size,
 };