app: add new tests on eal flags
Signed-off-by: Intel
This commit is contained in:
parent
104a92bd02
commit
45f1b6e868
@ -79,6 +79,9 @@ do_recursive_call(void)
|
||||
{ "test_invalid_b_flag", no_action },
|
||||
{ "test_invalid_r_flag", no_action },
|
||||
{ "test_misc_flags", no_action },
|
||||
{ "test_memory_flags", no_action },
|
||||
{ "test_file_prefix", no_action },
|
||||
{ "test_no_huge_flag", no_action },
|
||||
};
|
||||
|
||||
if (recursive_call == NULL)
|
||||
|
@ -40,10 +40,14 @@
|
||||
#ifndef RTE_EXEC_ENV_BAREMETAL
|
||||
#include <string.h>
|
||||
#include <stdarg.h>
|
||||
#include <libgen.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <errno.h>
|
||||
#include <unistd.h>
|
||||
#include <dirent.h>
|
||||
#include <sys/wait.h>
|
||||
#include <sys/file.h>
|
||||
|
||||
#include <rte_debug.h>
|
||||
#include <rte_string_fns.h>
|
||||
@ -54,9 +58,212 @@
|
||||
#define no_hpet "--no-hpet"
|
||||
#define no_huge "--no-huge"
|
||||
#define no_shconf "--no-shconf"
|
||||
#define memtest "memtest"
|
||||
#define memtest1 "memtest1"
|
||||
#define memtest2 "memtest2"
|
||||
#define SOCKET_MEM_STRLEN (RTE_MAX_NUMA_NODES * 10)
|
||||
#define launch_proc(ARGV) process_dup(ARGV, \
|
||||
sizeof(ARGV)/(sizeof(ARGV[0])), __func__)
|
||||
|
||||
enum hugepage_action {
|
||||
HUGEPAGE_CHECK_EXISTS = 0,
|
||||
HUGEPAGE_CHECK_LOCKED,
|
||||
HUGEPAGE_DELETE,
|
||||
HUGEPAGE_INVALID
|
||||
};
|
||||
|
||||
/* if string contains a hugepage path */
|
||||
static int
|
||||
get_hugepage_path(char * src, int src_len, char * dst, int dst_len)
|
||||
{
|
||||
#define NUM_TOKENS 4
|
||||
char *tokens[NUM_TOKENS];
|
||||
|
||||
/* if we couldn't properly split the string */
|
||||
if (rte_strsplit(src, src_len, tokens, NUM_TOKENS, ' ') < NUM_TOKENS)
|
||||
return 0;
|
||||
|
||||
if (strncmp(tokens[2], "hugetlbfs", sizeof("hugetlbfs")) == 0) {
|
||||
rte_snprintf(dst, dst_len, "%s", tokens[1]);
|
||||
return 1;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
/*
|
||||
* Cycles through hugepage directories and looks for hugepage
|
||||
* files associated with a given prefix. Depending on value of
|
||||
* action, the hugepages are checked if they exist, checked if
|
||||
* they can be locked, or are simply deleted.
|
||||
*
|
||||
* Returns 1 if it finds at least one hugepage matching the action
|
||||
* Returns 0 if no matching hugepages were found
|
||||
* Returns -1 if it encounters an error
|
||||
*/
|
||||
static int
|
||||
process_hugefiles(const char * prefix, enum hugepage_action action)
|
||||
{
|
||||
FILE * hugedir_handle = NULL;
|
||||
DIR * hugepage_dir = NULL;
|
||||
struct dirent *dirent = NULL;
|
||||
|
||||
char hugefile_prefix[PATH_MAX] = {0};
|
||||
char hugedir[PATH_MAX] = {0};
|
||||
char line[PATH_MAX] = {0};
|
||||
|
||||
int fd, lck_result, result = 0;
|
||||
|
||||
const int prefix_len = rte_snprintf(hugefile_prefix,
|
||||
sizeof(hugefile_prefix), "%smap_", prefix);
|
||||
if (prefix_len <= 0 || prefix_len >= (int)sizeof(hugefile_prefix)) {
|
||||
printf("Error creating hugefile filename prefix\n");
|
||||
return -1;
|
||||
}
|
||||
|
||||
/* get hugetlbfs mountpoints from /proc/mounts */
|
||||
hugedir_handle = fopen("/proc/mounts", "r");
|
||||
|
||||
if (hugedir_handle == NULL) {
|
||||
printf("Error parsing /proc/mounts!\n");
|
||||
return -1;
|
||||
}
|
||||
|
||||
/* read and parse script output */
|
||||
while (fgets(line, sizeof(line), hugedir_handle) != NULL) {
|
||||
|
||||
/* check if we have a hugepage filesystem path */
|
||||
if (!get_hugepage_path(line, sizeof(line), hugedir, sizeof(hugedir)))
|
||||
continue;
|
||||
|
||||
/* check if directory exists */
|
||||
if ((hugepage_dir = opendir(hugedir)) == NULL) {
|
||||
fclose(hugedir_handle);
|
||||
printf("Error reading %s: %s\n", hugedir, strerror(errno));
|
||||
return -1;
|
||||
}
|
||||
|
||||
while ((dirent = readdir(hugepage_dir)) != NULL) {
|
||||
if (memcmp(dirent->d_name, hugefile_prefix, prefix_len) != 0)
|
||||
continue;
|
||||
|
||||
switch (action) {
|
||||
case HUGEPAGE_CHECK_EXISTS:
|
||||
{
|
||||
/* file exists, return */
|
||||
result = 1;
|
||||
goto end;
|
||||
}
|
||||
break;
|
||||
case HUGEPAGE_DELETE:
|
||||
{
|
||||
char file_path[PATH_MAX] = {0};
|
||||
|
||||
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",
|
||||
dirent->d_name, strerror(errno));
|
||||
closedir(hugepage_dir);
|
||||
result = -1;
|
||||
goto end;
|
||||
}
|
||||
result = 1;
|
||||
}
|
||||
break;
|
||||
case HUGEPAGE_CHECK_LOCKED:
|
||||
{
|
||||
/* try and lock the file */
|
||||
fd = openat(dirfd(hugepage_dir), dirent->d_name, O_RDONLY);
|
||||
|
||||
/* this shouldn't happen */
|
||||
if (fd == -1) {
|
||||
printf("Error opening %s - %s!\n",
|
||||
dirent->d_name, strerror(errno));
|
||||
closedir(hugepage_dir);
|
||||
result = -1;
|
||||
goto end;
|
||||
}
|
||||
|
||||
/* non-blocking lock */
|
||||
lck_result = flock(fd, LOCK_EX | LOCK_NB);
|
||||
|
||||
/* if lock succeeds, there's something wrong */
|
||||
if (lck_result != -1) {
|
||||
result = 0;
|
||||
|
||||
/* unlock the resulting lock */
|
||||
flock(fd, LOCK_UN);
|
||||
close(fd);
|
||||
closedir(hugepage_dir);
|
||||
goto end;
|
||||
}
|
||||
result = 1;
|
||||
close(fd);
|
||||
}
|
||||
break;
|
||||
/* shouldn't happen */
|
||||
default:
|
||||
goto end;
|
||||
} /* switch */
|
||||
|
||||
} /* read hugepage directory */
|
||||
closedir(hugepage_dir);
|
||||
} /* read /proc/mounts */
|
||||
end:
|
||||
fclose(hugedir_handle);
|
||||
return result;
|
||||
}
|
||||
|
||||
/*
|
||||
* count the number of "node*" files in /sys/devices/system/node/
|
||||
*/
|
||||
static int
|
||||
get_number_of_sockets(void)
|
||||
{
|
||||
struct dirent *dirent = NULL;
|
||||
const char * nodedir = "/sys/devices/system/node/";
|
||||
DIR * dir = NULL;
|
||||
int result = 0;
|
||||
|
||||
/* check if directory exists */
|
||||
if ((dir = opendir(nodedir)) == NULL) {
|
||||
printf("Error opening %s: %s\n", nodedir, strerror(errno));
|
||||
return -1;
|
||||
}
|
||||
|
||||
while ((dirent = readdir(dir)) != NULL)
|
||||
if (strncmp(dirent->d_name, "node", sizeof("node") - 1) == 0)
|
||||
result++;
|
||||
|
||||
closedir(dir);
|
||||
return result;
|
||||
}
|
||||
|
||||
static char*
|
||||
get_current_prefix(char * prefix, int size)
|
||||
{
|
||||
char path[PATH_MAX] = {0};
|
||||
char buf[PATH_MAX] = {0};
|
||||
|
||||
/* get file for config (fd is always 3) */
|
||||
rte_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));
|
||||
|
||||
/* 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]);
|
||||
|
||||
return prefix;
|
||||
}
|
||||
|
||||
/*
|
||||
* Test that the app doesn't run without invalid blacklist option.
|
||||
* Final test ensures it does run with valid options as sanity check
|
||||
@ -64,16 +271,23 @@
|
||||
static int
|
||||
test_invalid_b_flag(void)
|
||||
{
|
||||
const char *blinval[][8] = {
|
||||
{prgname, mp_flag, "-n", "1", "-c", "1", "-b", "error"},
|
||||
{prgname, mp_flag, "-n", "1", "-c", "1", "-b", "0:0:0"},
|
||||
{prgname, mp_flag, "-n", "1", "-c", "1", "-b", "0:error:0.1"},
|
||||
{prgname, mp_flag, "-n", "1", "-c", "1", "-b", "0:0:0.1error"},
|
||||
{prgname, mp_flag, "-n", "1", "-c", "1", "-b", "error0:0:0.1"},
|
||||
{prgname, mp_flag, "-n", "1", "-c", "1", "-b", "0:0:0.1.2"},
|
||||
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);
|
||||
|
||||
const char *blinval[][9] = {
|
||||
{prgname, prefix, mp_flag, "-n", "1", "-c", "1", "-b", "error"},
|
||||
{prgname, prefix, mp_flag, "-n", "1", "-c", "1", "-b", "0:0:0"},
|
||||
{prgname, prefix, mp_flag, "-n", "1", "-c", "1", "-b", "0:error:0.1"},
|
||||
{prgname, prefix, mp_flag, "-n", "1", "-c", "1", "-b", "0:0:0.1error"},
|
||||
{prgname, prefix, mp_flag, "-n", "1", "-c", "1", "-b", "error0:0:0.1"},
|
||||
{prgname, prefix, mp_flag, "-n", "1", "-c", "1", "-b", "0:0:0.1.2"},
|
||||
};
|
||||
/* Test with valid blacklist option */
|
||||
const char *blval[] = {prgname, mp_flag, "-n", "1", "-c", "1", "-b", "FF:09:0B.3"};
|
||||
const char *blval[] = {prgname, prefix, mp_flag, "-n", "1", "-c", "1", "-b", "FF:09:0B.3"};
|
||||
|
||||
int i;
|
||||
|
||||
@ -98,14 +312,21 @@ test_invalid_b_flag(void)
|
||||
static int
|
||||
test_invalid_r_flag(void)
|
||||
{
|
||||
const char *rinval[][8] = {
|
||||
{prgname, mp_flag, "-n", "1", "-c", "1", "-r", "error"},
|
||||
{prgname, mp_flag, "-n", "1", "-c", "1", "-r", "0"},
|
||||
{prgname, mp_flag, "-n", "1", "-c", "1", "-r", "-1"},
|
||||
{prgname, mp_flag, "-n", "1", "-c", "1", "-r", "17"},
|
||||
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);
|
||||
|
||||
const char *rinval[][9] = {
|
||||
{prgname, prefix, mp_flag, "-n", "1", "-c", "1", "-r", "error"},
|
||||
{prgname, prefix, mp_flag, "-n", "1", "-c", "1", "-r", "0"},
|
||||
{prgname, prefix, mp_flag, "-n", "1", "-c", "1", "-r", "-1"},
|
||||
{prgname, prefix, mp_flag, "-n", "1", "-c", "1", "-r", "17"},
|
||||
};
|
||||
/* Test with valid blacklist option */
|
||||
const char *rval[] = {prgname, mp_flag, "-n", "1", "-c", "1", "-r", "16"};
|
||||
const char *rval[] = {prgname, prefix, mp_flag, "-n", "1", "-c", "1", "-r", "16"};
|
||||
|
||||
int i;
|
||||
|
||||
@ -130,14 +351,21 @@ test_invalid_r_flag(void)
|
||||
static int
|
||||
test_missing_c_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);
|
||||
|
||||
/* -c flag but no coremask value */
|
||||
const char *argv1[] = { prgname, mp_flag, "-n", "3", "-c"};
|
||||
const char *argv1[] = { prgname, prefix, mp_flag, "-n", "3", "-c"};
|
||||
/* No -c flag at all */
|
||||
const char *argv2[] = { prgname, mp_flag, "-n", "3"};
|
||||
const char *argv2[] = { prgname, prefix, mp_flag, "-n", "3"};
|
||||
/* bad coremask value */
|
||||
const char *argv3[] = { prgname, 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, mp_flag, "-n", "3", "-c", "1" };
|
||||
const char *argv4[] = { prgname, prefix, mp_flag, "-n", "3", "-c", "1" };
|
||||
|
||||
if (launch_proc(argv1) == 0
|
||||
|| launch_proc(argv2) == 0
|
||||
@ -161,16 +389,23 @@ test_missing_c_flag(void)
|
||||
static int
|
||||
test_missing_n_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);
|
||||
|
||||
/* -n flag but no value */
|
||||
const char *argv1[] = { prgname, no_huge, no_shconf, "-c", "1", "-n"};
|
||||
const char *argv1[] = { prgname, prefix, no_huge, no_shconf, "-c", "1", "-n"};
|
||||
/* No -n flag at all */
|
||||
const char *argv2[] = { prgname, no_huge, no_shconf, "-c", "1"};
|
||||
const char *argv2[] = { prgname, prefix, no_huge, no_shconf, "-c", "1"};
|
||||
/* bad numeric value */
|
||||
const char *argv3[] = { prgname, no_huge, no_shconf, "-c", "1", "-n", "e" };
|
||||
const char *argv3[] = { prgname, prefix, no_huge, no_shconf, "-c", "1", "-n", "e" };
|
||||
/* out-of-range value */
|
||||
const char *argv4[] = { prgname, no_huge, no_shconf, "-c", "1", "-n", "9" };
|
||||
const char *argv4[] = { prgname, prefix, no_huge, no_shconf, "-c", "1", "-n", "9" };
|
||||
/* sanity test - check with good value */
|
||||
const char *argv5[] = { prgname, no_huge, no_shconf, "-c", "1", "-n", "2" };
|
||||
const char *argv5[] = { prgname, prefix, no_huge, no_shconf, "-c", "1", "-n", "2" };
|
||||
|
||||
if (launch_proc(argv1) == 0
|
||||
|| launch_proc(argv2) == 0
|
||||
@ -192,10 +427,17 @@ test_missing_n_flag(void)
|
||||
static int
|
||||
test_no_hpet_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);
|
||||
|
||||
/* With --no-hpet */
|
||||
const char *argv1[] = {prgname, mp_flag, no_hpet, "-c", "1", "-n", "2"};
|
||||
const char *argv1[] = {prgname, prefix, mp_flag, no_hpet, "-c", "1", "-n", "2"};
|
||||
/* Without --no-hpet */
|
||||
const char *argv2[] = {prgname, mp_flag, "-c", "1", "-n", "2"};
|
||||
const char *argv2[] = {prgname, prefix, mp_flag, "-c", "1", "-n", "2"};
|
||||
|
||||
if (launch_proc(argv1) != 0) {
|
||||
printf("Error - process did not run ok with --no-hpet flag\n");
|
||||
@ -208,22 +450,75 @@ test_no_hpet_flag(void)
|
||||
return 0;
|
||||
}
|
||||
|
||||
/*
|
||||
* Test that the app runs with --no-huge and doesn't run when either
|
||||
* -m or --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);
|
||||
|
||||
/* With --no-huge */
|
||||
const char *argv1[] = {prgname, prefix, no_huge, "-c", "1", "-n", "2",
|
||||
"--file-prefix=nohuge"};
|
||||
/* With --no-huge and -m */
|
||||
const char *argv2[] = {prgname, prefix, no_huge, "-c", "1", "-n", "2", "-m", "2",
|
||||
"--file-prefix=nohuge"};
|
||||
/* With --no-huge and --socket-mem */
|
||||
const char *argv3[] = {prgname, prefix, no_huge, "-c", "1", "-n", "2",
|
||||
"--socket-mem=2", "--file-prefix=nohuge"};
|
||||
/* 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"};
|
||||
|
||||
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");
|
||||
return -1;
|
||||
}
|
||||
if (launch_proc(argv3) == 0) {
|
||||
printf("Error - process run ok with --no-huge and --socket-mem "
|
||||
"flags\n");
|
||||
return -1;
|
||||
}
|
||||
if (launch_proc(argv4) == 0) {
|
||||
printf("Error - process run ok with --no-huge, -m and "
|
||||
"--socket-mem flags\n");
|
||||
return -1;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int
|
||||
test_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, mp_flag, "-c", "1", "--invalid-opt"};
|
||||
const char *argv0[] = {prgname, prefix, mp_flag, "-c", "1", "--invalid-opt"};
|
||||
|
||||
/* With --no-pci */
|
||||
const char *argv1[] = {prgname, mp_flag, "-c", "1", "--no-pci"};
|
||||
const char *argv1[] = {prgname, prefix, mp_flag, "-c", "1", "--no-pci"};
|
||||
/* With -v */
|
||||
const char *argv2[] = {prgname, mp_flag, "-c", "1", "-v"};
|
||||
/* With -m - ignored for secondary processes */
|
||||
const char *argv3[] = {prgname, mp_flag, "-c", "1", "-m", "32"};
|
||||
const char *argv2[] = {prgname, prefix, mp_flag, "-c", "1", "-v"};
|
||||
|
||||
if (launch_proc(argv0) == 0) {
|
||||
printf("Error - process ran ok with invalid flag\n");
|
||||
@ -237,10 +532,274 @@ test_misc_flags(void)
|
||||
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 -m flag\n");
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int
|
||||
test_file_prefix(void)
|
||||
{
|
||||
/*
|
||||
* 1. check if current process hugefiles are locked
|
||||
* 2. try to run secondary process without a corresponding primary process
|
||||
* (while failing to run, it will also remove any unused hugepage files)
|
||||
* 3. check if current process hugefiles are still in place and are locked
|
||||
* 4. run a primary process with memtest1 prefix
|
||||
* 5. check if memtest1 hugefiles are created
|
||||
* 6. run a primary process with memtest2 prefix
|
||||
* 7. check that only memtest2 hugefiles are present in the hugedir
|
||||
*/
|
||||
|
||||
/* 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 };
|
||||
|
||||
/* primary process with memtest1 */
|
||||
const char *argv1[] = {prgname, "-c", "1", "-n", "2", "-m", "2",
|
||||
"--file-prefix=" memtest1 };
|
||||
|
||||
/* primary process with memtest2 */
|
||||
const char *argv2[] = {prgname, "-c", "1", "-n", "2", "-m", "2",
|
||||
"--file-prefix=" memtest2 };
|
||||
|
||||
char prefix[32];
|
||||
if (get_current_prefix(prefix, sizeof(prefix)) == NULL) {
|
||||
printf("Error - unable to get current prefix!\n");
|
||||
return -1;
|
||||
}
|
||||
|
||||
/* check if files for current prefix are present */
|
||||
if (process_hugefiles(prefix, HUGEPAGE_CHECK_EXISTS) != 1) {
|
||||
printf("Error - hugepage files for %s were not created!\n", prefix);
|
||||
return -1;
|
||||
}
|
||||
|
||||
/* checks if files for current prefix are locked */
|
||||
if (process_hugefiles(prefix, HUGEPAGE_CHECK_LOCKED) != 1) {
|
||||
printf("Error - hugepages for current process aren't locked!\n");
|
||||
return -1;
|
||||
}
|
||||
|
||||
/* check if files for secondary process are present */
|
||||
if (process_hugefiles(memtest, HUGEPAGE_CHECK_EXISTS) == 1) {
|
||||
/* check if they are not locked */
|
||||
if (process_hugefiles(memtest, HUGEPAGE_CHECK_LOCKED) == 1) {
|
||||
printf("Error - hugepages for current process are locked!\n");
|
||||
return -1;
|
||||
}
|
||||
/* they aren't locked, delete them */
|
||||
else {
|
||||
if (process_hugefiles(memtest, HUGEPAGE_DELETE) != 1) {
|
||||
printf("Error - deleting hugepages failed!\n");
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (launch_proc(argv0) == 0) {
|
||||
printf("Error - secondary process ran ok without primary process\n");
|
||||
return -1;
|
||||
}
|
||||
|
||||
/* check if files for current prefix are present */
|
||||
if (process_hugefiles(prefix, HUGEPAGE_CHECK_EXISTS) != 1) {
|
||||
printf("Error - hugepage files for %s were not created!\n", prefix);
|
||||
return -1;
|
||||
}
|
||||
|
||||
/* checks if files for current prefix are locked */
|
||||
if (process_hugefiles(prefix, HUGEPAGE_CHECK_LOCKED) != 1) {
|
||||
printf("Error - hugepages for current process aren't locked!\n");
|
||||
return -1;
|
||||
}
|
||||
|
||||
if (launch_proc(argv1) != 0) {
|
||||
printf("Error - failed to run with --file-prefix=%s\n", memtest);
|
||||
return -1;
|
||||
}
|
||||
|
||||
/* check if memtest1_map0 is present */
|
||||
if (process_hugefiles(memtest1, HUGEPAGE_CHECK_EXISTS) != 1) {
|
||||
printf("Error - hugepage files for %s were not created!\n", memtest1);
|
||||
return -1;
|
||||
}
|
||||
|
||||
if (launch_proc(argv2) != 0) {
|
||||
printf("Error - failed to run with --file-prefix=%s\n", memtest2);
|
||||
return -1;
|
||||
}
|
||||
|
||||
/* check if hugefiles for memtest2 are present */
|
||||
if (process_hugefiles(memtest2, HUGEPAGE_CHECK_EXISTS) != 1) {
|
||||
printf("Error - hugepage files for %s were not created!\n", memtest2);
|
||||
return -1;
|
||||
}
|
||||
|
||||
/* check if hugefiles for memtest1 are present */
|
||||
if (process_hugefiles(memtest1, HUGEPAGE_CHECK_EXISTS) != 0) {
|
||||
printf("Error - hugepage files for %s were not deleted!\n", memtest1);
|
||||
return -1;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
/*
|
||||
* Tests for correct handling of -m and --socket-mem flags
|
||||
*/
|
||||
static int
|
||||
test_memory_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);
|
||||
|
||||
/* 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"};
|
||||
|
||||
/* invalid (zero) --socket-mem flag */
|
||||
const char *argv2[] = {prgname, "-c", "10", "-n", "2",
|
||||
"--file-prefix=" memtest, "--socket-mem=0,0,0,0"};
|
||||
|
||||
/* invalid (incomplete) --socket-mem flag */
|
||||
const char *argv3[] = {prgname, "-c", "10", "-n", "2",
|
||||
"--file-prefix=" memtest, "--socket-mem=2,2,"};
|
||||
|
||||
/* invalid (mixed with invalid data) --socket-mem flag */
|
||||
const char *argv4[] = {prgname, "-c", "10", "-n", "2",
|
||||
"--file-prefix=" memtest, "--socket-mem=2,2,Fred"};
|
||||
|
||||
/* invalid (with numeric value as last character) --socket-mem flag */
|
||||
const char *argv5[] = {prgname, "-c", "10", "-n", "2",
|
||||
"--file-prefix=" memtest, "--socket-mem=2,2,Fred0"};
|
||||
|
||||
/* invalid (with empty socket) --socket-mem flag */
|
||||
const char *argv6[] = {prgname, "-c", "10", "-n", "2",
|
||||
"--file-prefix=" memtest, "--socket-mem=2,,2"};
|
||||
|
||||
/* invalid (null) --socket-mem flag */
|
||||
const char *argv7[] = {prgname, "-c", "10", "-n", "2",
|
||||
"--file-prefix=" memtest, "--socket-mem="};
|
||||
|
||||
/* 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"};
|
||||
|
||||
/* 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 */
|
||||
int i, num_sockets = get_number_of_sockets();
|
||||
|
||||
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=");
|
||||
|
||||
/* 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);
|
||||
|
||||
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);
|
||||
}
|
||||
}
|
||||
|
||||
/* 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=");
|
||||
|
||||
/* 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);
|
||||
|
||||
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);
|
||||
}
|
||||
}
|
||||
|
||||
/* invalid --socket-mem flag (with extra socket) */
|
||||
const char *argv9[] = {prgname, "-c", "10", "-n", "2",
|
||||
"--file-prefix=" memtest, invalid_socket_mem};
|
||||
|
||||
/* valid --socket-mem flag */
|
||||
const char *argv10[] = {prgname, "-c", "10", "-n", "2",
|
||||
"--file-prefix=" memtest, valid_socket_mem};
|
||||
|
||||
if (launch_proc(argv0) != 0) {
|
||||
printf("Error - process failed with valid -m flag!\n");
|
||||
return -1;
|
||||
}
|
||||
|
||||
if (launch_proc(argv1) != 0) {
|
||||
printf("Error - secondary process failed with valid -m flag !\n");
|
||||
return -1;
|
||||
}
|
||||
|
||||
if (launch_proc(argv2) == 0) {
|
||||
printf("Error - process run ok with invalid (zero) --socket-mem!\n");
|
||||
return -1;
|
||||
}
|
||||
|
||||
if (launch_proc(argv3) == 0) {
|
||||
printf("Error - process run ok with invalid "
|
||||
"(incomplete) --socket-mem!\n");
|
||||
return -1;
|
||||
}
|
||||
|
||||
if (launch_proc(argv4) == 0) {
|
||||
printf("Error - process run ok with invalid "
|
||||
"(mixed with invalid input) --socket-mem!\n");
|
||||
return -1;
|
||||
}
|
||||
|
||||
if (launch_proc(argv5) == 0) {
|
||||
printf("Error - process run ok with invalid "
|
||||
"(mixed with invalid input with a numeric value as "
|
||||
"last character) --socket-mem!\n");
|
||||
return -1;
|
||||
}
|
||||
|
||||
if (launch_proc(argv6) == 0) {
|
||||
printf("Error - process run ok with invalid "
|
||||
"(with empty socket) --socket-mem!\n");
|
||||
return -1;
|
||||
}
|
||||
|
||||
if (launch_proc(argv7) == 0) {
|
||||
printf("Error - process run ok with invalid (null) --socket-mem!\n");
|
||||
return -1;
|
||||
}
|
||||
|
||||
if (launch_proc(argv8) == 0) {
|
||||
printf("Error - process run ok with --socket-mem and -m specified!\n");
|
||||
return -1;
|
||||
}
|
||||
|
||||
if (launch_proc(argv9) == 0) {
|
||||
printf("Error - process run ok with extra socket in --socket-mem!\n");
|
||||
return -1;
|
||||
}
|
||||
|
||||
if (launch_proc(argv10) != 0) {
|
||||
printf("Error - process failed with valid --socket-mem!\n");
|
||||
return -1;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
@ -251,31 +810,49 @@ test_eal_flags(void)
|
||||
|
||||
ret = test_missing_c_flag();
|
||||
if (ret < 0) {
|
||||
printf("Error in test_missing_c_flag()");
|
||||
printf("Error in test_missing_c_flag()\n");
|
||||
return ret;
|
||||
}
|
||||
|
||||
ret = test_missing_n_flag();
|
||||
if (ret < 0) {
|
||||
printf("Error in test_missing_n_flag()");
|
||||
printf("Error in test_missing_n_flag()\n");
|
||||
return ret;
|
||||
}
|
||||
|
||||
ret = test_no_hpet_flag();
|
||||
if (ret < 0) {
|
||||
printf("Error in test_no_hpet_flag()");
|
||||
printf("Error in test_no_hpet_flag()\n");
|
||||
return ret;
|
||||
}
|
||||
|
||||
ret = test_no_huge_flag();
|
||||
if (ret < 0) {
|
||||
printf("Error in test_no_huge_flag()\n");
|
||||
return ret;
|
||||
}
|
||||
|
||||
ret = test_invalid_b_flag();
|
||||
if (ret < 0) {
|
||||
printf("Error in test_invalid_b_flag()");
|
||||
printf("Error in test_invalid_b_flag()\n");
|
||||
return ret;
|
||||
}
|
||||
|
||||
ret = test_invalid_r_flag();
|
||||
if (ret < 0) {
|
||||
printf("Error in test_invalid_r_flag()");
|
||||
printf("Error in test_invalid_r_flag()\n");
|
||||
return ret;
|
||||
}
|
||||
|
||||
ret = test_memory_flags();
|
||||
if (ret < 0) {
|
||||
printf("Error in test_memory_flags()\n");
|
||||
return ret;
|
||||
}
|
||||
|
||||
ret = test_file_prefix();
|
||||
if (ret < 0) {
|
||||
printf("Error in test_file_prefix()\n");
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user