patch 'eventdev/crypto: fix multi-process' has been queued to stable release 20.11.7

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 20.11.7

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

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

Thanks.

Luca Boccassi

---
>From e4e6cf9356e5af14fdd0e966ad1513ed609e4273 Mon Sep 17 00:00:00 2001
From: Ganapati Kundapura <ganapati.kundapura at intel.com>
Date: Tue, 18 Oct 2022 04:39:26 -0500
Subject: [PATCH] eventdev/crypto: fix multi-process

[ upstream commit 8f4ff7de39693dfd26336afea5e12e1a7d8fd9b0 ]

Secondary process is not able to call the crypto adapter
APIs stats get/reset as crypto adapter memzone memory
is not accessible by secondary process.

Added memzone lookup so that secondary process can call the
crypto adapter APIs(stats_get etc)

Fixes: 7901eac3409a ("eventdev: add crypto adapter implementation")

Signed-off-by: Ganapati Kundapura <ganapati.kundapura at intel.com>
Acked-by: Abhinandan Gujjar <abhinandan.gujjar at intel.com>
---
 .../rte_event_crypto_adapter.c                | 30 +++++++++++++++++--
 1 file changed, 27 insertions(+), 3 deletions(-)

diff --git a/lib/librte_eventdev/rte_event_crypto_adapter.c b/lib/librte_eventdev/rte_event_crypto_adapter.c
index ca58945a84..dc85c9d703 100644
--- a/lib/librte_eventdev/rte_event_crypto_adapter.c
+++ b/lib/librte_eventdev/rte_event_crypto_adapter.c
@@ -30,6 +30,8 @@
  */
 #define CRYPTO_ENQ_FLUSH_THRESHOLD 1024
 
+#define ECA_ADAPTER_ARRAY "crypto_adapter_array"
+
 struct rte_event_crypto_adapter {
 	/* Event device identifier */
 	uint8_t eventdev_id;
@@ -118,7 +120,6 @@ eca_valid_id(uint8_t id)
 static int
 eca_init(void)
 {
-	const char *name = "crypto_adapter_array";
 	const struct rte_memzone *mz;
 	unsigned int sz;
 
@@ -126,9 +127,10 @@ eca_init(void)
 	    RTE_EVENT_CRYPTO_ADAPTER_MAX_INSTANCE;
 	sz = RTE_ALIGN(sz, RTE_CACHE_LINE_SIZE);
 
-	mz = rte_memzone_lookup(name);
+	mz = rte_memzone_lookup(ECA_ADAPTER_ARRAY);
 	if (mz == NULL) {
-		mz = rte_memzone_reserve_aligned(name, sz, rte_socket_id(), 0,
+		mz = rte_memzone_reserve_aligned(ECA_ADAPTER_ARRAY, sz,
+						 rte_socket_id(), 0,
 						 RTE_CACHE_LINE_SIZE);
 		if (mz == NULL) {
 			RTE_EDEV_LOG_ERR("failed to reserve memzone err = %"
@@ -141,6 +143,22 @@ eca_init(void)
 	return 0;
 }
 
+static int
+eca_memzone_lookup(void)
+{
+	const struct rte_memzone *mz;
+
+	if (event_crypto_adapter == NULL) {
+		mz = rte_memzone_lookup(ECA_ADAPTER_ARRAY);
+		if (mz == NULL)
+			return -ENOMEM;
+
+		event_crypto_adapter = mz->addr;
+	}
+
+	return 0;
+}
+
 static inline struct rte_event_crypto_adapter *
 eca_id_to_adapter(uint8_t id)
 {
@@ -1047,6 +1065,9 @@ rte_event_crypto_adapter_stats_get(uint8_t id,
 	uint32_t i;
 	int ret;
 
+	if (eca_memzone_lookup())
+		return -ENOMEM;
+
 	EVENT_CRYPTO_ADAPTER_ID_VALID_OR_ERR_RET(id, -EINVAL);
 
 	adapter = eca_id_to_adapter(id);
@@ -1088,6 +1109,9 @@ rte_event_crypto_adapter_stats_reset(uint8_t id)
 	struct rte_eventdev *dev;
 	uint32_t i;
 
+	if (eca_memzone_lookup())
+		return -ENOMEM;
+
 	EVENT_CRYPTO_ADAPTER_ID_VALID_OR_ERR_RET(id, -EINVAL);
 
 	adapter = eca_id_to_adapter(id);
-- 
2.34.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-11-05 17:11:09.682033328 +0000
+++ 0011-eventdev-crypto-fix-multi-process.patch	2022-11-05 17:11:08.598941010 +0000
@@ -1 +1 @@
-From 8f4ff7de39693dfd26336afea5e12e1a7d8fd9b0 Mon Sep 17 00:00:00 2001
+From e4e6cf9356e5af14fdd0e966ad1513ed609e4273 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 8f4ff7de39693dfd26336afea5e12e1a7d8fd9b0 ]
+
@@ -14 +15,0 @@
-Cc: stable at dpdk.org
@@ -19 +20 @@
- lib/eventdev/rte_event_crypto_adapter.c | 30 ++++++++++++++++++++++---
+ .../rte_event_crypto_adapter.c                | 30 +++++++++++++++++--
@@ -22,5 +23,5 @@
-diff --git a/lib/eventdev/rte_event_crypto_adapter.c b/lib/eventdev/rte_event_crypto_adapter.c
-index 59777726f6..3c585d7b0d 100644
---- a/lib/eventdev/rte_event_crypto_adapter.c
-+++ b/lib/eventdev/rte_event_crypto_adapter.c
-@@ -33,6 +33,8 @@
+diff --git a/lib/librte_eventdev/rte_event_crypto_adapter.c b/lib/librte_eventdev/rte_event_crypto_adapter.c
+index ca58945a84..dc85c9d703 100644
+--- a/lib/librte_eventdev/rte_event_crypto_adapter.c
++++ b/lib/librte_eventdev/rte_event_crypto_adapter.c
+@@ -30,6 +30,8 @@
@@ -32,4 +33,4 @@
- struct crypto_ops_circular_buffer {
- 	/* index of head element in circular buffer */
- 	uint16_t head;
-@@ -138,7 +140,6 @@ eca_valid_id(uint8_t id)
+ struct rte_event_crypto_adapter {
+ 	/* Event device identifier */
+ 	uint8_t eventdev_id;
+@@ -118,7 +120,6 @@ eca_valid_id(uint8_t id)
@@ -43 +44 @@
-@@ -146,9 +147,10 @@ eca_init(void)
+@@ -126,9 +127,10 @@ eca_init(void)
@@ -56 +57 @@
-@@ -161,6 +163,22 @@ eca_init(void)
+@@ -141,6 +143,22 @@ eca_init(void)
@@ -76,2 +77,2 @@
- static inline bool
- eca_circular_buffer_batch_ready(struct crypto_ops_circular_buffer *bufp)
+ static inline struct rte_event_crypto_adapter *
+ eca_id_to_adapter(uint8_t id)
@@ -79 +80 @@
-@@ -1238,6 +1256,9 @@ rte_event_crypto_adapter_stats_get(uint8_t id,
+@@ -1047,6 +1065,9 @@ rte_event_crypto_adapter_stats_get(uint8_t id,
@@ -89 +90 @@
-@@ -1279,6 +1300,9 @@ rte_event_crypto_adapter_stats_reset(uint8_t id)
+@@ -1088,6 +1109,9 @@ rte_event_crypto_adapter_stats_reset(uint8_t id)