net/mlx5: fix sample and mirror flow action deletion

The sample and mirror action objects are maintained on the list
shared between the ports belonging to the same multiport Infiniband
device(between representors).

The actions in the NIC steering domains might contain the references
to the sub-flow action objects created over the given port. The action
deletion might happen in the context of the different port and on the
deletion of referenced objects the incorrect port might be specified.
To avoid this we should save the port on what the sub-flow actions
were created and then use this saved port for sub-flow action release.

This commit saves the create device in the sample and mirror actions
struct to avoid using the incorrect port device in releasing.

Fixes: 19784141692e ("net/mlx5: make sample and mirror action thread safe")
Signed-off-by: Suanming Mou <suanmingm@nvidia.com>
Reviewed-by: Jiawei Wang <jiaweiw@nvidia.com>
Acked-by: Viacheslav Ovsiienko <viacheslavo@nvidia.com>

diff --git a/drivers/net/mlx5/linux/mlx5_os.c b/drivers/net/mlx5/linux/mlx5_os.c
index 4b7fff4eff5badeb2409d25d510e0f35c2125e4c..00f793bc57c9664d07cfb13c9a71c3c5b092fff9 100644 (file)
--- a/drivers/net/mlx5/linux/mlx5_os.c
+++ b/drivers/net/mlx5/linux/mlx5_os.c
@@ -250,15 +250,13 @@ mlx5_alloc_shared_dr(struct mlx5_priv *priv)
                             flow_dv_push_vlan_remove_cb);
        /* Init sample action cache list. */
        snprintf(s, sizeof(s), "%s_sample_action_cache", sh->ibdev_name);
-       mlx5_cache_list_init(&sh->sample_action_list, s, 0,
-                            &rte_eth_devices[priv->dev_data->port_id],
+       mlx5_cache_list_init(&sh->sample_action_list, s, 0, sh,
                             flow_dv_sample_create_cb,
                             flow_dv_sample_match_cb,
                             flow_dv_sample_remove_cb);
        /* Init dest array action cache list. */
        snprintf(s, sizeof(s), "%s_dest_array_cache", sh->ibdev_name);
-       mlx5_cache_list_init(&sh->dest_array_list, s, 0,
-                            &rte_eth_devices[priv->dev_data->port_id],
+       mlx5_cache_list_init(&sh->dest_array_list, s, 0, sh,
                             flow_dv_dest_array_create_cb,
                             flow_dv_dest_array_match_cb,
                             flow_dv_dest_array_remove_cb);

diff --git a/drivers/net/mlx5/mlx5_flow.h b/drivers/net/mlx5/mlx5_flow.h
index bccb973f6195802bee8a475a79b66dd200eb0986..70fa028afbf6e3cc196f07e66c124d644385899c 100644 (file)
--- a/drivers/net/mlx5/mlx5_flow.h
+++ b/drivers/net/mlx5/mlx5_flow.h
@@ -563,6 +563,7 @@ struct mlx5_flow_dv_sample_resource {
                void *verbs_action; /**< Verbs sample action object. */
                void **sub_actions; /**< Sample sub-action array. */
        };
+       struct rte_eth_dev *dev; /**< Device registers the action. */
        uint32_t idx; /** Sample object index. */
        uint8_t ft_type; /** Flow Table Type */
        uint32_t ft_id; /** Flow Table Level */
@@ -584,6 +585,7 @@ struct mlx5_flow_dv_dest_array_resource {
        uint32_t idx; /** Destination array action object index. */
        uint8_t ft_type; /** Flow Table Type */
        uint8_t num_of_dest; /**< Number of destination actions. */
+       struct rte_eth_dev *dev; /**< Device registers the action. */
        void *action; /**< Pointer to the rdma core action. */
        struct mlx5_flow_sub_actions_idx sample_idx[MLX5_MAX_DEST_NUM];
        /**< Action index resources. */

diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c
index 1f0a2ab95f515aaffad7e3ba5dd93ba98fd2b726..ee3a172846427bab9b76acead70b00586a56185d 100644 (file)
--- a/drivers/net/mlx5/mlx5_flow_dv.c
+++ b/drivers/net/mlx5/mlx5_flow_dv.c
@@ -8757,6 +8757,7 @@ flow_dv_sample_create_cb(struct mlx5_cache_list *list __rte_unused,
                goto error;
        }
        cache_resource->idx = idx;
+       cache_resource->dev = dev;
        return &cache_resource->entry;
 error:
        if (cache_resource->ft_type == MLX5DV_FLOW_TABLE_TYPE_FDB &&
@@ -8919,6 +8920,7 @@ flow_dv_dest_array_create_cb(struct mlx5_cache_list *list __rte_unused,
                goto error;
        }
        cache_resource->idx = res_idx;
+       cache_resource->dev = dev;
        for (idx = 0; idx < resource->num_of_dest; idx++)
                mlx5_free(dest_attr[idx]);
        return &cache_resource->entry;
@@ -11045,13 +11047,13 @@ flow_dv_fate_resource_release(struct rte_eth_dev *dev,
 }
 
 void
-flow_dv_sample_remove_cb(struct mlx5_cache_list *list,
+flow_dv_sample_remove_cb(struct mlx5_cache_list *list __rte_unused,
                         struct mlx5_cache_entry *entry)
 {
-       struct rte_eth_dev *dev = list->ctx;
-       struct mlx5_priv *priv = dev->data->dev_private;
        struct mlx5_flow_dv_sample_resource *cache_resource =
                        container_of(entry, typeof(*cache_resource), entry);
+       struct rte_eth_dev *dev = cache_resource->dev;
+       struct mlx5_priv *priv = dev->data->dev_private;
 
        if (cache_resource->verbs_action)
                claim_zero(mlx5_glue->destroy_flow_action
@@ -11100,13 +11102,13 @@ flow_dv_sample_resource_release(struct rte_eth_dev *dev,
 }
 
 void
-flow_dv_dest_array_remove_cb(struct mlx5_cache_list *list,
+flow_dv_dest_array_remove_cb(struct mlx5_cache_list *list __rte_unused,
                             struct mlx5_cache_entry *entry)
 {
-       struct rte_eth_dev *dev = list->ctx;
-       struct mlx5_priv *priv = dev->data->dev_private;
        struct mlx5_flow_dv_dest_array_resource *cache_resource =
                        container_of(entry, typeof(*cache_resource), entry);
+       struct rte_eth_dev *dev = cache_resource->dev;
+       struct mlx5_priv *priv = dev->data->dev_private;
        uint32_t i = 0;
 
        MLX5_ASSERT(cache_resource->action);