[dpdk-stable] patch 'eventdev: fix probe and remove for secondary process' has been queued to stable release 19.11.3

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.11.3

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 05/21/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 85c1aae896b33b12ff65b26e45bdcb8471e2ee02 Mon Sep 17 00:00:00 2001
From: Pavan Nikhilesh <pbhagavatula at marvell.com>
Date: Mon, 27 Apr 2020 23:40:38 +0530
Subject: [PATCH] eventdev: fix probe and remove for secondary process

[ upstream commit a5f30c925b88bb3613535fb27eb3459d19226cd0 ]

When probing event device in secondary process skip reinitializing
the device data structure as it is already done in primary process.

When removing event device in secondary process skip closing the
event device as it should be done by primary process.

Fixes: 322d0345c2bc ("eventdev: implement PMD registration functions")

Signed-off-by: Pavan Nikhilesh <pbhagavatula at marvell.com>
Acked-by: Jerin Jacob <jerinj at marvell.com>
---
 lib/librte_eventdev/rte_eventdev.c         | 13 ++++++++-----
 lib/librte_eventdev/rte_eventdev_pmd_pci.h |  8 +++++---
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/lib/librte_eventdev/rte_eventdev.c b/lib/librte_eventdev/rte_eventdev.c
index b987e07454..9aca7fbd52 100644
--- a/lib/librte_eventdev/rte_eventdev.c
+++ b/lib/librte_eventdev/rte_eventdev.c
@@ -1364,14 +1364,17 @@ rte_event_pmd_allocate(const char *name, int socket_id)
 
 		eventdev->data = eventdev_data;
 
-		strlcpy(eventdev->data->name, name, RTE_EVENTDEV_NAME_MAX_LEN);
+		if (rte_eal_process_type() == RTE_PROC_PRIMARY) {
 
-		eventdev->data->dev_id = dev_id;
-		eventdev->data->socket_id = socket_id;
-		eventdev->data->dev_started = 0;
+			strlcpy(eventdev->data->name, name,
+				RTE_EVENTDEV_NAME_MAX_LEN);
+
+			eventdev->data->dev_id = dev_id;
+			eventdev->data->socket_id = socket_id;
+			eventdev->data->dev_started = 0;
+		}
 
 		eventdev->attached = RTE_EVENTDEV_ATTACHED;
-
 		eventdev_globals.nb_devs++;
 	}
 
diff --git a/lib/librte_eventdev/rte_eventdev_pmd_pci.h b/lib/librte_eventdev/rte_eventdev_pmd_pci.h
index 8fb61386fd..443cd38c23 100644
--- a/lib/librte_eventdev/rte_eventdev_pmd_pci.h
+++ b/lib/librte_eventdev/rte_eventdev_pmd_pci.h
@@ -112,9 +112,11 @@ rte_event_pmd_pci_remove(struct rte_pci_device *pci_dev,
 	if (eventdev == NULL)
 		return -ENODEV;
 
-	ret = rte_event_dev_close(eventdev->data->dev_id);
-	if (ret < 0)
-		return ret;
+	if (rte_eal_process_type() == RTE_PROC_PRIMARY) {
+		ret = rte_event_dev_close(eventdev->data->dev_id);
+		if (ret < 0)
+			return ret;
+	}
 
 	/* Invoke PMD device un-init function */
 	if (devuninit)
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-05-19 14:04:50.922122047 +0100
+++ 0158-eventdev-fix-probe-and-remove-for-secondary-process.patch	2020-05-19 14:04:44.496653448 +0100
@@ -1,8 +1,10 @@
-From a5f30c925b88bb3613535fb27eb3459d19226cd0 Mon Sep 17 00:00:00 2001
+From 85c1aae896b33b12ff65b26e45bdcb8471e2ee02 Mon Sep 17 00:00:00 2001
 From: Pavan Nikhilesh <pbhagavatula at marvell.com>
 Date: Mon, 27 Apr 2020 23:40:38 +0530
 Subject: [PATCH] eventdev: fix probe and remove for secondary process
 
+[ upstream commit a5f30c925b88bb3613535fb27eb3459d19226cd0 ]
+
 When probing event device in secondary process skip reinitializing
 the device data structure as it is already done in primary process.
 
@@ -10,7 +12,6 @@
 event device as it should be done by primary process.
 
 Fixes: 322d0345c2bc ("eventdev: implement PMD registration functions")
-Cc: stable at dpdk.org
 
 Signed-off-by: Pavan Nikhilesh <pbhagavatula at marvell.com>
 Acked-by: Jerin Jacob <jerinj at marvell.com>
@@ -20,10 +21,10 @@
  2 files changed, 13 insertions(+), 8 deletions(-)
 
 diff --git a/lib/librte_eventdev/rte_eventdev.c b/lib/librte_eventdev/rte_eventdev.c
-index e72d8b941c..82c177c734 100644
+index b987e07454..9aca7fbd52 100644
 --- a/lib/librte_eventdev/rte_eventdev.c
 +++ b/lib/librte_eventdev/rte_eventdev.c
-@@ -1373,14 +1373,17 @@ rte_event_pmd_allocate(const char *name, int socket_id)
+@@ -1364,14 +1364,17 @@ rte_event_pmd_allocate(const char *name, int socket_id)
  
  		eventdev->data = eventdev_data;