From: David Marchand <david.marchand@redhat.com>
To: dev@dpdk.org
Cc: thomas@monjalon.net, aconole@redhat.com, msantana@redhat.com
Subject: [dpdk-dev] [PATCH 10/14] test/eal: set core mask/list config only in dedicated test
Date: Tue, 4 Jun 2019 10:59:48 +0200 [thread overview]
Message-ID: <1559638792-8608-11-git-send-email-david.marchand@redhat.com> (raw)
In-Reply-To: <1559638792-8608-1-git-send-email-david.marchand@redhat.com>
Setting a coremask was mandatory a long time ago but has been optional
for a while.
The checks on PCI whitelist/blacklist, vdev, memory rank, memory channel,
HPET, memory size and other miscs options have no requirement wrt cores.
Let's remove those coremasks so that we only care about it in the
dedicated checks.
Signed-off-by: David Marchand <david.marchand@redhat.com>
---
app/test/test_eal_flags.c | 141 ++++++++++++++++++++++++----------------------
1 file changed, 73 insertions(+), 68 deletions(-)
diff --git a/app/test/test_eal_flags.c b/app/test/test_eal_flags.c
index e82e56a..5e11b9f 100644
--- a/app/test/test_eal_flags.c
+++ b/app/test/test_eal_flags.c
@@ -245,25 +245,25 @@ enum hugepage_action {
#endif
const char *wlinval[][11] = {
- {prgname, prefix, mp_flag, "-c", "1",
+ {prgname, prefix, mp_flag,
pci_whitelist, "error", "", ""},
- {prgname, prefix, mp_flag, "-c", "1",
+ {prgname, prefix, mp_flag,
pci_whitelist, "0:0:0", "", ""},
- {prgname, prefix, mp_flag, "-c", "1",
+ {prgname, prefix, mp_flag,
pci_whitelist, "0:error:0.1", "", ""},
- {prgname, prefix, mp_flag, "-c", "1",
+ {prgname, prefix, mp_flag,
pci_whitelist, "0:0:0.1error", "", ""},
- {prgname, prefix, mp_flag, "-c", "1",
+ {prgname, prefix, mp_flag,
pci_whitelist, "error0:0:0.1", "", ""},
- {prgname, prefix, mp_flag, "-c", "1",
+ {prgname, prefix, mp_flag,
pci_whitelist, "0:0:0.1.2", "", ""},
};
/* Test with valid whitelist option */
- const char *wlval1[] = {prgname, prefix, mp_flag, "-c", "1",
+ const char *wlval1[] = {prgname, prefix, mp_flag,
pci_whitelist, "00FF:09:0B.3"};
- const char *wlval2[] = {prgname, prefix, mp_flag, "-c", "1",
+ const char *wlval2[] = {prgname, prefix, mp_flag,
pci_whitelist, "09:0B.3", pci_whitelist, "0a:0b.1"};
- const char *wlval3[] = {prgname, prefix, mp_flag, "-c", "1",
+ const char *wlval3[] = {prgname, prefix, mp_flag,
pci_whitelist, "09:0B.3,type=test",
pci_whitelist, "08:00.1,type=normal",
};
@@ -311,15 +311,15 @@ enum hugepage_action {
#endif
const char *blinval[][9] = {
- {prgname, prefix, mp_flag, "-c", "1", "-b", "error"},
- {prgname, prefix, mp_flag, "-c", "1", "-b", "0:0:0"},
- {prgname, prefix, mp_flag, "-c", "1", "-b", "0:error:0.1"},
- {prgname, prefix, mp_flag, "-c", "1", "-b", "0:0:0.1error"},
- {prgname, prefix, mp_flag, "-c", "1", "-b", "error0:0:0.1"},
- {prgname, prefix, mp_flag, "-c", "1", "-b", "0:0:0.1.2"},
+ {prgname, prefix, mp_flag, "-b", "error"},
+ {prgname, prefix, mp_flag, "-b", "0:0:0"},
+ {prgname, prefix, mp_flag, "-b", "0:error:0.1"},
+ {prgname, prefix, mp_flag, "-b", "0:0:0.1error"},
+ {prgname, prefix, mp_flag, "-b", "error0:0:0.1"},
+ {prgname, prefix, mp_flag, "-b", "0:0:0.1.2"},
};
/* Test with valid blacklist option */
- const char *blval[] = {prgname, prefix, mp_flag, "-c", "1",
+ const char *blval[] = {prgname, prefix, mp_flag,
"-b", "FF:09:0B.3"};
int i;
@@ -356,17 +356,17 @@ enum hugepage_action {
/* Test with invalid vdev option */
const char *vdevinval[] = {prgname, prefix, no_huge,
- "-c", "1", vdev, "eth_dummy"};
+ vdev, "eth_dummy"};
/* Test with valid vdev option */
const char *vdevval1[] = {prgname, prefix, no_huge,
- "-c", "1", vdev, "net_ring0"};
+ vdev, "net_ring0"};
const char *vdevval2[] = {prgname, prefix, no_huge,
- "-c", "1", vdev, "net_ring0,args=test"};
+ vdev, "net_ring0,args=test"};
const char *vdevval3[] = {prgname, prefix, no_huge,
- "-c", "1", vdev, "net_ring0,nodeaction=r1:0:CREATE"};
+ vdev, "net_ring0,nodeaction=r1:0:CREATE"};
if (launch_proc(vdevinval) == 0) {
printf("Error - process did run ok with invalid "
@@ -413,13 +413,13 @@ enum hugepage_action {
#endif
const char *rinval[][9] = {
- {prgname, prefix, mp_flag, "-c", "1", "-r", "error"},
- {prgname, prefix, mp_flag, "-c", "1", "-r", "0"},
- {prgname, prefix, mp_flag, "-c", "1", "-r", "-1"},
- {prgname, prefix, mp_flag, "-c", "1", "-r", "17"},
+ {prgname, prefix, mp_flag, "-r", "error"},
+ {prgname, prefix, mp_flag, "-r", "0"},
+ {prgname, prefix, mp_flag, "-r", "-1"},
+ {prgname, prefix, mp_flag, "-r", "17"},
};
/* Test with valid blacklist option */
- const char *rval[] = {prgname, prefix, mp_flag, "-c", "1", "-r", "16"};
+ const char *rval[] = {prgname, prefix, mp_flag, "-r", "16"};
int i;
@@ -661,15 +661,19 @@ enum hugepage_action {
#endif
/* -n flag but no value */
- const char *argv1[] = { prgname, prefix, no_huge, no_shconf, "-c", "1", "-n"};
+ const char *argv1[] = { prgname, prefix, no_huge, no_shconf,
+ "-n"};
/* bad numeric value */
- const char *argv2[] = { prgname, prefix, no_huge, no_shconf, "-c", "1", "-n", "e" };
+ const char *argv2[] = { prgname, prefix, no_huge, no_shconf,
+ "-n", "e" };
/* zero is invalid */
- const char *argv3[] = { prgname, prefix, no_huge, no_shconf, "-c", "1", "-n", "0" };
+ const char *argv3[] = { prgname, prefix, no_huge, no_shconf,
+ "-n", "0" };
/* sanity test - check with good value */
- const char *argv4[] = { prgname, prefix, no_huge, no_shconf, "-c", "1", "-n", "2" };
+ const char *argv4[] = { prgname, prefix, no_huge, no_shconf,
+ "-n", "2" };
/* sanity test - check with no -n flag */
- const char *argv5[] = { prgname, prefix, no_huge, no_shconf, "-c", "1"};
+ const char *argv5[] = { prgname, prefix, no_huge, no_shconf};
if (launch_proc(argv1) == 0
|| launch_proc(argv2) == 0
@@ -710,9 +714,9 @@ enum hugepage_action {
#endif
/* With --no-hpet */
- const char *argv1[] = {prgname, prefix, mp_flag, no_hpet, "-c", "1"};
+ const char *argv1[] = {prgname, prefix, mp_flag, no_hpet};
/* Without --no-hpet */
- const char *argv2[] = {prgname, prefix, mp_flag, "-c", "1"};
+ const char *argv2[] = {prgname, prefix, mp_flag};
if (launch_proc(argv1) != 0) {
printf("Error - process did not run ok with --no-hpet flag\n");
@@ -741,16 +745,16 @@ enum hugepage_action {
#endif
/* With --no-huge */
- const char *argv1[] = {prgname, prefix, no_huge, "-c", "1"};
+ const char *argv1[] = {prgname, prefix, no_huge};
/* With --no-huge and -m */
- const char *argv2[] = {prgname, prefix, no_huge, "-c", "1",
+ const char *argv2[] = {prgname, prefix, no_huge,
"-m", DEFAULT_MEM_SIZE};
/* With --no-huge and --socket-mem */
- const char *argv3[] = {prgname, prefix, no_huge, "-c", "1",
+ const char *argv3[] = {prgname, prefix, no_huge,
"--socket-mem=" DEFAULT_MEM_SIZE};
/* With --no-huge, -m and --socket-mem */
- const char *argv4[] = {prgname, prefix, no_huge, "-c", "1",
+ const char *argv4[] = {prgname, prefix, no_huge,
"-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");
@@ -837,55 +841,56 @@ enum hugepage_action {
* No further testing of output done.
*/
/* sanity check - failure with invalid option */
- const char *argv0[] = {prgname, prefix, mp_flag, "-c", "1", "--invalid-opt"};
+ const char *argv0[] = {prgname, prefix, mp_flag, "--invalid-opt"};
/* With --no-pci */
- const char *argv1[] = {prgname, prefix, mp_flag, "-c", "1", "--no-pci"};
+ const char *argv1[] = {prgname, prefix, mp_flag, "--no-pci"};
/* With -v */
- const char *argv2[] = {prgname, prefix, mp_flag, "-c", "1", "-v"};
+ const char *argv2[] = {prgname, prefix, mp_flag, "-v"};
/* With valid --syslog */
- const char *argv3[] = {prgname, prefix, mp_flag, "-c", "1",
+ const char *argv3[] = {prgname, prefix, mp_flag,
"--syslog", "syslog"};
/* With empty --syslog (should fail) */
- const char *argv4[] = {prgname, prefix, mp_flag, "-c", "1", "--syslog"};
+ const char *argv4[] = {prgname, prefix, mp_flag, "--syslog"};
/* With invalid --syslog */
- const char *argv5[] = {prgname, prefix, mp_flag, "-c", "1", "--syslog", "error"};
+ 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, "-c", "1", "-m", DEFAULT_MEM_SIZE,
+ const char *argv6[] = {prgname, "-m", DEFAULT_MEM_SIZE,
no_shconf, nosh_prefix, no_huge};
/* With --huge-dir */
- const char *argv7[] = {prgname, "-c", "1", "-m", DEFAULT_MEM_SIZE,
+ const char *argv7[] = {prgname, "-m", DEFAULT_MEM_SIZE,
"--file-prefix=hugedir", "--huge-dir", hugepath};
/* With empty --huge-dir (should fail) */
- const char *argv8[] = {prgname, "-c", "1", "-m", DEFAULT_MEM_SIZE,
+ const char *argv8[] = {prgname, "-m", DEFAULT_MEM_SIZE,
"--file-prefix=hugedir", "--huge-dir"};
/* With invalid --huge-dir */
- const char *argv9[] = {prgname, "-c", "1", "-m", DEFAULT_MEM_SIZE,
+ const char *argv9[] = {prgname, "-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"};
+ const char *argv10[] = {prgname, prefix, mp_flag,
+ "--huge-dir", "invalid"};
/* try running with base-virtaddr param */
const char *argv11[] = {prgname, "--file-prefix=virtaddr",
- "-c", "1", "--base-virtaddr=0x12345678"};
+ "--base-virtaddr=0x12345678"};
/* try running with --vfio-intr INTx flag */
const char *argv12[] = {prgname, "--file-prefix=intr",
- "-c", "1", "--vfio-intr=legacy"};
+ "--vfio-intr=legacy"};
/* try running with --vfio-intr MSI flag */
const char *argv13[] = {prgname, "--file-prefix=intr",
- "-c", "1", "--vfio-intr=msi"};
+ "--vfio-intr=msi"};
/* try running with --vfio-intr MSI-X flag */
const char *argv14[] = {prgname, "--file-prefix=intr",
- "-c", "1", "--vfio-intr=msix"};
+ "--vfio-intr=msix"};
/* try running with --vfio-intr invalid flag */
const char *argv15[] = {prgname, "--file-prefix=intr",
- "-c", "1", "--vfio-intr=invalid"};
+ "--vfio-intr=invalid"};
/* run all tests also applicable to FreeBSD first */
@@ -996,25 +1001,25 @@ enum hugepage_action {
#endif
/* this should fail unless the test itself is run with "memtest" prefix */
- const char *argv0[] = {prgname, mp_flag, "-c", "1", "-m",
+ const char *argv0[] = {prgname, mp_flag, "-m",
DEFAULT_MEM_SIZE, "--file-prefix=" memtest };
/* primary process with memtest1 and default mem mode */
- const char *argv1[] = {prgname, "-c", "1", "-m",
+ const char *argv1[] = {prgname, "-m",
DEFAULT_MEM_SIZE, "--file-prefix=" memtest1 };
/* primary process with memtest1 and legacy mem mode */
- const char *argv2[] = {prgname, "-c", "1", "-m",
+ const char *argv2[] = {prgname, "-m",
DEFAULT_MEM_SIZE, "--file-prefix=" memtest1,
"--legacy-mem" };
/* primary process with memtest2 and legacy mem mode */
- const char *argv3[] = {prgname, "-c", "1", "-m",
+ const char *argv3[] = {prgname, "-m",
DEFAULT_MEM_SIZE, "--file-prefix=" memtest2,
"--legacy-mem" };
/* primary process with memtest2 and default mem mode */
- const char *argv4[] = {prgname, "-c", "1", "-m",
+ const char *argv4[] = {prgname, "-m",
DEFAULT_MEM_SIZE, "--file-prefix=" memtest2 };
/* check if files for current prefix are present */
@@ -1159,39 +1164,39 @@ enum hugepage_action {
#endif
/* valid -m flag and mp flag */
- const char *argv0[] = {prgname, prefix, mp_flag, "-c", "10",
+ const char *argv0[] = {prgname, prefix, mp_flag,
"-m", DEFAULT_MEM_SIZE};
/* valid -m flag */
- const char *argv1[] = {prgname, "-c", "10",
+ const char *argv1[] = {prgname,
"--file-prefix=" memtest, "-m", DEFAULT_MEM_SIZE};
/* valid (zero) --socket-mem flag */
- const char *argv2[] = {prgname, "-c", "10",
+ const char *argv2[] = {prgname,
"--file-prefix=" memtest, "--socket-mem=0,0,0,0"};
/* invalid (incomplete) --socket-mem flag */
- const char *argv3[] = {prgname, "-c", "10",
+ const char *argv3[] = {prgname,
"--file-prefix=" memtest, "--socket-mem=2,2,"};
/* invalid (mixed with invalid data) --socket-mem flag */
- const char *argv4[] = {prgname, "-c", "10",
+ const char *argv4[] = {prgname,
"--file-prefix=" memtest, "--socket-mem=2,2,Fred"};
/* invalid (with numeric value as last character) --socket-mem flag */
- const char *argv5[] = {prgname, "-c", "10",
+ const char *argv5[] = {prgname,
"--file-prefix=" memtest, "--socket-mem=2,2,Fred0"};
/* invalid (with empty socket) --socket-mem flag */
- const char *argv6[] = {prgname, "-c", "10",
+ const char *argv6[] = {prgname,
"--file-prefix=" memtest, "--socket-mem=2,,2"};
/* invalid (null) --socket-mem flag */
- const char *argv7[] = {prgname, "-c", "10",
+ const char *argv7[] = {prgname,
"--file-prefix=" memtest, "--socket-mem="};
/* valid --socket-mem specified together with -m flag */
- const char *argv8[] = {prgname, "-c", "10",
+ const char *argv8[] = {prgname,
"--file-prefix=" memtest, "-m", DEFAULT_MEM_SIZE, "--socket-mem=2,2"};
/* construct an invalid socket mask with 2 megs on each socket plus
@@ -1243,11 +1248,11 @@ enum hugepage_action {
}
/* invalid --socket-mem flag (with extra socket) */
- const char *argv9[] = {prgname, "-c", "10",
+ const char *argv9[] = {prgname,
"--file-prefix=" memtest, invalid_socket_mem};
/* valid --socket-mem flag */
- const char *argv10[] = {prgname, "-c", "10",
+ const char *argv10[] = {prgname,
"--file-prefix=" memtest, valid_socket_mem};
if (launch_proc(argv0) != 0) {
--
1.8.3.1
next prev parent reply other threads:[~2019-06-04 9:01 UTC|newest]
Thread overview: 71+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-04 8:59 [dpdk-dev] [PATCH 00/14] Unit tests fixes for CI David Marchand
2019-06-04 8:59 ` [dpdk-dev] [PATCH 01/14] test/bonding: add missing sources for link bonding RSS David Marchand
2019-06-04 12:59 ` Aaron Conole
2019-06-04 8:59 ` [dpdk-dev] [PATCH 02/14] test/crypto: move tests to the driver specific list David Marchand
2019-06-04 13:00 ` Aaron Conole
2019-06-04 8:59 ` [dpdk-dev] [PATCH 03/14] test/eventdev: " David Marchand
2019-06-04 13:04 ` Aaron Conole
2019-06-04 8:59 ` [dpdk-dev] [PATCH 04/14] test/hash: fix off-by-one check on core count David Marchand
2019-06-04 13:05 ` Aaron Conole
2019-06-05 20:02 ` Wang, Yipeng1
2019-06-04 8:59 ` [dpdk-dev] [PATCH 05/14] test/hash: rectify slaveid to point to valid cores David Marchand
2019-06-05 20:02 ` Wang, Yipeng1
2019-06-04 8:59 ` [dpdk-dev] [PATCH 06/14] test/hash: clean remaining trace of scaling autotest David Marchand
2019-06-04 13:31 ` Aaron Conole
2019-06-04 8:59 ` [dpdk-dev] [PATCH 07/14] test/latencystats: fix stack smashing David Marchand
2019-06-04 13:38 ` Aaron Conole
2019-06-04 8:59 ` [dpdk-dev] [PATCH 08/14] test/stack: fix lock-free test name David Marchand
2019-06-04 13:06 ` Aaron Conole
2019-06-04 8:59 ` [dpdk-dev] [PATCH 09/14] test/eal: set memory channel config only in dedicated test David Marchand
2019-06-04 13:11 ` Aaron Conole
2019-06-26 9:44 ` Burakov, Anatoly
2019-06-04 8:59 ` David Marchand [this message]
2019-06-04 13:12 ` [dpdk-dev] [PATCH 10/14] test/eal: set core mask/list " Aaron Conole
2019-06-26 9:45 ` Burakov, Anatoly
2019-06-04 8:59 ` [dpdk-dev] [PATCH 11/14] test/eal: check number of cores before running subtests David Marchand
2019-06-04 13:26 ` Aaron Conole
2019-06-26 9:47 ` Burakov, Anatoly
2019-06-04 8:59 ` [dpdk-dev] [PATCH 12/14] test/eal: make the test pass again David Marchand
2019-06-04 13:29 ` Aaron Conole
2019-06-04 13:50 ` David Marchand
2019-06-26 9:49 ` Burakov, Anatoly
2019-06-26 10:03 ` David Marchand
2019-06-04 8:59 ` [dpdk-dev] [PATCH 13/14] test: do not start tests in parallel David Marchand
2019-06-04 8:59 ` [dpdk-dev] [PATCH 14/14] test: skip tests when missing requirements David Marchand
2019-06-07 20:54 ` Honnappa Nagarahalli
2019-06-08 8:01 ` David Marchand
2019-06-11 4:08 ` Honnappa Nagarahalli
2019-06-04 15:49 ` [dpdk-dev] [PATCH 00/14] Unit tests fixes for CI Michael Santana Francisco
2019-06-27 16:34 ` Thomas Monjalon
2019-07-01 12:17 ` Aaron Conole
2019-06-15 6:42 ` [dpdk-dev] [PATCH v2 00/15] " David Marchand
2019-06-15 6:42 ` [dpdk-dev] [PATCH v2 01/15] test/bonding: add missing sources for link bonding RSS David Marchand
2019-06-15 6:42 ` [dpdk-dev] [PATCH v2 02/15] test/crypto: move tests to the driver specific list David Marchand
2019-06-15 6:42 ` [dpdk-dev] [PATCH v2 03/15] test/eventdev: " David Marchand
2019-06-15 6:42 ` [dpdk-dev] [PATCH v2 04/15] test/hash: fix off-by-one check on core count David Marchand
2019-06-15 6:42 ` [dpdk-dev] [PATCH v2 05/15] test/hash: rectify slaveid to point to valid cores David Marchand
2019-06-15 6:42 ` [dpdk-dev] [PATCH v2 06/15] test/hash: clean remaining trace of scaling autotest David Marchand
2019-06-15 6:42 ` [dpdk-dev] [PATCH v2 07/15] test/latencystats: fix stack smashing David Marchand
2019-06-15 6:42 ` [dpdk-dev] [PATCH v2 08/15] test/rcu: remove arbitrary limit on max core count David Marchand
2019-06-28 12:56 ` [dpdk-dev] [dpdk-stable] " Ferruh Yigit
2019-06-28 13:32 ` David Marchand
2019-06-15 6:42 ` [dpdk-dev] [PATCH v2 09/15] test/stack: fix lock-free test name David Marchand
2019-06-15 6:42 ` [dpdk-dev] [PATCH v2 10/15] test/eal: set memory channel config only in dedicated test David Marchand
2019-06-15 6:42 ` [dpdk-dev] [PATCH v2 11/15] test/eal: set core mask/list " David Marchand
2019-06-15 6:42 ` [dpdk-dev] [PATCH v2 12/15] test/eal: check number of cores before running subtests David Marchand
2019-06-15 6:42 ` [dpdk-dev] [PATCH v2 13/15] test: split into shorter subtests for CI David Marchand
2019-06-15 6:42 ` [dpdk-dev] [PATCH v2 14/15] test: do not start tests in parallel David Marchand
2019-06-15 6:42 ` [dpdk-dev] [PATCH v2 15/15] test: skip tests when missing requirements David Marchand
2019-06-17 10:00 ` [dpdk-dev] [PATCH v2 00/15] Unit tests fixes for CI Bruce Richardson
2019-06-17 10:46 ` David Marchand
2019-06-17 11:17 ` Bruce Richardson
2019-06-17 11:41 ` David Marchand
2019-06-17 11:56 ` Bruce Richardson
2019-06-17 13:44 ` David Marchand
2019-06-27 20:36 ` Thomas Monjalon
2019-07-01 16:04 ` Aaron Conole
2019-07-01 16:22 ` Thomas Monjalon
2019-07-01 16:45 ` David Marchand
2019-07-01 18:07 ` Michael Santana Francisco
2019-07-09 15:50 ` Michael Santana Francisco
2019-07-10 8:18 ` David Marchand
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1559638792-8608-11-git-send-email-david.marchand@redhat.com \
--to=david.marchand@redhat.com \
--cc=aconole@redhat.com \
--cc=dev@dpdk.org \
--cc=msantana@redhat.com \
--cc=thomas@monjalon.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).