[dpdk-stable] patch 'crypto/dpaa2_sec: fix stats query without queue pair' 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 459f36b9a03db55d3b56b8857b030ae80d6a626f Mon Sep 17 00:00:00 2001
From: Hemant Agrawal <hemant.agrawal at nxp.com>
Date: Thu, 3 Sep 2020 22:47:44 +0530
Subject: [PATCH] crypto/dpaa2_sec: fix stats query without queue pair

[ upstream commit 356bcac8f11ef916f47be74b295c36755d8165cf ]

dpdk-procinfo calls the crypto stats API, which results segmentation
fault on DPAA2_SEC.
The queue pair array will be NULL, when it is used without
configuring the SEC device.

Fixes: 02f35eee264b ("crypto/dpaa2_sec: support statistics")

Signed-off-by: Hemant Agrawal <hemant.agrawal at nxp.com>
Acked-by: Akhil Goyal <akhil.goyal at nxp.com>
---
 drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c b/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c
index 0cc98b3c2b..60e9bf702b 100644
--- a/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c
+++ b/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c
@@ -3492,7 +3492,7 @@ void dpaa2_sec_stats_get(struct rte_cryptodev *dev,
 		return;
 	}
 	for (i = 0; i < dev->data->nb_queue_pairs; i++) {
-		if (qp[i] == NULL) {
+		if (qp == NULL || qp[i] == NULL) {
 			DPAA2_SEC_DEBUG("Uninitialised queue pair");
 			continue;
 		}
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-10-28 10:35:16.456856146 +0000
+++ 0152-crypto-dpaa2_sec-fix-stats-query-without-queue-pair.patch	2020-10-28 10:35:11.748833616 +0000
@@ -1,15 +1,16 @@
-From 356bcac8f11ef916f47be74b295c36755d8165cf Mon Sep 17 00:00:00 2001
+From 459f36b9a03db55d3b56b8857b030ae80d6a626f Mon Sep 17 00:00:00 2001
 From: Hemant Agrawal <hemant.agrawal at nxp.com>
 Date: Thu, 3 Sep 2020 22:47:44 +0530
 Subject: [PATCH] crypto/dpaa2_sec: fix stats query without queue pair
 
+[ upstream commit 356bcac8f11ef916f47be74b295c36755d8165cf ]
+
 dpdk-procinfo calls the crypto stats API, which results segmentation
 fault on DPAA2_SEC.
 The queue pair array will be NULL, when it is used without
 configuring the SEC device.
 
 Fixes: 02f35eee264b ("crypto/dpaa2_sec: support statistics")
-Cc: stable at dpdk.org
 
 Signed-off-by: Hemant Agrawal <hemant.agrawal at nxp.com>
 Acked-by: Akhil Goyal <akhil.goyal at nxp.com>
@@ -18,10 +19,10 @@
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c b/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c
-index 109e61ae16..f480aafd01 100644
+index 0cc98b3c2b..60e9bf702b 100644
 --- a/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c
 +++ b/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c
-@@ -3501,7 +3501,7 @@ void dpaa2_sec_stats_get(struct rte_cryptodev *dev,
+@@ -3492,7 +3492,7 @@ void dpaa2_sec_stats_get(struct rte_cryptodev *dev,
  		return;
  	}
  	for (i = 0; i < dev->data->nb_queue_pairs; i++) {