From: Harry van Haaren <harry.van.haaren@intel.com>
Date: Tue, 30 Jan 2018 18:26:09 +0000 (+0000)
Subject: test/debug: fix EAL cleanup when forking
X-Git-Url: http://git.droids-corp.org/?a=commitdiff_plain;h=b0ee28ca12bd14a3fccdc4a84e701d19f87df6c2;p=dpdk.git

test/debug: fix EAL cleanup when forking

Before this patch, the debug_autotest would call fork(),
call rte_panic() or rte_exit() in the child process, and
examine the return code to verify that rte_panic() and
rte_exit() were correctly reporting failures.

With the inclusion of the rte_eal_cleanup() patch, rte_exit()
was modified to cleanly tear-down EAL allocations. Currently
only one library (service cores) is allocated by EAL at startup
and should be cleaned up. This library has a check on a normal
(non-hugepage) variable to protect against double cleanup. The
service cores finalize() function itself frees back hugepage mem.

Given the fork() approach from the unit test, and the fact that
the double-free check is on an ordinary variable, causes multiple
child processed (fork()-ed from the unit-test runner) to attempt
to free the huge-page memory multiple times. The variable to
protect against double-cleanup was not effective, as the fork()
would restore it to show initialized in the next child.

The solution is to call rte_service_finalize() *before* calling
fork(), which results in the service cores double-cleanup variable
to be zero before the fork(), and hence the child processes never
free the hugepage service-cores memory (correct behavior, as the
unit-test suite is still running, and owns the hugepages).

Fixes: aec9c13c5257 ("eal: add function to release internal resources")

Reported-by: Pavan Nikhilesh <pbhagavatula@caviumnetworks.com>
Signed-off-by: Harry van Haaren <harry.van.haaren@intel.com>
---

diff --git a/test/test/test_debug.c b/test/test/test_debug.c
index dd0de448af..faf2cf5573 100644
--- a/test/test/test_debug.c
+++ b/test/test/test_debug.c
@@ -10,6 +10,7 @@
 #include <rte_debug.h>
 #include <rte_common.h>
 #include <rte_eal.h>
+#include <rte_service_component.h>
 
 #include "test.h"
 
@@ -50,6 +51,11 @@ test_exit_val(int exit_val)
 	int pid;
 	int status;
 
+	/* manually cleanup EAL memory, as the fork() below would otherwise
+	 * cause the same hugepages to be free()-ed multiple times.
+	 */
+	rte_service_finalize();
+
 	pid = fork();
 
 	if (pid == 0)