[dpdk-stable] patch 'net/ena/base: fix release of wait event' has been queued to stable release 19.11.6

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.11.6

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

Thanks.

Luca Boccassi

---
>From 8b077cd951f41ec92402de0ca33a3d4ffcd45761 Mon Sep 17 00:00:00 2001
From: Michal Krawczyk <mk at semihalf.com>
Date: Thu, 17 Sep 2020 07:30:20 +0200
Subject: [PATCH] net/ena/base: fix release of wait event

[ upstream commit f034d4bb973a23e6dd2af8acdc3829b013962e47 ]

The wait event is being accessed without making sure it the completion
context exists. The check for that is just below, so it could be used
for releasing wait even safely.

Fixes: 3adcba9a8987 ("net/ena: update HAL to the newer version")

Signed-off-by: Michal Krawczyk <mk at semihalf.com>
Reviewed-by: Igor Chauskin <igorch at amazon.com>
Reviewed-by: Guy Tzalik <gtzalik at amazon.com>
Reviewed-by: Stephen Hemminger <stephen at networkplumber.org>
---
 drivers/net/ena/base/ena_com.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/net/ena/base/ena_com.c b/drivers/net/ena/base/ena_com.c
index 147c039124..592909c1be 100644
--- a/drivers/net/ena/base/ena_com.c
+++ b/drivers/net/ena/base/ena_com.c
@@ -1634,9 +1634,11 @@ void ena_com_admin_destroy(struct ena_com_dev *ena_dev)
 	struct ena_com_aenq *aenq = &ena_dev->aenq;
 	u16 size;
 
-	ENA_WAIT_EVENT_DESTROY(admin_queue->comp_ctx->wait_event);
-	if (admin_queue->comp_ctx)
+	if (admin_queue->comp_ctx) {
+		ENA_WAIT_EVENT_DESTROY(admin_queue->comp_ctx->wait_event);
 		ENA_MEM_FREE(ena_dev->dmadev, admin_queue->comp_ctx);
+	}
+
 	admin_queue->comp_ctx = NULL;
 	size = ADMIN_SQ_SIZE(admin_queue->q_depth);
 	if (sq->entries)
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-10-28 10:35:13.845732197 +0000
+++ 0067-net-ena-base-fix-release-of-wait-event.patch	2020-10-28 10:35:11.536830495 +0000
@@ -1,14 +1,15 @@
-From f034d4bb973a23e6dd2af8acdc3829b013962e47 Mon Sep 17 00:00:00 2001
+From 8b077cd951f41ec92402de0ca33a3d4ffcd45761 Mon Sep 17 00:00:00 2001
 From: Michal Krawczyk <mk at semihalf.com>
 Date: Thu, 17 Sep 2020 07:30:20 +0200
 Subject: [PATCH] net/ena/base: fix release of wait event
 
+[ upstream commit f034d4bb973a23e6dd2af8acdc3829b013962e47 ]
+
 The wait event is being accessed without making sure it the completion
 context exists. The check for that is just below, so it could be used
 for releasing wait even safely.
 
 Fixes: 3adcba9a8987 ("net/ena: update HAL to the newer version")
-Cc: stable at dpdk.org
 
 Signed-off-by: Michal Krawczyk <mk at semihalf.com>
 Reviewed-by: Igor Chauskin <igorch at amazon.com>
@@ -19,10 +20,10 @@
  1 file changed, 4 insertions(+), 2 deletions(-)
 
 diff --git a/drivers/net/ena/base/ena_com.c b/drivers/net/ena/base/ena_com.c
-index b4e54318c6..ce239ab164 100644
+index 147c039124..592909c1be 100644
 --- a/drivers/net/ena/base/ena_com.c
 +++ b/drivers/net/ena/base/ena_com.c
-@@ -1655,11 +1655,13 @@ void ena_com_admin_destroy(struct ena_com_dev *ena_dev)
+@@ -1634,9 +1634,11 @@ void ena_com_admin_destroy(struct ena_com_dev *ena_dev)
  	struct ena_com_aenq *aenq = &ena_dev->aenq;
  	u16 size;
  
@@ -30,9 +31,7 @@
 -	if (admin_queue->comp_ctx)
 +	if (admin_queue->comp_ctx) {
 +		ENA_WAIT_EVENT_DESTROY(admin_queue->comp_ctx->wait_event);
- 		ENA_MEM_FREE(ena_dev->dmadev,
- 			     admin_queue->comp_ctx,
- 			     (admin_queue->q_depth * sizeof(struct ena_comp_ctx)));
+ 		ENA_MEM_FREE(ena_dev->dmadev, admin_queue->comp_ctx);
 +	}
 +
  	admin_queue->comp_ctx = NULL;