[dpdk-stable] patch 'cryptodev: fix checks related to device id' has been queued to LTS release 18.11.6

[Kevin Traynor <ktraynor@redhat.com>]

Hi,

FYI, your patch has been queued to LTS release 18.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 12/10/19. 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/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/8db57afd7ab9a3c12d73f1f5461415690b8c173c

Thanks.

Kevin.

---
From 8db57afd7ab9a3c12d73f1f5461415690b8c173c Mon Sep 17 00:00:00 2001
From: Julien Meunier <julien.meunier@nokia.com>
Date: Wed, 16 Oct 2019 13:21:11 +0300
Subject: [PATCH] cryptodev: fix checks related to device id

[ upstream commit 3dd4435cf473f5d10b99282098821fb40b72380f ]

Each cryptodev are indexed with dev_id in the global rte_crypto_devices
variable. nb_devs is incremented / decremented each time a cryptodev is
created / deleted. The goal of nb_devs was to prevent the user to get an
invalid dev_id.

Let's imagine DPDK has configured N cryptodevs. If the cryptodev=1 is
removed at runtime, the latest cryptodev N cannot be accessible, because
nb_devs=N-1 with the current implementaion.

In order to prevent this kind of behavior, let's remove the check with
nb_devs and iterate in all the rte_crypto_devices elements: if data is
not NULL, that means a valid cryptodev is available.

Also, remove max_devs field and use RTE_CRYPTO_MAX_DEVS in order to
unify the code.

Fixes: d11b0f30df88 ("cryptodev: introduce API and framework for crypto devices")

Signed-off-by: Julien Meunier <julien.meunier@nokia.com>
Acked-by: Akhil Goyal <akhil.goyal@nxp.com>
---
 lib/librte_cryptodev/rte_cryptodev.c     | 30 +++++++++++++++++-------
 lib/librte_cryptodev/rte_cryptodev_pmd.h |  1 -
 2 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/lib/librte_cryptodev/rte_cryptodev.c b/lib/librte_cryptodev/rte_cryptodev.c
index 9c35e6d9c..f7566fc30 100644
--- a/lib/librte_cryptodev/rte_cryptodev.c
+++ b/lib/librte_cryptodev/rte_cryptodev.c
@@ -51,6 +51,5 @@ static struct rte_cryptodev_global cryptodev_globals = {
 		.devs			= rte_crypto_devices,
 		.data			= { NULL },
-		.nb_devs		= 0,
-		.max_devs		= RTE_CRYPTO_MAX_DEVS
+		.nb_devs		= 0
 };
 
@@ -497,5 +496,5 @@ rte_cryptodev_pmd_get_named_dev(const char *name)
 		return NULL;
 
-	for (i = 0; i < cryptodev_globals.max_devs; i++) {
+	for (i = 0; i < RTE_CRYPTO_MAX_DEVS; i++) {
 		dev = &cryptodev_globals.devs[i];
 
@@ -508,4 +507,13 @@ rte_cryptodev_pmd_get_named_dev(const char *name)
 }
 
+static inline uint8_t
+rte_cryptodev_is_valid_device_data(uint8_t dev_id)
+{
+	if (rte_crypto_devices[dev_id].data == NULL)
+		return 0;
+
+	return 1;
+}
+
 unsigned int
 rte_cryptodev_pmd_is_valid_dev(uint8_t dev_id)
@@ -513,5 +521,5 @@ rte_cryptodev_pmd_is_valid_dev(uint8_t dev_id)
 	struct rte_cryptodev *dev = NULL;
 
-	if (dev_id >= cryptodev_globals.nb_devs)
+	if (!rte_cryptodev_is_valid_device_data(dev_id))
 		return 0;
 
@@ -532,5 +540,7 @@ rte_cryptodev_get_dev_id(const char *name)
 		return -1;
 
-	for (i = 0; i < cryptodev_globals.nb_devs; i++)
+	for (i = 0; i < RTE_CRYPTO_MAX_DEVS; i++) {
+		if (!rte_cryptodev_is_valid_device_data(i))
+			continue;
 		if ((strcmp(cryptodev_globals.devs[i].data->name, name)
 				== 0) &&
@@ -538,4 +548,5 @@ rte_cryptodev_get_dev_id(const char *name)
 						RTE_CRYPTODEV_ATTACHED))
 			return i;
+	}
 
 	return -1;
@@ -553,5 +564,5 @@ rte_cryptodev_device_count_by_driver(uint8_t driver_id)
 	uint8_t i, dev_count = 0;
 
