* 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
*/
#include <stdio.h>
-#include <cmdline_parse.h>
-
#include "test.h"
#ifndef RTE_EXEC_ENV_BAREMETAL
#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 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
const char *wlinval[][11] = {
{prgname, prefix, mp_flag, "-n", "1", "-c", "1",
- use_device, "error", "", ""},
+ pci_whitelist, "error", "", ""},
{prgname, prefix, mp_flag, "-n", "1", "-c", "1",
- use_device, "0:0:0", "", ""},
+ pci_whitelist, "0:0:0", "", ""},
{prgname, prefix, mp_flag, "-n", "1", "-c", "1",
- use_device, "0:error:0.1", "", ""},
+ pci_whitelist, "0:error:0.1", "", ""},
{prgname, prefix, mp_flag, "-n", "1", "-c", "1",
- use_device, "0:0:0.1error", "", ""},
+ pci_whitelist, "0:0:0.1error", "", ""},
{prgname, prefix, mp_flag, "-n", "1", "-c", "1",
- use_device, "error0:0:0.1", "", ""},
+ pci_whitelist, "error0:0:0.1", "", ""},
{prgname, prefix, mp_flag, "-n", "1", "-c", "1",
- use_device, "0:0:0.1.2", "", ""},
- {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",
+#ifdef CONFIG_RTE_LIBRTE_PMD_RING
+ vdev, "eth_ring,arg=test",
+#endif
+ };
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;
}
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;
+ }
+ rte_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)
{
* 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"};
+
if (launch_proc(argv0) == 0) {
printf("Error - process ran ok with invalid flag\n");
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;
+ }
return 0;
}
+#endif
static int
test_file_prefix(void)
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)
{
+ const char* mem_size = NULL;
#ifdef RTE_EXEC_ENV_BSDAPP
/* BSD target doesn't support prefixes at this point */
const char * prefix = "";
}
rte_snprintf(prefix, sizeof(prefix), "--file-prefix=%s", tmp);
#endif
- /* valid -m flag */
- const char *argv0[] = {prgname, "-c", "10", "-n", "2",
- "--file-prefix=" memtest, "-m", "2"};
+#ifdef RTE_LIBRTE_XEN_DOM0
+ mem_size = "30";
+#else
+ mem_size = "2";
+#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", mem_size};
+
+ /* valid -m flag */
+ const char *argv1[] = {prgname, "-c", "10", "-n", "2",
+ "--file-prefix=" memtest, "-m", mem_size};
/* invalid (zero) --socket-mem flag */
const char *argv2[] = {prgname, "-c", "10", "-n", "2",
#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 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;
git.droids-corp.org / dpdk.git / blobdiff