/*-
* BSD LICENSE
- *
+ *
* Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
+ * Copyright(c) 2014 6WIND S.A.
* All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
- *
+ *
* * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above copyright
* * Neither the name of Intel Corporation nor the names of its
* contributors may be used to endorse or promote products derived
* from this software without specific prior written permission.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
*/
#include <stdio.h>
-#include <cmdline_parse.h>
-
#include "test.h"
-#ifndef RTE_EXEC_ENV_BAREMETAL
#include <string.h>
#include <stdarg.h>
#include <libgen.h>
#include <dirent.h>
#include <sys/wait.h>
#include <sys/file.h>
+#include <limits.h>
#include <rte_debug.h>
#include <rte_string_fns.h>
#include "process.h"
+#ifdef RTE_LIBRTE_XEN_DOM0
+#define DEFAULT_MEM_SIZE "30"
+#else
+#define DEFAULT_MEM_SIZE "18"
+#endif
#define mp_flag "--proc-type=secondary"
#define no_hpet "--no-hpet"
#define no_huge "--no-huge"
#define no_shconf "--no-shconf"
-#define use_device "--use-device"
+#define pci_whitelist "--pci-whitelist"
+#define vdev "--vdev"
#define memtest "memtest"
#define memtest1 "memtest1"
#define memtest2 "memtest2"
return 0;
if (strncmp(tokens[2], "hugetlbfs", sizeof("hugetlbfs")) == 0) {
- rte_snprintf(dst, dst_len, "%s", tokens[1]);
+ snprintf(dst, dst_len, "%s", tokens[1]);
return 1;
}
return 0;
int fd, lck_result, result = 0;
- const int prefix_len = rte_snprintf(hugefile_prefix,
+ const int prefix_len = snprintf(hugefile_prefix,
sizeof(hugefile_prefix), "%smap_", prefix);
if (prefix_len <= 0 || prefix_len >= (int)sizeof(hugefile_prefix)
|| prefix_len >= (int)sizeof(dirent->d_name)) {
{
char file_path[PATH_MAX] = {0};
- rte_snprintf(file_path, sizeof(file_path),
+ snprintf(file_path, sizeof(file_path),
"%s/%s", hugedir, dirent->d_name);
-
+
/* remove file */
if (remove(file_path) < 0) {
printf("Error deleting %s - %s!\n",
return result;
}
+#ifdef RTE_EXEC_ENV_LINUXAPP
/*
* count the number of "node*" files in /sys/devices/system/node/
*/
closedir(dir);
return result;
}
+#endif
static char*
get_current_prefix(char * prefix, int size)
char buf[PATH_MAX] = {0};
/* get file for config (fd is always 3) */
- rte_snprintf(path, sizeof(path), "/proc/self/fd/%d", 3);
+ snprintf(path, sizeof(path), "/proc/self/fd/%d", 3);
/* return NULL on error */
if (readlink(path, buf, sizeof(buf)) == -1)
return NULL;
/* get the basename */
- rte_snprintf(buf, sizeof(buf), "%s", basename(buf));
+ snprintf(buf, sizeof(buf), "%s", basename(buf));
/* copy string all the way from second char up to start of _config */
- rte_snprintf(prefix, size, "%.*s",
- strnlen(buf, sizeof(buf)) - sizeof("_config"), &buf[1]);
+ snprintf(prefix, size, "%.*s",
+ (int)(strnlen(buf, sizeof(buf)) - sizeof("_config")),
+ &buf[1]);
return prefix;
}
-/* extra function prototypes for internal eal function to test in whitelist
- * ICC 12 doesn't approve of this practice, so temporarily disable warnings for it */
-#ifdef __INTEL_COMPILER
-#pragma warning disable 1419
-#endif
-extern int eal_dev_whitelist_exists(void);
-extern int eal_dev_whitelist_add_entry(const char *);
-extern int eal_dev_whitelist_parse(void);
-extern int eal_dev_is_whitelisted(const char *, const char **);
-extern void eal_dev_whitelist_clear(void);
-#ifdef __INTEL_COMPILER
-#pragma warning enable 1419
-#endif
-
/*
* Test that the app doesn't run with invalid whitelist option.
* Final tests ensures it does run with valid options as sanity check (one
test_whitelist_flag(void)
{
unsigned i;
+#ifdef RTE_EXEC_ENV_BSDAPP
+ /* BSD target doesn't support prefixes at this point */
+ const char * prefix = "";
+#else
char prefix[PATH_MAX], tmp[PATH_MAX];
if (get_current_prefix(tmp, sizeof(tmp)) == NULL) {
printf("Error - unable to get current prefix!\n");
return -1;
}
- rte_snprintf(prefix, sizeof(prefix), "--file-prefix=%s", tmp);
+ snprintf(prefix, sizeof(prefix), "--file-prefix=%s", tmp);
+#endif
const char *wlinval[][11] = {
{prgname, prefix, mp_flag, "-n", "1", "-c", "1",
- use_device, "error", "", ""},
- {prgname, prefix, mp_flag, "-n", "1", "-c", "1",
- use_device, "0:0:0", "", ""},
+ pci_whitelist, "error", "", ""},
{prgname, prefix, mp_flag, "-n", "1", "-c", "1",
- use_device, "0:error:0.1", "", ""},
+ pci_whitelist, "0:0:0", "", ""},
{prgname, prefix, mp_flag, "-n", "1", "-c", "1",
- use_device, "0:0:0.1error", "", ""},
+ pci_whitelist, "0:error:0.1", "", ""},
{prgname, prefix, mp_flag, "-n", "1", "-c", "1",
- use_device, "error0:0:0.1", "", ""},
+ pci_whitelist, "0:0:0.1error", "", ""},
{prgname, prefix, mp_flag, "-n", "1", "-c", "1",
- use_device, "0:0:0.1.2", "", ""},
+ pci_whitelist, "error0:0:0.1", "", ""},
{prgname, prefix, mp_flag, "-n", "1", "-c", "1",
- use_device, "a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x",
- use_device, "y,z,1,2,3,4,5,6,7,8,9,0"},
+ pci_whitelist, "0:0:0.1.2", "", ""},
};
/* Test with valid whitelist option */
const char *wlval1[] = {prgname, prefix, mp_flag, "-n", "1", "-c", "1",
- use_device, "00FF:09:0B.3"};
+ pci_whitelist, "00FF:09:0B.3"};
const char *wlval2[] = {prgname, prefix, mp_flag, "-n", "1", "-c", "1",
- use_device, "09:0B.3,0a:0b.1"};
+ pci_whitelist, "09:0B.3", pci_whitelist, "0a:0b.1"};
const char *wlval3[] = {prgname, prefix, mp_flag, "-n", "1", "-c", "1",
- use_device, "09:0B.3;type=test,08:00.1;type=normal"};
+ pci_whitelist, "09:0B.3,type=test",
+ pci_whitelist, "08:00.1,type=normal",
+ };
for (i = 0; i < sizeof(wlinval) / sizeof(wlinval[0]); i++) {
if (launch_proc(wlinval[i]) == 0) {
return -1;
}
- /* extra-sanity checks of whitelists - to be run only if no whitelist */
- if (eal_dev_whitelist_exists())
- return 0;
-
- /* check that whitelist_parse returns error without whitelist */
- if (eal_dev_whitelist_parse() != -1) {
- printf("ERROR: calling whitelist parse without a whitelist doesn't "
- "return an error\n");
- return -1;
- }
- if (eal_dev_is_whitelisted("adevice", NULL)) {
- printf("Whitelist lookup does not return false if no whitelist\n");
- return -1;
- }
- eal_dev_whitelist_add_entry("0000:00:00.0");
- eal_dev_whitelist_parse();
- if (eal_dev_is_whitelisted("adevice", NULL)) {
- printf("Whitelist lookup does not return false for unlisted dev\n");
- return -1;
- }
- if (!eal_dev_is_whitelisted("0000:00:00.0", NULL)) {
- printf("Whitelist lookup does not return true for whitelisted dev\n");
- return -1;
- }
- eal_dev_whitelist_clear();
-
return 0;
}
static int
test_invalid_b_flag(void)
{
+#ifdef RTE_EXEC_ENV_BSDAPP
+ /* BSD target doesn't support prefixes at this point */
+ const char * prefix = "";
+#else
char prefix[PATH_MAX], tmp[PATH_MAX];
if (get_current_prefix(tmp, sizeof(tmp)) == NULL) {
printf("Error - unable to get current prefix!\n");
return -1;
}
- rte_snprintf(prefix, sizeof(prefix), "--file-prefix=%s", tmp);
+ snprintf(prefix, sizeof(prefix), "--file-prefix=%s", tmp);
+#endif
const char *blinval[][9] = {
{prgname, prefix, mp_flag, "-n", "1", "-c", "1", "-b", "error"},
return 0;
}
+/*
+ * Test that the app doesn't run with invalid vdev option.
+ * Final test ensures it does run with valid options as sanity check
+ */
+#ifdef RTE_LIBRTE_PMD_RING
+static int
+test_invalid_vdev_flag(void)
+{
+#ifdef RTE_EXEC_ENV_BSDAPP
+ /* BSD target doesn't support prefixes at this point, and we also need to
+ * run another primary process here */
+ const char * prefix = no_shconf;
+#else
+ const char * prefix = "--file-prefix=vdev";
+#endif
+
+ /* Test with invalid vdev option */
+ const char *vdevinval[] = {prgname, prefix, "-n", "1",
+ "-c", "1", vdev, "eth_dummy"};
+
+ /* Test with valid vdev option */
+ const char *vdevval1[] = {prgname, prefix, "-n", "1",
+ "-c", "1", vdev, "eth_ring0"};
+
+ const char *vdevval2[] = {prgname, prefix, "-n", "1",
+ "-c", "1", vdev, "eth_ring0,args=test"};
+
+ const char *vdevval3[] = {prgname, prefix, "-n", "1",
+ "-c", "1", vdev, "eth_ring0,nodeaction=r1:0:CREATE"};
+
+ if (launch_proc(vdevinval) == 0) {
+ printf("Error - process did run ok with invalid "
+ "vdev parameter\n");
+ return -1;
+ }
+
+ if (launch_proc(vdevval1) != 0) {
+ printf("Error - process did not run ok with valid vdev value\n");
+ return -1;
+ }
+
+ if (launch_proc(vdevval2) != 0) {
+ printf("Error - process did not run ok with valid vdev value,"
+ "with dummy args\n");
+ return -1;
+ }
+
+ if (launch_proc(vdevval3) != 0) {
+ printf("Error - process did not run ok with valid vdev value,"
+ "with valid args\n");
+ return -1;
+ }
+ return 0;
+}
+#endif
/*
* Test that the app doesn't run with invalid -r option.
static int
test_invalid_r_flag(void)
{
+#ifdef RTE_EXEC_ENV_BSDAPP
+ /* BSD target doesn't support prefixes at this point */
+ const char * prefix = "";
+#else
char prefix[PATH_MAX], tmp[PATH_MAX];
if (get_current_prefix(tmp, sizeof(tmp)) == NULL) {
printf("Error - unable to get current prefix!\n");
return -1;
}
- rte_snprintf(prefix, sizeof(prefix), "--file-prefix=%s", tmp);
+ snprintf(prefix, sizeof(prefix), "--file-prefix=%s", tmp);
+#endif
const char *rinval[][9] = {
{prgname, prefix, mp_flag, "-n", "1", "-c", "1", "-r", "error"},
}
/*
- * Test that the app doesn't run without the coremask flag. In all cases
+ * Test that the app doesn't run without the coremask/corelist flags. In all cases
* should give an error and fail to run
*/
static int
test_missing_c_flag(void)
{
+#ifdef RTE_EXEC_ENV_BSDAPP
+ /* BSD target doesn't support prefixes at this point */
+ const char * prefix = "";
+#else
char prefix[PATH_MAX], tmp[PATH_MAX];
if (get_current_prefix(tmp, sizeof(tmp)) == NULL) {
printf("Error - unable to get current prefix!\n");
return -1;
}
- rte_snprintf(prefix, sizeof(prefix), "--file-prefix=%s", tmp);
+ snprintf(prefix, sizeof(prefix), "--file-prefix=%s", tmp);
+#endif
/* -c flag but no coremask value */
const char *argv1[] = { prgname, prefix, mp_flag, "-n", "3", "-c"};
- /* No -c flag at all */
+ /* No -c, -l or --lcores flag at all */
const char *argv2[] = { prgname, prefix, mp_flag, "-n", "3"};
/* bad coremask value */
- const char *argv3[] = { prgname, prefix, mp_flag, "-n", "3", "-c", "error" };
+ const char *argv3[] = { prgname, prefix, mp_flag,
+ "-n", "3", "-c", "error" };
/* sanity check of tests - valid coremask value */
- const char *argv4[] = { prgname, prefix, mp_flag, "-n", "3", "-c", "1" };
+ const char *argv4[] = { prgname, prefix, mp_flag,
+ "-n", "3", "-c", "1" };
+ /* -l flag but no corelist value */
+ const char *argv5[] = { prgname, prefix, mp_flag,
+ "-n", "3", "-l"};
+ const char *argv6[] = { prgname, prefix, mp_flag,
+ "-n", "3", "-l", " " };
+ /* bad corelist values */
+ const char *argv7[] = { prgname, prefix, mp_flag,
+ "-n", "3", "-l", "error" };
+ const char *argv8[] = { prgname, prefix, mp_flag,
+ "-n", "3", "-l", "1-" };
+ const char *argv9[] = { prgname, prefix, mp_flag,
+ "-n", "3", "-l", "1," };
+ const char *argv10[] = { prgname, prefix, mp_flag,
+ "-n", "3", "-l", "1#2" };
+ /* sanity check test - valid corelist value */
+ const char *argv11[] = { prgname, prefix, mp_flag,
+ "-n", "3", "-l", "1-2,3" };
+
+ /* --lcores flag but no lcores value */
+ const char *argv12[] = { prgname, prefix, mp_flag,
+ "-n", "3", "--lcores" };
+ const char *argv13[] = { prgname, prefix, mp_flag,
+ "-n", "3", "--lcores", " " };
+ /* bad lcores value */
+ const char *argv14[] = { prgname, prefix, mp_flag,
+ "-n", "3", "--lcores", "1-3-5" };
+ const char *argv15[] = { prgname, prefix, mp_flag,
+ "-n", "3", "--lcores", "0-1,,2" };
+ const char *argv16[] = { prgname, prefix, mp_flag,
+ "-n", "3", "--lcores", "0-,1" };
+ const char *argv17[] = { prgname, prefix, mp_flag,
+ "-n", "3", "--lcores", "(0-,2-4)" };
+ const char *argv18[] = { prgname, prefix, mp_flag,
+ "-n", "3", "--lcores", "(-1,2)" };
+ const char *argv19[] = { prgname, prefix, mp_flag,
+ "-n", "3", "--lcores", "(2-4)@(2-4-6)" };
+ const char *argv20[] = { prgname, prefix, mp_flag,
+ "-n", "3", "--lcores", "(a,2)" };
+ const char *argv21[] = { prgname, prefix, mp_flag,
+ "-n", "3", "--lcores", "1-3@(1,3)" };
+ const char *argv22[] = { prgname, prefix, mp_flag,
+ "-n", "3", "--lcores", "3@((1,3)" };
+ const char *argv23[] = { prgname, prefix, mp_flag,
+ "-n", "3", "--lcores", "(4-7)=(1,3)" };
+ const char *argv24[] = { prgname, prefix, mp_flag,
+ "-n", "3", "--lcores", "[4-7]@(1,3)" };
+ /* sanity check of tests - valid lcores value */
+ const char *argv25[] = { prgname, prefix, mp_flag,
+ "-n", "3", "--lcores",
+ "0-1,2@(5-7),(3-5)@(0,2),(0,6),7"};
+
+ if (launch_proc(argv2) != 0) {
+ printf("Error - "
+ "process did not run ok when missing -c flag\n");
+ return -1;
+ }
if (launch_proc(argv1) == 0
- || launch_proc(argv2) == 0
|| launch_proc(argv3) == 0) {
- printf("Error - process ran without error when missing -c flag\n");
+ printf("Error - "
+ "process ran without error with invalid -c flag\n");
return -1;
}
if (launch_proc(argv4) != 0) {
- printf("Error - process did not run ok with valid coremask value\n");
+ printf("Error - "
+ "process did not run ok with valid coremask value\n");
+ return -1;
+ }
+
+ /* start -l test */
+ if (launch_proc(argv5) == 0
+ || launch_proc(argv6) == 0
+ || launch_proc(argv7) == 0
+ || launch_proc(argv8) == 0
+ || launch_proc(argv9) == 0
+ || launch_proc(argv10) == 0) {
+ printf("Error - "
+ "process ran without error with invalid -l flag\n");
+ return -1;
+ }
+ if (launch_proc(argv11) != 0) {
+ printf("Error - "
+ "process did not run ok with valid corelist value\n");
+ return -1;
+ }
+
+ /* start --lcores tests */
+ if (launch_proc(argv12) == 0 || launch_proc(argv13) == 0 ||
+ launch_proc(argv14) == 0 || launch_proc(argv15) == 0 ||
+ launch_proc(argv16) == 0 || launch_proc(argv17) == 0 ||
+ launch_proc(argv18) == 0 || launch_proc(argv19) == 0 ||
+ launch_proc(argv20) == 0 || launch_proc(argv21) == 0 ||
+ launch_proc(argv21) == 0 || launch_proc(argv22) == 0 ||
+ launch_proc(argv23) == 0 || launch_proc(argv24) == 0) {
+ printf("Error - "
+ "process ran without error with invalid --lcore flag\n");
+ return -1;
+ }
+
+ if (launch_proc(argv25) != 0) {
+ printf("Error - "
+ "process did not run ok with valid corelist value\n");
+ return -1;
+ }
+
+ return 0;
+}
+
+/*
+ * Test --master-lcore option with matching coremask
+ */
+static int
+test_master_lcore_flag(void)
+{
+#ifdef RTE_EXEC_ENV_BSDAPP
+ /* BSD target doesn't support prefixes at this point */
+ const char *prefix = "";
+#else
+ char prefix[PATH_MAX], tmp[PATH_MAX];
+ if (get_current_prefix(tmp, sizeof(tmp)) == NULL) {
+ printf("Error - unable to get current prefix!\n");
+ return -1;
+ }
+ snprintf(prefix, sizeof(prefix), "--file-prefix=%s", tmp);
+#endif
+
+ /* --master-lcore flag but no value */
+ const char *argv1[] = { prgname, prefix, mp_flag, "-n", "1", "-c", "3", "--master-lcore"};
+ /* --master-lcore flag with invalid value */
+ const char *argv2[] = { prgname, prefix, mp_flag, "-n", "1", "-c", "3", "--master-lcore", "-1"};
+ const char *argv3[] = { prgname, prefix, mp_flag, "-n", "1", "-c", "3", "--master-lcore", "X"};
+ /* master lcore not in coremask */
+ const char *argv4[] = { prgname, prefix, mp_flag, "-n", "1", "-c", "3", "--master-lcore", "2"};
+ /* valid value */
+ const char *argv5[] = { prgname, prefix, mp_flag, "-n", "1", "-c", "3", "--master-lcore", "1"};
+ /* valid value set before coremask */
+ const char *argv6[] = { prgname, prefix, mp_flag, "-n", "1", "--master-lcore", "1", "-c", "3"};
+
+ if (launch_proc(argv1) == 0
+ || launch_proc(argv2) == 0
+ || launch_proc(argv3) == 0
+ || launch_proc(argv4) == 0) {
+ printf("Error - process ran without error with wrong --master-lcore\n");
+ return -1;
+ }
+ if (launch_proc(argv5) != 0
+ || launch_proc(argv6) != 0) {
+ printf("Error - process did not run ok with valid --master-lcore\n");
return -1;
}
return 0;
}
/*
- * Test that the app doesn't run without the -n flag. In all cases
- * should give an error and fail to run.
+ * Test that the app doesn't run with invalid -n flag option.
+ * Final test ensures it does run with valid options as sanity check
* Since -n is not compulsory for MP, we instead use --no-huge and --no-shconf
* flags.
*/
static int
-test_missing_n_flag(void)
+test_invalid_n_flag(void)
{
+#ifdef RTE_EXEC_ENV_BSDAPP
+ /* BSD target doesn't support prefixes at this point */
+ const char * prefix = "";
+#else
char prefix[PATH_MAX], tmp[PATH_MAX];
if (get_current_prefix(tmp, sizeof(tmp)) == NULL) {
printf("Error - unable to get current prefix!\n");
return -1;
}
- rte_snprintf(prefix, sizeof(prefix), "--file-prefix=%s", tmp);
+ snprintf(prefix, sizeof(prefix), "--file-prefix=%s", tmp);
+#endif
/* -n flag but no value */
const char *argv1[] = { prgname, prefix, no_huge, no_shconf, "-c", "1", "-n"};
- /* No -n flag at all */
- const char *argv2[] = { prgname, prefix, no_huge, no_shconf, "-c", "1"};
/* bad numeric value */
- const char *argv3[] = { prgname, prefix, no_huge, no_shconf, "-c", "1", "-n", "e" };
- /* out-of-range value */
- const char *argv4[] = { prgname, prefix, no_huge, no_shconf, "-c", "1", "-n", "9" };
+ const char *argv2[] = { prgname, prefix, no_huge, no_shconf, "-c", "1", "-n", "e" };
+ /* zero is invalid */
+ const char *argv3[] = { prgname, prefix, no_huge, no_shconf, "-c", "1", "-n", "0" };
/* sanity test - check with good value */
- const char *argv5[] = { prgname, prefix, no_huge, no_shconf, "-c", "1", "-n", "2" };
+ const char *argv4[] = { prgname, prefix, no_huge, no_shconf, "-c", "1", "-n", "2" };
+ /* sanity test - check with no -n flag */
+ const char *argv5[] = { prgname, prefix, no_huge, no_shconf, "-c", "1"};
if (launch_proc(argv1) == 0
|| launch_proc(argv2) == 0
- || launch_proc(argv3) == 0
- || launch_proc(argv4) == 0) {
- printf("Error - process ran without error when missing -n flag\n");
+ || launch_proc(argv3) == 0) {
+ printf("Error - process ran without error when"
+ "invalid -n flag\n");
return -1;
}
- if (launch_proc(argv5) != 0) {
+ if (launch_proc(argv4) != 0) {
printf("Error - process did not run ok with valid num-channel value\n");
return -1;
}
+ if (launch_proc(argv5) != 0) {
+ printf("Error - process did not run ok without -n flag\n");
+ return -1;
+ }
+
return 0;
}
test_no_hpet_flag(void)
{
char prefix[PATH_MAX], tmp[PATH_MAX];
+
+#ifdef RTE_EXEC_ENV_BSDAPP
+ return 0;
+#endif
if (get_current_prefix(tmp, sizeof(tmp)) == NULL) {
printf("Error - unable to get current prefix!\n");
return -1;
}
- rte_snprintf(prefix, sizeof(prefix), "--file-prefix=%s", tmp);
+ snprintf(prefix, sizeof(prefix), "--file-prefix=%s", tmp);
/* With --no-hpet */
const char *argv1[] = {prgname, prefix, mp_flag, no_hpet, "-c", "1", "-n", "2"};
}
/*
- * Test that the app runs with --no-huge and doesn't run when either
- * -m or --socket-mem are specified with --no-huge.
+ * Test that the app runs with --no-huge and doesn't run when --socket-mem are
+ * specified with --no-huge.
*/
static int
test_no_huge_flag(void)
{
- char prefix[PATH_MAX], tmp[PATH_MAX];
- if (get_current_prefix(tmp, sizeof(tmp)) == NULL) {
- printf("Error - unable to get current prefix!\n");
- return -1;
- }
- rte_snprintf(prefix, sizeof(prefix), "--file-prefix=%s", tmp);
+#ifdef RTE_EXEC_ENV_BSDAPP
+ /* BSD target doesn't support prefixes at this point, and we also need to
+ * run another primary process here */
+ const char * prefix = no_shconf;
+#else
+ const char * prefix = "--file-prefix=nohuge";
+#endif
/* With --no-huge */
- const char *argv1[] = {prgname, prefix, no_huge, "-c", "1", "-n", "2",
- "--file-prefix=nohuge"};
+ const char *argv1[] = {prgname, prefix, no_huge, "-c", "1", "-n", "2"};
/* With --no-huge and -m */
- const char *argv2[] = {prgname, prefix, no_huge, "-c", "1", "-n", "2", "-m", "2",
- "--file-prefix=nohuge"};
+ const char *argv2[] = {prgname, prefix, no_huge, "-c", "1", "-n", "2",
+ "-m", DEFAULT_MEM_SIZE};
+
/* With --no-huge and --socket-mem */
const char *argv3[] = {prgname, prefix, no_huge, "-c", "1", "-n", "2",
- "--socket-mem=2", "--file-prefix=nohuge"};
+ "--socket-mem=" DEFAULT_MEM_SIZE};
/* With --no-huge, -m and --socket-mem */
const char *argv4[] = {prgname, prefix, no_huge, "-c", "1", "-n", "2",
- "-m", "2", "--socket-mem=2", "--file-prefix=nohuge"};
-
+ "-m", DEFAULT_MEM_SIZE, "--socket-mem=" DEFAULT_MEM_SIZE};
if (launch_proc(argv1) != 0) {
printf("Error - process did not run ok with --no-huge flag\n");
return -1;
}
- if (launch_proc(argv2) == 0) {
- printf("Error - process run ok with --no-huge and -m flags\n");
+ if (launch_proc(argv2) != 0) {
+ printf("Error - process did not run ok with --no-huge and -m flags\n");
return -1;
}
+#ifdef RTE_EXEC_ENV_BSDAPP
+ /* BSD target does not support NUMA, hence no --socket-mem tests */
+ return 0;
+#endif
+
if (launch_proc(argv3) == 0) {
printf("Error - process run ok with --no-huge and --socket-mem "
"flags\n");
return 0;
}
+#ifdef RTE_LIBRTE_XEN_DOM0
+static int
+test_dom0_misc_flags(void)
+{
+ char prefix[PATH_MAX], tmp[PATH_MAX];
+
+ if (get_current_prefix(tmp, sizeof(tmp)) == NULL) {
+ printf("Error - unable to get current prefix!\n");
+ return -1;
+ }
+ snprintf(prefix, sizeof(prefix), "--file-prefix=%s", tmp);
+
+ /* check that some general flags don't prevent things from working.
+ * All cases, apart from the first, app should run.
+ * No futher testing of output done.
+ */
+ /* sanity check - failure with invalid option */
+ const char *argv0[] = {prgname, prefix, mp_flag, "-c", "1", "--invalid-opt"};
+
+ /* With --no-pci */
+ const char *argv1[] = {prgname, prefix, mp_flag, "-c", "1", "--no-pci"};
+ /* With -v */
+ const char *argv2[] = {prgname, prefix, mp_flag, "-c", "1", "-v"};
+ /* With valid --syslog */
+ const char *argv3[] = {prgname, prefix, mp_flag, "-c", "1",
+ "--syslog", "syslog"};
+ /* With empty --syslog (should fail) */
+ const char *argv4[] = {prgname, prefix, mp_flag, "-c", "1", "--syslog"};
+ /* With invalid --syslog */
+ const char *argv5[] = {prgname, prefix, mp_flag, "-c", "1", "--syslog", "error"};
+ /* With no-sh-conf */
+ const char *argv6[] = {prgname, "-c", "1", "-n", "2", "-m", "20",
+ "--no-shconf", "--file-prefix=noshconf" };
+
+ if (launch_proc(argv0) == 0) {
+ printf("Error - process ran ok with invalid flag\n");
+ return -1;
+ }
+ if (launch_proc(argv1) != 0) {
+ printf("Error - process did not run ok with --no-pci flag\n");
+ return -1;
+ }
+ if (launch_proc(argv2) != 0) {
+ printf("Error - process did not run ok with -v flag\n");
+ return -1;
+ }
+ if (launch_proc(argv3) != 0) {
+ printf("Error - process did not run ok with --syslog flag\n");
+ return -1;
+ }
+ if (launch_proc(argv4) == 0) {
+ printf("Error - process run ok with empty --syslog flag\n");
+ return -1;
+ }
+ if (launch_proc(argv5) == 0) {
+ printf("Error - process run ok with invalid --syslog flag\n");
+ return -1;
+ }
+ if (launch_proc(argv6) != 0) {
+ printf("Error - process did not run ok with --no-shconf flag\n");
+ return -1;
+ }
+
+ return 0;
+}
+#else
static int
test_misc_flags(void)
{
- FILE * hugedir_handle = NULL;
- char line[PATH_MAX] = {0};
char hugepath[PATH_MAX] = {0};
+#ifdef RTE_EXEC_ENV_BSDAPP
+ /* BSD target doesn't support prefixes at this point */
+ const char * prefix = "";
+ const char * nosh_prefix = "";
+#else
char prefix[PATH_MAX], tmp[PATH_MAX];
+ const char * nosh_prefix = "--file-prefix=noshconf";
+ FILE * hugedir_handle = NULL;
+ char line[PATH_MAX] = {0};
unsigned i, isempty = 1;
-
if (get_current_prefix(tmp, sizeof(tmp)) == NULL) {
printf("Error - unable to get current prefix!\n");
return -1;
}
- rte_snprintf(prefix, sizeof(prefix), "--file-prefix=%s", tmp);
+ snprintf(prefix, sizeof(prefix), "--file-prefix=%s", tmp);
/*
* get first valid hugepage path
printf("No mounted hugepage dir found!\n");
return -1;
}
+#endif
/* check that some general flags don't prevent things from working.
/* With invalid --syslog */
const char *argv5[] = {prgname, prefix, mp_flag, "-c", "1", "--syslog", "error"};
/* With no-sh-conf */
- const char *argv6[] = {prgname, "-c", "1", "-n", "2", "-m", "2",
- "--no-shconf", "--file-prefix=noshconf" };
+ const char *argv6[] = {prgname, "-c", "1", "-n", "2", "-m", DEFAULT_MEM_SIZE,
+ no_shconf, nosh_prefix };
+
+#ifdef RTE_EXEC_ENV_BSDAPP
+ return 0;
+#endif
/* With --huge-dir */
- const char *argv7[] = {prgname, "-c", "1", "-n", "2", "-m", "2",
+ const char *argv7[] = {prgname, "-c", "1", "-n", "2", "-m", DEFAULT_MEM_SIZE,
"--file-prefix=hugedir", "--huge-dir", hugepath};
/* With empty --huge-dir (should fail) */
- const char *argv8[] = {prgname, "-c", "1", "-n", "2", "-m", "2",
+ const char *argv8[] = {prgname, "-c", "1", "-n", "2", "-m", DEFAULT_MEM_SIZE,
"--file-prefix=hugedir", "--huge-dir"};
/* With invalid --huge-dir */
- const char *argv9[] = {prgname, "-c", "1", "-n", "2", "-m", "2",
+ const char *argv9[] = {prgname, "-c", "1", "-n", "2", "-m", DEFAULT_MEM_SIZE,
"--file-prefix=hugedir", "--huge-dir", "invalid"};
/* Secondary process with invalid --huge-dir (should run as flag has no
* effect on secondary processes) */
const char *argv10[] = {prgname, prefix, mp_flag, "-c", "1", "--huge-dir", "invalid"};
+ /* try running with base-virtaddr param */
+ const char *argv11[] = {prgname, "--file-prefix=virtaddr",
+ "-c", "1", "-n", "2", "--base-virtaddr=0x12345678"};
+
+ /* try running with --vfio-intr INTx flag */
+ const char *argv12[] = {prgname, "--file-prefix=intr",
+ "-c", "1", "-n", "2", "--vfio-intr=legacy"};
+
+ /* try running with --vfio-intr MSI flag */
+ const char *argv13[] = {prgname, "--file-prefix=intr",
+ "-c", "1", "-n", "2", "--vfio-intr=msi"};
+
+ /* try running with --vfio-intr MSI-X flag */
+ const char *argv14[] = {prgname, "--file-prefix=intr",
+ "-c", "1", "-n", "2", "--vfio-intr=msix"};
+
+ /* try running with --vfio-intr invalid flag */
+ const char *argv15[] = {prgname, "--file-prefix=intr",
+ "-c", "1", "-n", "2", "--vfio-intr=invalid"};
+
if (launch_proc(argv0) == 0) {
printf("Error - process ran ok with invalid flag\n");
printf("Error - process did not run ok with --no-shconf flag\n");
return -1;
}
+#ifdef RTE_EXEC_ENV_BSDAPP
+ return 0;
+#endif
if (launch_proc(argv7) != 0) {
printf("Error - process did not run ok with --huge-dir flag\n");
return -1;
printf("Error - secondary process did not run ok with invalid --huge-dir flag\n");
return -1;
}
+ if (launch_proc(argv11) != 0) {
+ printf("Error - process did not run ok with --base-virtaddr parameter\n");
+ return -1;
+ }
+ if (launch_proc(argv12) != 0) {
+ printf("Error - process did not run ok with "
+ "--vfio-intr INTx parameter\n");
+ return -1;
+ }
+ if (launch_proc(argv13) != 0) {
+ printf("Error - process did not run ok with "
+ "--vfio-intr MSI parameter\n");
+ return -1;
+ }
+ if (launch_proc(argv14) != 0) {
+ printf("Error - process did not run ok with "
+ "--vfio-intr MSI-X parameter\n");
+ return -1;
+ }
+ if (launch_proc(argv15) == 0) {
+ printf("Error - process run ok with "
+ "--vfio-intr invalid parameter\n");
+ return -1;
+ }
return 0;
}
+#endif
static int
test_file_prefix(void)
* 7. check that only memtest2 hugefiles are present in the hugedir
*/
+#ifdef RTE_EXEC_ENV_BSDAPP
+ return 0;
+#endif
+
/* this should fail unless the test itself is run with "memtest" prefix */
- const char *argv0[] = {prgname, mp_flag, "-c", "1", "-n", "2", "-m", "2",
+ const char *argv0[] = {prgname, mp_flag, "-c", "1", "-n", "2", "-m", DEFAULT_MEM_SIZE,
"--file-prefix=" memtest };
/* primary process with memtest1 */
- const char *argv1[] = {prgname, "-c", "1", "-n", "2", "-m", "2",
+ const char *argv1[] = {prgname, "-c", "1", "-n", "2", "-m", DEFAULT_MEM_SIZE,
"--file-prefix=" memtest1 };
/* primary process with memtest2 */
- const char *argv2[] = {prgname, "-c", "1", "-n", "2", "-m", "2",
+ const char *argv2[] = {prgname, "-c", "1", "-n", "2", "-m", DEFAULT_MEM_SIZE,
"--file-prefix=" memtest2 };
char prefix[32];
printf("Error - unable to get current prefix!\n");
return -1;
}
+#ifdef RTE_LIBRTE_XEN_DOM0
+ return 0;
+#endif
/* check if files for current prefix are present */
if (process_hugefiles(prefix, HUGEPAGE_CHECK_EXISTS) != 1) {
static int
test_memory_flags(void)
{
+#ifdef RTE_EXEC_ENV_BSDAPP
+ /* BSD target doesn't support prefixes at this point */
+ const char * prefix = "";
+#else
char prefix[PATH_MAX], tmp[PATH_MAX];
if (get_current_prefix(tmp, sizeof(tmp)) == NULL) {
printf("Error - unable to get current prefix!\n");
return -1;
}
- rte_snprintf(prefix, sizeof(prefix), "--file-prefix=%s", tmp);
-
- /* valid -m flag */
- const char *argv0[] = {prgname, "-c", "10", "-n", "2",
- "--file-prefix=" memtest, "-m", "2"};
+ snprintf(prefix, sizeof(prefix), "--file-prefix=%s", tmp);
+#endif
/* valid -m flag and mp flag */
- const char *argv1[] = {prgname, prefix, mp_flag, "-c", "10",
- "-n", "2", "-m", "2"};
+ const char *argv0[] = {prgname, prefix, mp_flag, "-c", "10",
+ "-n", "2", "-m", DEFAULT_MEM_SIZE};
+
+ /* valid -m flag */
+ const char *argv1[] = {prgname, "-c", "10", "-n", "2",
+ "--file-prefix=" memtest, "-m", DEFAULT_MEM_SIZE};
/* invalid (zero) --socket-mem flag */
const char *argv2[] = {prgname, "-c", "10", "-n", "2",
/* valid --socket-mem specified together with -m flag */
const char *argv8[] = {prgname, "-c", "10", "-n", "2",
- "--file-prefix=" memtest, "-m", "2", "--socket-mem=2,2"};
+ "--file-prefix=" memtest, "-m", DEFAULT_MEM_SIZE, "--socket-mem=2,2"};
/* construct an invalid socket mask with 2 megs on each socket plus
* extra 2 megs on socket that doesn't exist on current system */
char invalid_socket_mem[SOCKET_MEM_STRLEN];
char buf[SOCKET_MEM_STRLEN]; /* to avoid copying string onto itself */
+
+#ifdef RTE_EXEC_ENV_BSDAPP
+ int i, num_sockets = 1;
+#else
int i, num_sockets = get_number_of_sockets();
+#endif
if (num_sockets <= 0 || num_sockets > RTE_MAX_NUMA_NODES) {
printf("Error - cannot get number of sockets!\n");
return -1;
}
- rte_snprintf(invalid_socket_mem, sizeof(invalid_socket_mem), "--socket-mem=");
+ snprintf(invalid_socket_mem, sizeof(invalid_socket_mem), "--socket-mem=");
/* add one extra socket */
for (i = 0; i < num_sockets + 1; i++) {
- rte_snprintf(buf, sizeof(buf), "%s2", invalid_socket_mem);
- rte_snprintf(invalid_socket_mem, sizeof(invalid_socket_mem), "%s", buf);
+ snprintf(buf, sizeof(buf), "%s%s", invalid_socket_mem, DEFAULT_MEM_SIZE);
+ snprintf(invalid_socket_mem, sizeof(invalid_socket_mem), "%s", buf);
if (num_sockets + 1 - i > 1) {
- rte_snprintf(buf, sizeof(buf), "%s,", invalid_socket_mem);
- rte_snprintf(invalid_socket_mem, sizeof(invalid_socket_mem), "%s", buf);
+ snprintf(buf, sizeof(buf), "%s,", invalid_socket_mem);
+ snprintf(invalid_socket_mem, sizeof(invalid_socket_mem), "%s", buf);
}
}
/* construct a valid socket mask with 2 megs on each existing socket */
char valid_socket_mem[SOCKET_MEM_STRLEN];
- rte_snprintf(valid_socket_mem, sizeof(valid_socket_mem), "--socket-mem=");
+ snprintf(valid_socket_mem, sizeof(valid_socket_mem), "--socket-mem=");
/* add one extra socket */
for (i = 0; i < num_sockets; i++) {
- rte_snprintf(buf, sizeof(buf), "%s2", valid_socket_mem);
- rte_snprintf(valid_socket_mem, sizeof(valid_socket_mem), "%s", buf);
+ snprintf(buf, sizeof(buf), "%s%s", valid_socket_mem, DEFAULT_MEM_SIZE);
+ snprintf(valid_socket_mem, sizeof(valid_socket_mem), "%s", buf);
if (num_sockets - i > 1) {
- rte_snprintf(buf, sizeof(buf), "%s,", valid_socket_mem);
- rte_snprintf(valid_socket_mem, sizeof(valid_socket_mem), "%s", buf);
+ snprintf(buf, sizeof(buf), "%s,", valid_socket_mem);
+ snprintf(valid_socket_mem, sizeof(valid_socket_mem), "%s", buf);
}
}
"--file-prefix=" memtest, valid_socket_mem};
if (launch_proc(argv0) != 0) {
- printf("Error - process failed with valid -m flag!\n");
+ printf("Error - secondary process failed with valid -m flag !\n");
return -1;
}
+#ifdef RTE_EXEC_ENV_BSDAPP
+ /* no other tests are applicable to BSD */
+ return 0;
+#endif
+
if (launch_proc(argv1) != 0) {
- printf("Error - secondary process failed with valid -m flag !\n");
+ printf("Error - process failed with valid -m flag!\n");
return -1;
}
-
+#ifdef RTE_LIBRTE_XEN_DOM0
+ return 0;
+#endif
if (launch_proc(argv2) == 0) {
printf("Error - process run ok with invalid (zero) --socket-mem!\n");
return -1;
return 0;
}
-int
+static int
test_eal_flags(void)
{
int ret = 0;
return ret;
}
- ret = test_missing_n_flag();
+ ret = test_master_lcore_flag();
+ if (ret < 0) {
+ printf("Error in test_master_lcore_flag()\n");
+ return ret;
+ }
+
+ ret = test_invalid_n_flag();
if (ret < 0) {
- printf("Error in test_missing_n_flag()\n");
+ printf("Error in test_invalid_n_flag()\n");
return ret;
}
return ret;
}
+#ifdef RTE_LIBRTE_PMD_RING
+ ret = test_invalid_vdev_flag();
+ if (ret < 0) {
+ printf("Error in test_invalid_vdev_flag()\n");
+ return ret;
+ }
+#endif
ret = test_invalid_r_flag();
if (ret < 0) {
printf("Error in test_invalid_r_flag()\n");
return ret;
}
+#ifdef RTE_LIBRTE_XEN_DOM0
+ ret = test_dom0_misc_flags();
+#else
ret = test_misc_flags();
+#endif
if (ret < 0) {
printf("Error in test_misc_flags()");
return ret;
return ret;
}
-#else
-/* Baremetal version
- * Multiprocess not applicable, so just return 0 always
- */
-int
-test_eal_flags(void)
-{
- printf("Multi-process not possible for baremetal, cannot test EAL flags\n");
- return 0;
-}
-
-#endif
+REGISTER_TEST_COMMAND(eal_flags_autotest, test_eal_flags);
git.droids-corp.org / dpdk.git / blobdiff