| Message ID | abfc08173c9f2b2173f3d92959ede22caecf5415.1610298137.git.dekelp@nvidia.com (mailing list archive) |
|---|---|
| State | Accepted, archived |
| Delegated to: | Raslan Darawsheh |
| Headers | show |
| Series | [v2] net/mlx5: fix flow check hairpin split | expand |
| Context | Check | Description |
|---|---|---|
| ci/iol-testing | success | Testing PASS |
| ci/Intel-compilation | success | Compilation OK |
| ci/iol-intel-Performance | success | Performance Testing PASS |
| ci/iol-intel-Functional | success | Functional Testing PASS |
| ci/iol-broadcom-Performance | success | Performance Testing PASS |
| ci/iol-broadcom-Functional | success | Functional Testing PASS |
| ci/iol-abi-testing | success | Testing PASS |
| ci/checkpatch | success | coding style OK |
10/01/2021 18:37, Dekel Peled: > Previously, the identification of hairpin queue was done using > mlx5_rxq_get_type() function. > Recent patch replaced it with use of mlx5_rxq_get_hairpin_conf(), > and check of the return value conf != NULL. > The case of return value is NULL (queue is not hairpin) was not handled. > As result, non-hairpin flows were wrongly handled. > This patch adds the required check for return value is NULL. > > Fixes: 509f8470de55 ("net/mlx5: do not split hairpin flow in explicit mode") > Cc: stable@dpdk.org > > Signed-off-by: Dekel Peled <dekelp@nvidia.com> > Acked-by: Matan Azrad <matan@nvidia.com> Applied in next-net-mlx, thanks.
diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c index 2a4073c126..37502067d4 100644 --- a/drivers/net/mlx5/mlx5_flow.c +++ b/drivers/net/mlx5/mlx5_flow.c @@ -3548,7 +3548,7 @@ flow_check_hairpin_split(struct rte_eth_dev *dev, if (queue == NULL) return 0; conf = mlx5_rxq_get_hairpin_conf(dev, queue->index); - if (conf != NULL && !!conf->tx_explicit) + if (conf == NULL || conf->tx_explicit != 0) return 0; queue_action = 1; action_n++; @@ -3558,7 +3558,7 @@ flow_check_hairpin_split(struct rte_eth_dev *dev, if (rss == NULL || rss->queue_num == 0) return 0; conf = mlx5_rxq_get_hairpin_conf(dev, rss->queue[0]); - if (conf != NULL && !!conf->tx_explicit) + if (conf == NULL || conf->tx_explicit != 0) return 0; queue_action = 1; action_n++;
Previously, the identification of hairpin queue was done using mlx5_rxq_get_type() function. Recent patch replaced it with use of mlx5_rxq_get_hairpin_conf(), and check of the return value conf != NULL. The case of return value is NULL (queue is not hairpin) was not handled. As result, non-hairpin flows were wrongly handled. This patch adds the required check for return value is NULL. Fixes: 509f8470de55 ("net/mlx5: do not split hairpin flow in explicit mode") Cc: stable@dpdk.org Signed-off-by: Dekel Peled <dekelp@nvidia.com> Acked-by: Matan Azrad <matan@nvidia.com> --- v2: update conditions according to coding standards. --- --- drivers/net/mlx5/mlx5_flow.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)