-	for (i = 0; i < cryptodev_globals.max_devs; i++)
+	for (i = 0; i < RTE_CRYPTO_MAX_DEVS; i++)
 		if (cryptodev_globals.devs[i].driver_id == driver_id &&
 			cryptodev_globals.devs[i].attached ==
@@ -568,7 +579,8 @@ rte_cryptodev_devices_get(const char *driver_name, uint8_t *devices,
 	uint8_t i, count = 0;
 	struct rte_cryptodev *devs = cryptodev_globals.devs;
-	uint8_t max_devs = cryptodev_globals.max_devs;
 
-	for (i = 0; i < max_devs && count < nb_devices;	i++) {
+	for (i = 0; i < RTE_CRYPTO_MAX_DEVS && count < nb_devices; i++) {
+		if (!rte_cryptodev_is_valid_device_data(i))
+			continue;
 
 		if (devs[i].attached == RTE_CRYPTODEV_ATTACHED) {
@@ -1019,5 +1031,5 @@ rte_cryptodev_info_get(uint8_t dev_id, struct rte_cryptodev_info *dev_info)
 	struct rte_cryptodev *dev;
 
-	if (dev_id >= cryptodev_globals.nb_devs) {
+	if (!rte_cryptodev_pmd_is_valid_dev(dev_id)) {
 		CDEV_LOG_ERR("Invalid dev_id=%d", dev_id);
 		return;
diff --git a/lib/librte_cryptodev/rte_cryptodev_pmd.h b/lib/librte_cryptodev/rte_cryptodev_pmd.h
index 1b6cafd17..529791226 100644
--- a/lib/librte_cryptodev/rte_cryptodev_pmd.h
+++ b/lib/librte_cryptodev/rte_cryptodev_pmd.h
@@ -62,5 +62,4 @@ struct rte_cryptodev_global {
 	/**< Device private data */
 	uint8_t nb_devs;		/**< Number of devices found */
-	uint8_t max_devs;		/**< Max number of devices */
 };
 
-- 
2.21.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-12-03 17:29:54.548620095 +0000
+++ 0048-cryptodev-fix-checks-related-to-device-id.patch	2019-12-03 17:29:51.773749474 +0000
@@ -1 +1 @@
-From 3dd4435cf473f5d10b99282098821fb40b72380f Mon Sep 17 00:00:00 2001
+From 8db57afd7ab9a3c12d73f1f5461415690b8c173c Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 3dd4435cf473f5d10b99282098821fb40b72380f ]
+
@@ -23 +24,0 @@
-Cc: stable@dpdk.org
@@ -33 +34 @@
-index b16ef7b2c..89aa2ed3e 100644
+index 9c35e6d9c..f7566fc30 100644
@@ -44 +45 @@
-@@ -513,5 +512,5 @@ rte_cryptodev_pmd_get_named_dev(const char *name)
+@@ -497,5 +496,5 @@ rte_cryptodev_pmd_get_named_dev(const char *name)
@@ -51 +52 @@
-@@ -524,4 +523,13 @@ rte_cryptodev_pmd_get_named_dev(const char *name)
+@@ -508,4 +507,13 @@ rte_cryptodev_pmd_get_named_dev(const char *name)
@@ -65 +66 @@
-@@ -529,5 +537,5 @@ rte_cryptodev_pmd_is_valid_dev(uint8_t dev_id)
+@@ -513,5 +521,5 @@ rte_cryptodev_pmd_is_valid_dev(uint8_t dev_id)
@@ -72 +73 @@
-@@ -548,5 +556,7 @@ rte_cryptodev_get_dev_id(const char *name)
+@@ -532,5 +540,7 @@ rte_cryptodev_get_dev_id(const char *name)
@@ -81 +82 @@
-@@ -554,4 +564,5 @@ rte_cryptodev_get_dev_id(const char *name)
+@@ -538,4 +548,5 @@ rte_cryptodev_get_dev_id(const char *name)
@@ -87 +88 @@
-@@ -569,5 +580,5 @@ rte_cryptodev_device_count_by_driver(uint8_t driver_id)
+@@ -553,5 +564,5 @@ rte_cryptodev_device_count_by_driver(uint8_t driver_id)
@@ -94 +95 @@
-@@ -584,7 +595,8 @@ rte_cryptodev_devices_get(const char *driver_name, uint8_t *devices,
+@@ -568,7 +579,8 @@ rte_cryptodev_devices_get(const char *driver_name, uint8_t *devices,
@@ -105 +106 @@
-@@ -1102,5 +1114,5 @@ rte_cryptodev_info_get(uint8_t dev_id, struct rte_cryptodev_info *dev_info)
+@@ -1019,5 +1031,5 @@ rte_cryptodev_info_get(uint8_t dev_id, struct rte_cryptodev_info *dev_info)
@@ -113 +114 @@
-index defe05ea0..fba14f2fa 100644
+index 1b6cafd17..529791226 100644