[dpdk-stable] patch 'net/mlx5: fix flow actions index in cache' has been queued to stable release 20.11.2

[Li Zhang]

Go it and Thanks Steven.

Regards,
Li Zhang

> -----Original Message-----
> From: Xueming(Steven) Li <xuemingl at nvidia.com>
> Sent: Tuesday, May 11, 2021 12:01 AM
> To: Li Zhang <lizh at nvidia.com>
> Cc: Luca Boccassi <bluca at debian.org>; Slava Ovsiienko
> <viacheslavo at nvidia.com>; dpdk stable <stable at dpdk.org>
> Subject: patch 'net/mlx5: fix flow actions index in cache' has been queued to
> stable release 20.11.2
> 
> Hi,
> 
> FYI, your patch has been queued to stable release 20.11.2
> 
> Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
> It will be pushed if I get no objections before 05/12/21. So please shout if
> anyone has objections.
> 
> Also note that after the patch there's a diff of the upstream commit vs the
> patch applied to the branch. This will indicate if there was any rebasing
> needed to apply to the stable branch. If there were code changes for rebasing
> (ie: not only metadata diffs), please double check that the rebase was correctly
> done.
> 
> Queued patches are on a temporary branch at:
> https://github.com/steevenlee/dpdk
> 
> This queued commit can be viewed at:
> https://github.com/steevenlee/dpdk/commit/229101313919b163516238b0d8
> 58dba9ff12a654
> 
> Thanks.
> 
> Xueming Li <xuemingl at nvidia.com>
> 
> ---
> From 229101313919b163516238b0d858dba9ff12a654 Mon Sep 17 00:00:00
> 2001
> From: Li Zhang <lizh at nvidia.com>
> Date: Tue, 16 Mar 2021 14:05:17 +0200
> Subject: [PATCH] net/mlx5: fix flow actions index in cache
> Cc: Luca Boccassi <bluca at debian.org>
> 
> [ upstream commit d406aba8f1e8568c1bf0b1aad1d5756cead5df21 ]
> 
> When using port id or push VLAN action index to find the action in cache, it
> will fail to find actions.
> The root cause is the index is not saved in cache when creating the port id
> action or push vlan action.
> To fix these issues, update the index in cache when creating.
> 
> Fixes: 0fd5f82aaa07 ("net/mlx5: make port ID action cache thread safe")
> Fixes: 3422af2af2e4 ("net/mlx5: make push VLAN action cache thread safe")
> 
> Signed-off-by: Li Zhang <lizh at nvidia.com>
> Acked-by: Viacheslav Ovsiienko <viacheslavo at nvidia.com>
> ---
>  drivers/net/mlx5/mlx5_flow_dv.c | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/drivers/net/mlx5/mlx5_flow_dv.c
> b/drivers/net/mlx5/mlx5_flow_dv.c index 353a8df24c..347c3a1c13 100644
> --- a/drivers/net/mlx5/mlx5_flow_dv.c
> +++ b/drivers/net/mlx5/mlx5_flow_dv.c
> @@ -3039,6 +3039,7 @@ flow_dv_port_id_create_cb(struct mlx5_cache_list
> *list,
>  				   "cannot create action");
>  		return NULL;
>  	}
> +	cache->idx = idx;
>  	return &cache->entry;
>  }
> 
> @@ -3130,6 +3131,7 @@ flow_dv_push_vlan_create_cb(struct
> mlx5_cache_list *list,
>  				   "cannot create push vlan action");
>  		return NULL;
>  	}
> +	cache->idx = idx;
>  	return &cache->entry;
>  }
> 
> --
> 2.25.1
> 
> ---
>   Diff of the applied patch vs upstream commit (please double-check if non-
> empty:
> ---
> --- -	2021-05-10 23:59:29.260567300 +0800
> +++ 0103-net-mlx5-fix-flow-actions-index-in-cache.patch	2021-05-10
> 23:59:26.480000000 +0800
> @@ -1 +1 @@
> -From d406aba8f1e8568c1bf0b1aad1d5756cead5df21 Mon Sep 17 00:00:00
> 2001
> +From 229101313919b163516238b0d858dba9ff12a654 Mon Sep 17 00:00:00
> 2001
> @@ -4,0 +5,3 @@
> +Cc: Luca Boccassi <bluca at debian.org>
> +
> +[ upstream commit d406aba8f1e8568c1bf0b1aad1d5756cead5df21 ]
> @@ -14 +16,0 @@
> -Cc: stable at dpdk.org
> @@ -23 +25 @@
> -index 1a74d5ac2b..23e5849783 100644
> +index 353a8df24c..347c3a1c13 100644
> @@ -26 +28 @@
> -@@ -3612,6 +3612,7 @@ flow_dv_port_id_create_cb(struct mlx5_cache_list
> *list,
> +@@ -3039,6 +3039,7 @@ flow_dv_port_id_create_cb(struct mlx5_cache_list
> +*list,
> @@ -34 +36 @@
> -@@ -3703,6 +3704,7 @@ flow_dv_push_vlan_create_cb(struct
> mlx5_cache_list *list,
> +@@ -3130,6 +3131,7 @@ flow_dv_push_vlan_create_cb(struct
> +mlx5_cache_list *list,