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

Kevin Traynor ktraynor at redhat.com
Fri Jun 5 20:24:14 CEST 2020


Hi,

FYI, your patch has been queued to LTS release 18.11.9

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

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/9b46674b69e29d26d5d23943abbf65a1a270de25

Thanks.

Kevin.

---
>From 9b46674b69e29d26d5d23943abbf65a1a270de25 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         | 15 +++++++++------
 lib/librte_eventdev/rte_eventdev_pmd_pci.h |  8 +++++---
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/lib/librte_eventdev/rte_eventdev.c b/lib/librte_eventdev/rte_eventdev.c
index 6396a96490..a2db0fd5fb 100644
--- a/lib/librte_eventdev/rte_eventdev.c
+++ b/lib/librte_eventdev/rte_eventdev.c
@@ -14,4 +14,5 @@
 #include <sys/queue.h>
 
+#include <rte_string_fns.h>
 #include <rte_byteorder.h>
 #include <rte_log.h>
@@ -1363,13 +1364,15 @@ rte_event_pmd_allocate(const char *name, int socket_id)
 		eventdev->data = eventdev_data;
 
-		snprintf(eventdev->data->name, RTE_EVENTDEV_NAME_MAX_LEN,
-				"%s", name);
+		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
@@ -113,7 +113,9 @@ rte_event_pmd_pci_remove(struct rte_pci_device *pci_dev,
 		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 */
-- 
2.21.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-06-05 19:20:51.865081148 +0100
+++ 0017-eventdev-fix-probe-and-remove-for-secondary-process.patch	2020-06-05 19:20:50.737042472 +0100
@@ -1 +1 @@
-From a5f30c925b88bb3613535fb27eb3459d19226cd0 Mon Sep 17 00:00:00 2001
+From 9b46674b69e29d26d5d23943abbf65a1a270de25 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit a5f30c925b88bb3613535fb27eb3459d19226cd0 ]
+
@@ -13 +14,0 @@
-Cc: stable at dpdk.org
@@ -18 +19 @@
- lib/librte_eventdev/rte_eventdev.c         | 13 ++++++++-----
+ lib/librte_eventdev/rte_eventdev.c         | 15 +++++++++------
@@ -20 +21 @@
- 2 files changed, 13 insertions(+), 8 deletions(-)
+ 2 files changed, 14 insertions(+), 9 deletions(-)
@@ -23 +24 @@
-index e72d8b941c..82c177c734 100644
+index 6396a96490..a2db0fd5fb 100644
@@ -26 +27,7 @@
-@@ -1374,12 +1374,15 @@ rte_event_pmd_allocate(const char *name, int socket_id)
+@@ -14,4 +14,5 @@
+ #include <sys/queue.h>
+ 
++#include <rte_string_fns.h>
+ #include <rte_byteorder.h>
+ #include <rte_log.h>
+@@ -1363,13 +1364,15 @@ rte_event_pmd_allocate(const char *name, int socket_id)
@@ -29 +36,2 @@
--		strlcpy(eventdev->data->name, name, RTE_EVENTDEV_NAME_MAX_LEN);
+-		snprintf(eventdev->data->name, RTE_EVENTDEV_NAME_MAX_LEN,
+-				"%s", name);



More information about the stable mailing list