X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=app%2Ftest%2Ftest_eal_flags.c;h=298c11a461b19a8bb01a7c9548b91b9c60232b91;hb=3031749c2df04a63cdcef186dcce3781e61436e8;hp=5517f865ee808bc0918a7f620f0030ea59dee8c1;hpb=e9d48c0072d36eb6423b45fba4ec49d0def6c36f;p=dpdk.git diff --git a/app/test/test_eal_flags.c b/app/test/test_eal_flags.c index 5517f865ee..298c11a461 100644 --- a/app/test/test_eal_flags.c +++ b/app/test/test_eal_flags.c @@ -1,13 +1,14 @@ /*- * 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 @@ -17,7 +18,7 @@ * * 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 @@ -32,8 +33,6 @@ */ #include -#include - #include "test.h" #ifndef RTE_EXEC_ENV_BAREMETAL @@ -47,6 +46,7 @@ #include #include #include +#include #include #include @@ -57,7 +57,8 @@ #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" @@ -161,7 +162,7 @@ process_hugefiles(const char * prefix, enum hugepage_action action) rte_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", @@ -217,6 +218,7 @@ end: return result; } +#ifdef RTE_EXEC_ENV_LINUXAPP /* * count the number of "node*" files in /sys/devices/system/node/ */ @@ -246,6 +248,7 @@ get_number_of_sockets(void) closedir(dir); return result; } +#endif static char* get_current_prefix(char * prefix, int size) @@ -270,20 +273,6 @@ get_current_prefix(char * prefix, int size) 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 @@ -293,37 +282,44 @@ static int 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); +#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", +#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) { @@ -345,32 +341,6 @@ test_whitelist_flag(void) 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; } @@ -381,12 +351,17 @@ test_whitelist_flag(void) 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); +#endif const char *blinval[][9] = { {prgname, prefix, mp_flag, "-n", "1", "-c", "1", "-b", "error"}, @@ -422,12 +397,17 @@ test_invalid_b_flag(void) 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); +#endif const char *rinval[][9] = { {prgname, prefix, mp_flag, "-n", "1", "-c", "1", "-r", "error"}, @@ -461,12 +441,17 @@ test_invalid_r_flag(void) 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); +#endif /* -c flag but no coremask value */ const char *argv1[] = { prgname, prefix, mp_flag, "-n", "3", "-c"}; @@ -499,12 +484,17 @@ test_missing_c_flag(void) static int test_missing_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); +#endif /* -n flag but no value */ const char *argv1[] = { prgname, prefix, no_huge, no_shconf, "-c", "1", "-n"}; @@ -538,6 +528,10 @@ static int 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; @@ -567,26 +561,25 @@ test_no_hpet_flag(void) 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", "2"}; + /* 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=2"}; /* 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", "2", "--socket-mem=2"}; if (launch_proc(argv1) != 0) { printf("Error - process did not run ok with --no-huge flag\n"); return -1; @@ -595,6 +588,11 @@ test_no_huge_flag(void) printf("Error - process 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"); @@ -608,15 +606,86 @@ test_no_huge_flag(void) 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) { - 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; @@ -654,6 +723,7 @@ test_misc_flags(void) printf("No mounted hugepage dir found!\n"); return -1; } +#endif /* check that some general flags don't prevent things from working. @@ -676,7 +746,11 @@ test_misc_flags(void) 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" }; + 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", "--file-prefix=hugedir", "--huge-dir", hugepath}; @@ -690,6 +764,10 @@ 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"); @@ -719,6 +797,9 @@ test_misc_flags(void) 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; @@ -735,8 +816,13 @@ test_misc_flags(void) 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) @@ -752,6 +838,10 @@ 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", "--file-prefix=" memtest }; @@ -769,6 +859,9 @@ 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) { @@ -852,20 +945,32 @@ test_file_prefix(void) 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 = ""; +#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); +#endif +#ifdef RTE_LIBRTE_XEN_DOM0 + mem_size = "30"; +#else + mem_size = "2"; +#endif - /* valid -m flag */ - const char *argv0[] = {prgname, "-c", "10", "-n", "2", - "--file-prefix=" memtest, "-m", "2"}; /* 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", @@ -899,7 +1004,12 @@ test_memory_flags(void) * 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"); @@ -944,15 +1054,22 @@ test_memory_flags(void) "--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; @@ -1065,7 +1182,11 @@ test_eal_flags(void) 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;