[dpdk-stable] patch 'net/mlx5: fix freeing packet pacing' has been queued to stable release 20.11.1

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 20.11.1

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 02/07/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/bluca/dpdk-stable

This queued commit can be viewed at:
https://github.com/bluca/dpdk-stable/commit/c9de97e2e9339f7e6220823b716ee09040944229

Thanks.

Luca Boccassi

---
>From c9de97e2e9339f7e6220823b716ee09040944229 Mon Sep 17 00:00:00 2001
From: Ophir Munk <ophirmu at nvidia.com>
Date: Mon, 28 Dec 2020 11:54:08 +0200
Subject: [PATCH] net/mlx5: fix freeing packet pacing

[ upstream commit b492e28882f7009421d133126aa7524c02339ba3 ]

Packet pacing is allocated under condition #ifdef HAVE_MLX5DV_PP_ALLOC.
In a similar way - free packet pacing index under the same condition.
This update is required to successfully compile under operating systems
which do not support packet pacing.

Fixes: aef1e20ebeb2 ("net/mlx5: allocate packet pacing context")

Signed-off-by: Ophir Munk <ophirmu at nvidia.com>
Acked-by: Matan Azrad <matan at nvidia.com>
---
 drivers/net/mlx5/mlx5_txpp.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/drivers/net/mlx5/mlx5_txpp.c b/drivers/net/mlx5/mlx5_txpp.c
index 2438bf1f1d..21675ab17a 100644
--- a/drivers/net/mlx5/mlx5_txpp.c
+++ b/drivers/net/mlx5/mlx5_txpp.c
@@ -57,11 +57,16 @@ mlx5_txpp_create_event_channel(struct mlx5_dev_ctx_shared *sh)
 static void
 mlx5_txpp_free_pp_index(struct mlx5_dev_ctx_shared *sh)
 {
+#ifdef HAVE_MLX5DV_PP_ALLOC
 	if (sh->txpp.pp) {
 		mlx5_glue->dv_free_pp(sh->txpp.pp);
 		sh->txpp.pp = NULL;
 		sh->txpp.pp_id = 0;
 	}
+#else
+	RTE_SET_USED(sh);
+	DRV_LOG(ERR, "Freeing pacing index is not supported.");
+#endif
 }
 
 /* Allocate Packet Pacing index from kernel via mlx5dv call. */
-- 
2.29.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2021-02-05 11:18:32.716437556 +0000
+++ 0077-net-mlx5-fix-freeing-packet-pacing.patch	2021-02-05 11:18:28.866692254 +0000
@@ -1 +1 @@
-From b492e28882f7009421d133126aa7524c02339ba3 Mon Sep 17 00:00:00 2001
+From c9de97e2e9339f7e6220823b716ee09040944229 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit b492e28882f7009421d133126aa7524c02339ba3 ]
+
@@ -12 +13,0 @@
-Cc: stable at dpdk.org