[dpdk-stable] patch 'eal: hide internal hotplug function' has been queued to LTS release 18.11.3

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.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 08/28/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/d2d1dbb6f51aadad579a3f0fac8d1589ca99f67a

Thanks.

Kevin Traynor

---
>From d2d1dbb6f51aadad579a3f0fac8d1589ca99f67a Mon Sep 17 00:00:00 2001
From: David Marchand <david.marchand at redhat.com>
Date: Sat, 29 Jun 2019 13:58:44 +0200
Subject: [PATCH] eal: hide internal hotplug function

[ upstream commit f319d9937977479528870c6859bd3a227c212f75 ]

This API was experimental and not properly marked in the map file.
But looking more closely, this is just an internal wrapper for EAL init.
Hide it in the hotplug code.

Fixes: 244d5130719c ("eal: enable hotplug on multi-process")

Signed-off-by: David Marchand <david.marchand at redhat.com>
Acked-by: Adrien Mazarguil <adrien.mazarguil at 6wind.com>
Acked-by: Stephen Hemminger <stephen at networkplumber.org>
Acked-by: Neil Horman <nhorman at tuxdriver.com>
---
 lib/librte_eal/common/hotplug_mp.c      | 2 +-
 lib/librte_eal/common/hotplug_mp.h      | 9 +++++++++
 lib/librte_eal/common/include/rte_eal.h | 9 ---------
 lib/librte_eal/linuxapp/eal/eal.c       | 3 ++-
 4 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/lib/librte_eal/common/hotplug_mp.c b/lib/librte_eal/common/hotplug_mp.c
index 7c3f38dba..287f3df0b 100644
--- a/lib/librte_eal/common/hotplug_mp.c
+++ b/lib/librte_eal/common/hotplug_mp.c
@@ -419,5 +419,5 @@ int eal_dev_hotplug_request_to_secondary(struct eal_dev_mp_req *req)
 }
 
-int rte_mp_dev_hotplug_init(void)
+int eal_mp_dev_hotplug_init(void)
 {
 	int ret;
diff --git a/lib/librte_eal/common/hotplug_mp.h b/lib/librte_eal/common/hotplug_mp.h
index 597fde3d7..8fcf9b52e 100644
--- a/lib/librte_eal/common/hotplug_mp.h
+++ b/lib/librte_eal/common/hotplug_mp.h
@@ -29,4 +29,13 @@ struct eal_dev_mp_req {
 };
 
+/**
+ * Register all mp action callbacks for hotplug.
+ *
+ * @return
+ *   0 on success, negative on error.
+ */
+int
+eal_mp_dev_hotplug_init(void);
+
 /**
  * This is a synchronous wrapper for secondary process send
diff --git a/lib/librte_eal/common/include/rte_eal.h b/lib/librte_eal/common/include/rte_eal.h
index 9951228e0..595efdca5 100644
--- a/lib/librte_eal/common/include/rte_eal.h
+++ b/lib/librte_eal/common/include/rte_eal.h
@@ -400,13 +400,4 @@ int __rte_experimental
 rte_mp_reply(struct rte_mp_msg *msg, const char *peer);
 
-/**
- * Register all mp action callbacks for hotplug.
- *
- * @return
- *   0 on success, negative on error.
- */
-int __rte_experimental
-rte_mp_dev_hotplug_init(void);
-
 /**
  * Usage function typedef used by the application usage function.
diff --git a/lib/librte_eal/linuxapp/eal/eal.c b/lib/librte_eal/linuxapp/eal/eal.c
index fa97b1154..f453337f7 100644
--- a/lib/librte_eal/linuxapp/eal/eal.c
+++ b/lib/librte_eal/linuxapp/eal/eal.c
@@ -60,4 +60,5 @@
 #include "eal_options.h"
 #include "eal_vfio.h"
+#include "hotplug_mp.h"
 
 #define MEMSIZE_IF_NO_HUGE_PAGE (64ULL * 1024ULL * 1024ULL)
@@ -1019,5 +1020,5 @@ rte_eal_init(int argc, char **argv)
 
 	/* register multi-process action callbacks for hotplug */
-	if (rte_mp_dev_hotplug_init() < 0) {
+	if (eal_mp_dev_hotplug_init() < 0) {
 		rte_eal_init_alert("failed to register mp callback for hotplug");
 		return -1;
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-08-22 19:38:21.257554824 +0100
+++ 0012-eal-hide-internal-hotplug-function.patch	2019-08-22 19:38:20.407027595 +0100
@@ -1 +1 @@
-From f319d9937977479528870c6859bd3a227c212f75 Mon Sep 17 00:00:00 2001
+From d2d1dbb6f51aadad579a3f0fac8d1589ca99f67a Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit f319d9937977479528870c6859bd3a227c212f75 ]
+
@@ -11 +12,0 @@
-Cc: stable at dpdk.org
@@ -21 +22 @@
- lib/librte_eal/linux/eal/eal.c          | 3 ++-
+ lib/librte_eal/linuxapp/eal/eal.c       | 3 ++-
@@ -25 +26 @@
-index 4f316ba9a..ee791903b 100644
+index 7c3f38dba..287f3df0b 100644
@@ -28 +29 @@
-@@ -439,5 +439,5 @@ int eal_dev_hotplug_request_to_secondary(struct eal_dev_mp_req *req)
+@@ -419,5 +419,5 @@ int eal_dev_hotplug_request_to_secondary(struct eal_dev_mp_req *req)
@@ -54 +55 @@
-index cf701e177..27808a336 100644
+index 9951228e0..595efdca5 100644
@@ -57 +58 @@
-@@ -409,13 +409,4 @@ int __rte_experimental
+@@ -400,13 +400,4 @@ int __rte_experimental
@@ -71,4 +72,4 @@
-diff --git a/lib/librte_eal/linux/eal/eal.c b/lib/librte_eal/linux/eal/eal.c
-index aa0137ecd..8a0b387ce 100644
---- a/lib/librte_eal/linux/eal/eal.c
-+++ b/lib/librte_eal/linux/eal/eal.c
+diff --git a/lib/librte_eal/linuxapp/eal/eal.c b/lib/librte_eal/linuxapp/eal/eal.c
+index fa97b1154..f453337f7 100644
+--- a/lib/librte_eal/linuxapp/eal/eal.c
++++ b/lib/librte_eal/linuxapp/eal/eal.c
@@ -81 +82 @@
-@@ -1063,5 +1064,5 @@ rte_eal_init(int argc, char **argv)
+@@ -1019,5 +1020,5 @@ rte_eal_init(int argc, char **argv)