[dpdk-dev] [PATCH 1/2] net/mlx5: preserve promisc flag for flow isolation mode

[Yongseok Koh]

mlx5_dev_ops_isolate doesn't have APIs for enabling/disabling promiscuous
mode as it can't be enabled in flow isolation mode. If the function
pointers are null, librte APIs such as rte_eth_promiscuous_enable/disable()
fail to set the flag (dev->data->promiscuous). Also, there's need to
preserve promiscuous mode setting when toggling flow isolation mode.
Promiscuous mode, if enabled, should be disabled when switching to flow
isolation mode and vice versa.

Fixes: 0887aa7f27f3 ("net/mlx5: add new operations for isolated mode")
Cc: sta...@dpdk.org

Signed-off-by: Yongseok Koh <ys...@mellanox.com>
---
 drivers/net/mlx5/mlx5.c        |  2 ++
 drivers/net/mlx5/mlx5_flow.c   | 16 ++++++++++++++--
 drivers/net/mlx5/mlx5_rxmode.c |  8 ++++++--
 3 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c
index e3e2a181ac..83b82f11ab 100644
--- a/drivers/net/mlx5/mlx5.c
+++ b/drivers/net/mlx5/mlx5.c
@@ -399,6 +399,8 @@ const struct eth_dev_ops mlx5_dev_ops_isolate = {
        .dev_set_link_down = mlx5_set_link_down,
        .dev_set_link_up = mlx5_set_link_up,
        .dev_close = mlx5_dev_close,
+       .promiscuous_enable = mlx5_promiscuous_enable,
+       .promiscuous_disable = mlx5_promiscuous_disable,
        .link_update = mlx5_link_update,
        .stats_get = mlx5_stats_get,
        .stats_reset = mlx5_stats_reset,
diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c
index 6c3021abac..268d1f056c 100644
--- a/drivers/net/mlx5/mlx5_flow.c
+++ b/drivers/net/mlx5/mlx5_flow.c
@@ -3335,10 +3335,22 @@ mlx5_flow_isolate(struct rte_eth_dev *dev,
                return -rte_errno;
        }
        priv->isolated = !!enable;
-       if (enable)
+       if (enable) {
                dev->dev_ops = &mlx5_dev_ops_isolate;
-       else
+               /*
+                * Disable unsupported features. Need to restore flag so that it
+                * can be re-enabled when switching out of isolated mode.
+                */
+               if (dev->data->promiscuous) {
+                       mlx5_promiscuous_disable(dev);
+                       dev->data->promiscuous = 1;
+               }
+       } else {
                dev->dev_ops = &mlx5_dev_ops;
+               /* Take back disabled features if needed. */
+               if (dev->data->promiscuous)
+                       mlx5_promiscuous_enable(dev);
+       }
        return 0;
 }
 
diff --git a/drivers/net/mlx5/mlx5_rxmode.c b/drivers/net/mlx5/mlx5_rxmode.c
index 80824bc43b..0ed4c1a174 100644
--- a/drivers/net/mlx5/mlx5_rxmode.c
+++ b/drivers/net/mlx5/mlx5_rxmode.c
@@ -32,10 +32,13 @@
 void
 mlx5_promiscuous_enable(struct rte_eth_dev *dev)
 {
+       struct priv *priv = dev->data->dev_private;
        int ret;
 
        dev->data->promiscuous = 1;
-       if (((struct priv *)dev->data->dev_private)->config.vf)
+       if (priv->isolated)
+               return;
+       if (priv->config.vf)
                mlx5_nl_promisc(dev, 1);
        ret = mlx5_traffic_restart(dev);
        if (ret)
@@ -52,10 +55,11 @@ mlx5_promiscuous_enable(struct rte_eth_dev *dev)
 void
 mlx5_promiscuous_disable(struct rte_eth_dev *dev)
 {
+       struct priv *priv = dev->data->dev_private;
        int ret;
 
        dev->data->promiscuous = 0;
-       if (((struct priv *)dev->data->dev_private)->config.vf)
+       if (priv->config.vf)
                mlx5_nl_promisc(dev, 0);
        ret = mlx5_traffic_restart(dev);
        if (ret)
-- 
2.11.0