In tests where no-shconf flag is used, no-huge is also passed due to
compatibility with FreeBSD system, as described in: b5d878e6d.
However on Linux systems with RTE_IOVA_PA (lack of or an incompatible
IOMMU) this causes issues since hugepages are required by EAL.
Therefore replace all occurrences of no_huge which don't actually test
the no-huge logic with a execution environment conditional
no_huge_compat to indicate that it is passed as a compatibility flag,
not as a requirement for a test itself.
Note that checkpatch is complaining about argvX arrays not being static
const. This patch doesn't change that to not add confusion.
Signed-off-by: Stanislaw Kardach <k...@semihalf.com>
Fixes: b5d878e6db56 ("test: fix EAL flags autotest on FreeBSD")
Cc: sta...@dpdk.org
---
app/test/test_eal_flags.c | 33 ++++++++++++++++++++++-----------
1 file changed, 22 insertions(+), 11 deletions(-)
diff --git a/app/test/test_eal_flags.c b/app/test/test_eal_flags.c
index 462dc6384..cfc54684a 100644
--- a/app/test/test_eal_flags.c
+++ b/app/test/test_eal_flags.c
@@ -29,6 +29,17 @@
#define mp_flag "--proc-type=secondary"
#define no_hpet "--no-hpet"
#define no_huge "--no-huge"
+/* FreeBSD does not support running multiple primary processes, hence for tests
+ * requiring no-shconf, no-huge is also required.
+ * On Linux on the other hand no-huge is not needed so don't pass it as it
+ * would break cases when IOMMU is not able to provide IOVA translation
+ * (rte_eal_iova_mode() == RTE_IOVA_PA).
+ */
+#ifdef RTE_EXEC_ENV_LINUX
+#define no_huge_compat ""
+#else
+#define no_huge_compat no_huge
+#endif
#define no_shconf "--no-shconf"
#define allow "--allow"
#define vdev "--vdev"
@@ -354,17 +365,17 @@ test_invalid_vdev_flag(void)
#endif
/* Test with invalid vdev option */
- const char *vdevinval[] = {prgname, prefix, no_huge,
+ const char *vdevinval[] = {prgname, prefix, no_huge_compat,
vdev, "eth_dummy"};
/* Test with valid vdev option */
- const char *vdevval1[] = {prgname, prefix, no_huge,
+ const char *vdevval1[] = {prgname, prefix, no_huge_compat,
vdev, "net_ring0"};
- const char *vdevval2[] = {prgname, prefix, no_huge,
+ const char *vdevval2[] = {prgname, prefix, no_huge_compat,
vdev, "net_ring0,args=test"};
- const char *vdevval3[] = {prgname, prefix, no_huge,
+ const char *vdevval3[] = {prgname, prefix, no_huge_compat,
vdev, "net_ring0,nodeaction=r1:0:CREATE"};
if (launch_proc(vdevinval) == 0) {
@@ -674,19 +685,19 @@ test_invalid_n_flag(void)
#endif
/* -n flag but no value */
- const char *argv1[] = { prgname, prefix, no_huge, no_shconf,
+ const char *argv1[] = { prgname, prefix, no_huge_compat, no_shconf,
"-n"};
/* bad numeric value */
- const char *argv2[] = { prgname, prefix, no_huge, no_shconf,
+ const char *argv2[] = { prgname, prefix, no_huge_compat, no_shconf,
"-n", "e" };
/* zero is invalid */
- const char *argv3[] = { prgname, prefix, no_huge, no_shconf,
+ const char *argv3[] = { prgname, prefix, no_huge_compat, no_shconf,
"-n", "0" };
/* sanity test - check with good value */
- const char *argv4[] = { prgname, prefix, no_huge, no_shconf,
+ const char *argv4[] = { prgname, prefix, no_huge_compat, no_shconf,
"-n", "2" };
/* sanity test - check with no -n flag */
- const char *argv5[] = { prgname, prefix, no_huge, no_shconf};
+ const char *argv5[] = { prgname, prefix, no_huge_compat, no_shconf};
if (launch_proc(argv1) == 0
|| launch_proc(argv2) == 0
@@ -878,7 +889,7 @@ test_misc_flags(void)
const char *argv5[] = {prgname, prefix, mp_flag, "--syslog", "error"};
/* With no-sh-conf, also use no-huge to ensure this test runs on BSD */
const char *argv6[] = {prgname, "-m", DEFAULT_MEM_SIZE,
- no_shconf, nosh_prefix, no_huge};
+ no_shconf, nosh_prefix, no_huge_compat};
/* With --huge-dir */
const char *argv7[] = {prgname, "-m", DEFAULT_MEM_SIZE,
@@ -920,7 +931,7 @@ test_misc_flags(void)
/* With process type as auto-detect with no-shconf */
const char * const argv17[] = {prgname, "--proc-type=auto",
- no_shconf, nosh_prefix, no_huge};
+ no_shconf, nosh_prefix, no_huge_compat};
/* With process type as --create-uio-dev flag */
const char * const argv18[] = {prgname, "--file-prefix=uiodev",
--
2.27.0
