aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Makefile1
-rw-r--r--build/external/deb/debian/control2
-rw-r--r--build/optional/deb/debian/control2
-rw-r--r--extras/hs-test/echo_test.go2
-rw-r--r--extras/hs-test/http_test.go9
-rw-r--r--extras/hs-test/infra/container.go5
-rw-r--r--extras/hs-test/infra/vppinstance.go6
-rw-r--r--extras/hs-test/raw_session_test.go3
-rw-r--r--extras/hs-test/vcl_test.go14
-rw-r--r--src/plugins/acl/hash_lookup.c22
-rw-r--r--src/plugins/dev_octeon/crypto.c12
-rw-r--r--src/plugins/dev_octeon/crypto.h7
-rw-r--r--src/plugins/dev_octeon/init.c43
-rw-r--r--src/plugins/dev_octeon/octeon.h6
-rw-r--r--src/plugins/hs_apps/echo_client.c8
-rw-r--r--src/vat2/main.c35
-rw-r--r--test/Makefile2
-rw-r--r--test/asf/test_quic.py14
-rw-r--r--test/asf/test_tcp.py2
-rw-r--r--test/asf/test_tls.py2
-rw-r--r--test/test_udp.py2
-rw-r--r--test/vpp_iperf.py41
22 files changed, 146 insertions, 94 deletions
diff --git a/Makefile b/Makefile
index 6e8f9bb6304..15fdc836470 100644
--- a/Makefile
+++ b/Makefile
@@ -106,6 +106,7 @@ DEB_DEPENDS += iperf ethtool # for 'make test TEST=vm_vpp_interfaces'
DEB_DEPENDS += libpcap-dev
DEB_DEPENDS += tshark
DEB_DEPENDS += jq # for extracting test summary from .json report (hs-test)
+DEB_DEPENDS += nasm libnuma-dev # for make-ext-deps
LIBFFI=libffi6 # works on all but 20.04 and debian-testing
ifeq ($(OS_VERSION_ID),24.04)
diff --git a/build/external/deb/debian/control b/build/external/deb/debian/control
index a4e59f4c577..701d7bf0961 100644
--- a/build/external/deb/debian/control
+++ b/build/external/deb/debian/control
@@ -2,7 +2,7 @@ Source: vpp-ext-deps
Section: net
Priority: extra
Maintainer: vpp-dev@lists.fd.io
-Build-Depends: debhelper (>= 9), dkms
+Build-Depends: debhelper (>= 9)
Standards-Version: 3.9.4
Package: vpp-ext-deps
diff --git a/build/optional/deb/debian/control b/build/optional/deb/debian/control
index d892395ddab..c18809f7f5e 100644
--- a/build/optional/deb/debian/control
+++ b/build/optional/deb/debian/control
@@ -2,7 +2,7 @@ Source: vpp-opt-deps
Section: net
Priority: extra
Maintainer: vpp-dev@lists.fd.io
-Build-Depends: debhelper (>= 9), dkms
+Build-Depends: debhelper (>= 9)
Standards-Version: 3.9.4
Package: vpp-opt-deps
diff --git a/extras/hs-test/echo_test.go b/extras/hs-test/echo_test.go
index b21c69a1e99..8d69c007113 100644
--- a/extras/hs-test/echo_test.go
+++ b/extras/hs-test/echo_test.go
@@ -39,7 +39,7 @@ func TcpWithLossTest(s *VethsSuite) {
clientVpp.Vppctl("nsim output-feature enable-disable host-" + s.Interfaces.Server.Name())
// Do echo test from client-vpp container
- output := clientVpp.Vppctl("test echo client uri tcp://%s/20022 verbose echo-bytes mbytes 50",
+ output := clientVpp.Vppctl("test echo client uri tcp://%s/20022 verbose echo-bytes bytes 50m",
s.Interfaces.Server.Ip4AddressString())
s.Log(output)
s.AssertNotEqual(len(output), 0)
diff --git a/extras/hs-test/http_test.go b/extras/hs-test/http_test.go
index 760ca3ca936..93317bbf8d8 100644
--- a/extras/hs-test/http_test.go
+++ b/extras/hs-test/http_test.go
@@ -412,7 +412,8 @@ func httpClientGet(s *NoTopoSuite, response string, size int) {
s.AssertContains(o, response)
s.AssertContains(o, "Content-Length: "+strconv.Itoa(size))
- file_contents := vpp.Container.Exec(false, "cat /tmp/response.txt")
+ file_contents, err := vpp.Container.Exec(false, "cat /tmp/response.txt")
+ s.AssertNil(err)
s.AssertContains(file_contents, response)
}
@@ -463,7 +464,8 @@ func httpClientRepeat(s *NoTopoSuite, requestMethod string, clientArgs string) {
o := vpp.Vppctl(cmd)
s.Log(o)
- replyCount := s.Containers.NginxServer.Exec(false, "awk 'END { print NR }' "+logPath)
+ replyCount, err := s.Containers.NginxServer.Exec(false, "awk 'END { print NR }' "+logPath)
+ s.AssertNil(err)
if replyCount != "" {
replyCountInt, err = strconv.Atoi(replyCount[:len(replyCount)-1])
s.AssertNil(err)
@@ -485,7 +487,8 @@ func httpClientRepeat(s *NoTopoSuite, requestMethod string, clientArgs string) {
o = vpp.Vppctl(cmd)
s.Log(o)
- replyCount = s.Containers.NginxServer.Exec(false, "awk 'END { print NR }' "+logPath)
+ replyCount, err = s.Containers.NginxServer.Exec(false, "awk 'END { print NR }' "+logPath)
+ s.AssertNil(err)
if replyCount != "" {
replyCountInt, err = strconv.Atoi(replyCount[:len(replyCount)-1])
s.AssertNil(err)
diff --git a/extras/hs-test/infra/container.go b/extras/hs-test/infra/container.go
index 918c19e669e..efc317fa96d 100644
--- a/extras/hs-test/infra/container.go
+++ b/extras/hs-test/infra/container.go
@@ -460,7 +460,7 @@ func (c *Container) ExecServer(useEnvVars bool, command string, arguments ...any
c.Suite.AssertNil(exechelper.Run(containerExecCommand))
}
-func (c *Container) Exec(useEnvVars bool, command string, arguments ...any) string {
+func (c *Container) Exec(useEnvVars bool, command string, arguments ...any) (string, error) {
var envVars string
serverCommand := fmt.Sprintf(command, arguments...)
if useEnvVars {
@@ -472,8 +472,7 @@ func (c *Container) Exec(useEnvVars bool, command string, arguments ...any) stri
GinkgoHelper()
c.Suite.Log(containerExecCommand)
byteOutput, err := exechelper.CombinedOutput(containerExecCommand)
- c.Suite.AssertNil(err, fmt.Sprint(err))
- return string(byteOutput)
+ return string(byteOutput), err
}
func (c *Container) saveLogs() {
diff --git a/extras/hs-test/infra/vppinstance.go b/extras/hs-test/infra/vppinstance.go
index 370d2be38d1..59d17de4d20 100644
--- a/extras/hs-test/infra/vppinstance.go
+++ b/extras/hs-test/infra/vppinstance.go
@@ -243,9 +243,11 @@ func (vpp *VppInstance) Start() error {
}
func (vpp *VppInstance) Stop() {
- pid := strings.TrimSpace(vpp.Container.Exec(false, "pidof vpp"))
+ pid, err := vpp.Container.Exec(false, "pidof vpp")
+ pid = strings.TrimSpace(pid)
// Stop VPP only if it's still running
- if len(pid) > 0 {
+ if err == nil {
+ vpp.getSuite().Log("Stopping VPP")
vpp.Container.Exec(false, "bash -c \"kill -15 "+pid+"\"")
}
}
diff --git a/extras/hs-test/raw_session_test.go b/extras/hs-test/raw_session_test.go
index c104031f78f..b93b27ab56b 100644
--- a/extras/hs-test/raw_session_test.go
+++ b/extras/hs-test/raw_session_test.go
@@ -35,6 +35,7 @@ func testVppEcho(s *VethsSuite, proto string) {
" socket-name " + s.Containers.ClientApp.GetContainerWorkDir() + "/var/run/app_ns_sockets/default" +
" use-app-socket-api uri " + uri
s.Log(clientCommand)
- o := s.Containers.ClientApp.Exec(true, clientCommand)
+ o, err := s.Containers.ClientApp.Exec(true, clientCommand)
+ s.AssertNil(err)
s.Log(o)
}
diff --git a/extras/hs-test/vcl_test.go b/extras/hs-test/vcl_test.go
index 11e2be1258e..bc557a90508 100644
--- a/extras/hs-test/vcl_test.go
+++ b/extras/hs-test/vcl_test.go
@@ -50,7 +50,8 @@ func testXEchoVclClient(s *VethsSuite, proto string) {
testClientCommand := "vcl_test_client -N 100 -p " + proto + " " + s.Interfaces.Server.Ip4AddressString() + " " + port
s.Log(testClientCommand)
echoClnContainer.AddEnvVar("VCL_CONFIG", "/vcl.conf")
- o := echoClnContainer.Exec(true, testClientCommand)
+ o, err := echoClnContainer.Exec(true, testClientCommand)
+ s.AssertNil(err)
s.Log(o)
s.AssertContains(o, "CLIENT RESULTS")
}
@@ -76,7 +77,7 @@ func testXEchoVclServer(s *VethsSuite, proto string) {
serverVethAddress := s.Interfaces.Server.Ip4AddressString()
clientVpp := s.Containers.ClientVpp.VppInstance
- o := clientVpp.Vppctl("test echo client uri %s://%s/%s fifo-size 64k verbose mbytes 2", proto, serverVethAddress, port)
+ o := clientVpp.Vppctl("test echo client uri %s://%s/%s fifo-size 64k verbose bytes 2m", proto, serverVethAddress, port)
s.Log(o)
s.AssertContains(o, "Test finished at")
}
@@ -97,7 +98,8 @@ func testVclEcho(s *VethsSuite, proto string) {
testClientCommand := "vcl_test_client -p " + proto + " " + serverVethAddress + " " + port
echoClnContainer.AddEnvVar("VCL_CONFIG", "/vcl.conf")
- o := echoClnContainer.Exec(true, testClientCommand)
+ o, err := echoClnContainer.Exec(true, testClientCommand)
+ s.AssertNil(err)
s.Log(o)
}
@@ -137,7 +139,8 @@ func testRetryAttach(s *VethsSuite, proto string) {
testClientCommand := "vcl_test_client -U -p " + proto + " " + serverVethAddress + " 12346"
echoClnContainer.AddEnvVar("VCL_CONFIG", "/vcl.conf")
- o := echoClnContainer.Exec(true, testClientCommand)
+ o, err := echoClnContainer.Exec(true, testClientCommand)
+ s.AssertNil(err)
s.Log(o)
s.Log("... First test ended. Stopping VPP server now.")
@@ -152,7 +155,8 @@ func testRetryAttach(s *VethsSuite, proto string) {
time.Sleep(30 * time.Second) // Wait a moment for the re-attachment to happen
s.Log("... Running second echo client test, after disconnect and re-attachment.")
- o = echoClnContainer.Exec(true, testClientCommand)
+ o, err = echoClnContainer.Exec(true, testClientCommand)
+ s.AssertNil(err)
s.Log(o)
s.Log("Done.")
}
diff --git a/src/plugins/acl/hash_lookup.c b/src/plugins/acl/hash_lookup.c
index 9c3c662a8f1..b4f86208a71 100644
--- a/src/plugins/acl/hash_lookup.c
+++ b/src/plugins/acl/hash_lookup.c
@@ -946,31 +946,15 @@ hash_acl_reapply(acl_main_t *am, u32 lc_index, int acl_index)
static void
make_ip6_address_mask(ip6_address_t *addr, u8 prefix_len)
{
+ ASSERT (prefix_len <= 128);
ip6_address_mask_from_width(addr, prefix_len);
}
-
-/* Maybe should be moved into the core somewhere */
-always_inline void
-ip4_address_mask_from_width (ip4_address_t * a, u32 width)
-{
- int i, byte, bit, bitnum;
- ASSERT (width <= 32);
- clib_memset (a, 0, sizeof (a[0]));
- for (i = 0; i < width; i++)
- {
- bitnum = (7 - (i & 7));
- byte = i / 8;
- bit = 1 << bitnum;
- a->as_u8[byte] |= bit;
- }
-}
-
-
static void
make_ip4_address_mask(ip4_address_t *addr, u8 prefix_len)
{
- ip4_address_mask_from_width(addr, prefix_len);
+ ASSERT (prefix_len <= 32);
+ ip4_preflen_to_mask (prefix_len, addr);
}
static void
diff --git a/src/plugins/dev_octeon/crypto.c b/src/plugins/dev_octeon/crypto.c
index 800f24a008a..52c796089d5 100644
--- a/src/plugins/dev_octeon/crypto.c
+++ b/src/plugins/dev_octeon/crypto.c
@@ -1354,7 +1354,7 @@ oct_crypto_aead_session_update (vlib_main_t *vm, oct_crypto_sess_t *sess,
vnet_crypto_key_t *key = vnet_crypto_get_key (key_index);
roc_se_cipher_type enc_type = 0;
roc_se_auth_type auth_type = 0;
- u32 digest_len = ~0;
+ u32 digest_len = 16;
i32 rv = 0;
switch (key->alg)
@@ -1366,9 +1366,6 @@ oct_crypto_aead_session_update (vlib_main_t *vm, oct_crypto_sess_t *sess,
sess->aes_gcm = 1;
sess->iv_offset = 0;
sess->iv_length = 16;
- sess->cpt_ctx.mac_len = 16;
- sess->cpt_op = type;
- digest_len = 16;
break;
case VNET_CRYPTO_ALG_CHACHA20_POLY1305:
enc_type = ROC_SE_CHACHA20;
@@ -1381,6 +1378,9 @@ oct_crypto_aead_session_update (vlib_main_t *vm, oct_crypto_sess_t *sess,
return -1;
}
+ sess->cpt_ctx.mac_len = digest_len;
+ sess->cpt_op = type;
+
rv = roc_se_ciph_key_set (&sess->cpt_ctx, enc_type, key->data, key->length);
if (rv)
{
@@ -1940,7 +1940,7 @@ oct_init_crypto_engine_handlers (vlib_main_t *vm, vnet_dev_t *dev)
}
int
-oct_conf_sw_queue (vlib_main_t *vm, vnet_dev_t *dev)
+oct_conf_sw_queue (vlib_main_t *vm, vnet_dev_t *dev, oct_crypto_dev_t *ocd)
{
oct_crypto_main_t *ocm = &oct_crypto_main;
vlib_thread_main_t *tm = vlib_get_thread_main ();
@@ -1961,7 +1961,7 @@ oct_conf_sw_queue (vlib_main_t *vm, vnet_dev_t *dev)
* Each pending queue will get number of cpt desc / number of cores.
* And that desc count is shared across inflight entries.
*/
- n_inflight_req = (OCT_CPT_LF_MAX_NB_DESC / tm->n_vlib_mains);
+ n_inflight_req = (ocd->n_desc / tm->n_vlib_mains);
for (i = 0; i < tm->n_vlib_mains; ++i)
{
diff --git a/src/plugins/dev_octeon/crypto.h b/src/plugins/dev_octeon/crypto.h
index 5bd26f6b9be..4d8c56a314c 100644
--- a/src/plugins/dev_octeon/crypto.h
+++ b/src/plugins/dev_octeon/crypto.h
@@ -11,6 +11,9 @@
#define OCT_MAX_N_CPT_DEV 2
+#define OCT_CPT_LF_DEF_NB_DESC 16384
+
+#define OCT_CPT_LF_MIN_NB_DESC 1024
#define OCT_CPT_LF_MAX_NB_DESC 128000
/* CRYPTO_ID, KEY_LENGTH_IN_BYTES, TAG_LEN, AAD_LEN */
@@ -81,6 +84,7 @@ typedef struct
struct roc_cpt_lmtline lmtline;
struct roc_cpt_lf lf;
vnet_dev_t *dev;
+ u32 n_desc;
} oct_crypto_dev_t;
typedef struct
@@ -211,5 +215,6 @@ vnet_crypto_async_frame_t *oct_crypto_frame_dequeue (vlib_main_t *vm,
u32 *nb_elts_processed,
u32 *enqueue_thread_idx);
int oct_init_crypto_engine_handlers (vlib_main_t *vm, vnet_dev_t *dev);
-int oct_conf_sw_queue (vlib_main_t *vm, vnet_dev_t *dev);
+int oct_conf_sw_queue (vlib_main_t *vm, vnet_dev_t *dev,
+ oct_crypto_dev_t *ocd);
#endif /* _CRYPTO_H_ */
diff --git a/src/plugins/dev_octeon/init.c b/src/plugins/dev_octeon/init.c
index 561cbe94fed..69fb097e91f 100644
--- a/src/plugins/dev_octeon/init.c
+++ b/src/plugins/dev_octeon/init.c
@@ -61,6 +61,22 @@ static struct
#undef _
};
+static vnet_dev_arg_t oct_dev_args[] = {
+ {
+ .id = OCT_DEV_ARG_CRYPTO_N_DESC,
+ .name = "n_desc",
+ .desc = "number of cpt descriptors, applicable to cpt devices only",
+ .type = VNET_DEV_ARG_TYPE_UINT32,
+ .default_val.uint32 = OCT_CPT_LF_DEF_NB_DESC,
+ },
+ {
+ .id = OCT_DEV_ARG_END,
+ .name = "end",
+ .desc = "Argument end",
+ .type = VNET_DEV_ARG_END,
+ },
+};
+
static u8 *
oct_probe (vlib_main_t *vm, vnet_dev_bus_index_t bus_index, void *dev_info)
{
@@ -241,7 +257,7 @@ oct_conf_cpt_queue (vlib_main_t *vm, vnet_dev_t *dev, oct_crypto_dev_t *ocd)
cpt_lf = &ocd->lf;
cpt_lmtline = &ocd->lmtline;
- cpt_lf->nb_desc = OCT_CPT_LF_MAX_NB_DESC;
+ cpt_lf->nb_desc = ocd->n_desc;
cpt_lf->lf_id = 0;
if ((rrv = roc_cpt_lf_init (roc_cpt, cpt_lf)) < 0)
return cnx_return_roc_err (dev, rrv, "roc_cpt_lf_init");
@@ -261,6 +277,7 @@ oct_init_cpt (vlib_main_t *vm, vnet_dev_t *dev)
extern oct_plt_init_param_t oct_plt_init_param;
oct_device_t *cd = vnet_dev_get_data (dev);
oct_crypto_dev_t *ocd = NULL;
+ u32 n_desc;
int rrv;
if (ocm->n_cpt == OCT_MAX_N_CPT_DEV || ocm->started)
@@ -274,6 +291,27 @@ oct_init_cpt (vlib_main_t *vm, vnet_dev_t *dev)
ocd->roc_cpt->pci_dev = &cd->plt_pci_dev;
ocd->dev = dev;
+ ocd->n_desc = OCT_CPT_LF_DEF_NB_DESC;
+
+ foreach_vnet_dev_args (arg, dev)
+ {
+ if (arg->id == OCT_DEV_ARG_CRYPTO_N_DESC &&
+ vnet_dev_arg_get_uint32 (arg))
+ {
+ n_desc = vnet_dev_arg_get_uint32 (arg);
+ if (n_desc < OCT_CPT_LF_MIN_NB_DESC ||
+ n_desc > OCT_CPT_LF_MAX_NB_DESC)
+ {
+ log_err (dev,
+ "number of cpt descriptors should be within range "
+ "of %u and %u",
+ OCT_CPT_LF_MIN_NB_DESC, OCT_CPT_LF_MAX_NB_DESC);
+ return VNET_DEV_ERR_NOT_SUPPORTED;
+ }
+
+ ocd->n_desc = vnet_dev_arg_get_uint32 (arg);
+ }
+ }
if ((rrv = roc_cpt_dev_init (ocd->roc_cpt)))
return cnx_return_roc_err (dev, rrv, "roc_cpt_dev_init");
@@ -290,7 +328,7 @@ oct_init_cpt (vlib_main_t *vm, vnet_dev_t *dev)
* Initialize s/w queues, which are common across multiple
* crypto devices
*/
- oct_conf_sw_queue (vm, dev);
+ oct_conf_sw_queue (vm, dev, ocd);
ocm->crypto_dev[0] = ocd;
}
@@ -396,6 +434,7 @@ VNET_DEV_REGISTER_DRIVER (octeon) = {
.free = oct_free,
.probe = oct_probe,
},
+ .args = oct_dev_args,
};
static clib_error_t *
diff --git a/src/plugins/dev_octeon/octeon.h b/src/plugins/dev_octeon/octeon.h
index ccf8f62880d..0cf937528f0 100644
--- a/src/plugins/dev_octeon/octeon.h
+++ b/src/plugins/dev_octeon/octeon.h
@@ -25,6 +25,12 @@
typedef enum
{
+ OCT_DEV_ARG_CRYPTO_N_DESC = 1,
+ OCT_DEV_ARG_END,
+} oct_dev_args_t;
+
+typedef enum
+{
OCT_DEVICE_TYPE_UNKNOWN = 0,
OCT_DEVICE_TYPE_RVU_PF,
OCT_DEVICE_TYPE_RVU_VF,
diff --git a/src/plugins/hs_apps/echo_client.c b/src/plugins/hs_apps/echo_client.c
index ff5a3bd6b3c..b08edaaa5f5 100644
--- a/src/plugins/hs_apps/echo_client.c
+++ b/src/plugins/hs_apps/echo_client.c
@@ -1073,7 +1073,7 @@ ec_command_fn (vlib_main_t *vm, unformat_input_t *input,
uword *event_data = 0, event_type;
clib_error_t *error = 0;
int rv, had_config = 1;
- u64 tmp, total_bytes;
+ u64 total_bytes;
f64 delta;
if (ecm->test_client_attached)
@@ -1099,10 +1099,6 @@ ec_command_fn (vlib_main_t *vm, unformat_input_t *input,
;
else if (unformat (line_input, "quic-streams %d", &ecm->quic_streams))
;
- else if (unformat (line_input, "mbytes %lld", &tmp))
- ecm->bytes_to_send = tmp << 20;
- else if (unformat (line_input, "gbytes %lld", &tmp))
- ecm->bytes_to_send = tmp << 30;
else if (unformat (line_input, "bytes %U", unformat_memory_size,
&ecm->bytes_to_send))
;
@@ -1336,7 +1332,7 @@ cleanup:
VLIB_CLI_COMMAND (ec_command, static) = {
.path = "test echo clients",
.short_help =
- "test echo clients [nclients %d][[m|g]bytes <bytes>]"
+ "test echo clients [nclients %d][bytes <bytes>[m|g]]"
"[test-timeout <time>][syn-timeout <time>][echo-bytes][fifo-size <size>]"
"[private-segment-count <count>][private-segment-size <bytes>[m|g]]"
"[preallocate-fifos][preallocate-sessions][client-batch <batch-size>]"
diff --git a/src/vat2/main.c b/src/vat2/main.c
index bf415854db1..2949c4899aa 100644
--- a/src/vat2/main.c
+++ b/src/vat2/main.c
@@ -253,16 +253,15 @@ print_help (void)
"Send API message to VPP and print reply\n"
"\n"
"-d, --debug Print additional information\n"
- "-p, --prefix <prefix> Specify shared memory prefix to connect "
- "to a given VPP instance\n"
+ "--dump-apis List all APIs available in VAT2 (might "
+ "not reflect running VPP)\n"
"-f, --file <filename> File containing a JSON object with the "
"arguments for the message to send\n"
+ "-p, --plugin-path Plugin path\n"
+ "-s, --prefix <prefix> Specify shared memory prefix to connect "
+ "to a given VPP instance\n"
"-t, --template <message-name> Print a template JSON object for given API"
- " message\n"
- "--dump-apis List all APIs available in VAT2 (might "
- "not reflect running VPP)\n"
- "--plugin-path Pluing path"
- "\n";
+ " message\n";
printf ("%s", help_string);
}
@@ -281,38 +280,38 @@ main (int argc, char **argv)
char *msgname = 0;
static struct option long_options[] = {
{ "debug", no_argument, 0, 'd' },
- { "prefix", required_argument, 0, 's' },
- { "file", required_argument, 0, 'f' },
{ "dump-apis", no_argument, 0, 0 },
- { "template", required_argument, 0, 't' },
+ { "file", required_argument, 0, 'f' },
{ "plugin-path", required_argument, 0, 'p' },
+ { "prefix", required_argument, 0, 's' },
+ { "template", required_argument, 0, 't' },
{ 0, 0, 0, 0 }
};
- while ((c = getopt_long (argc, argv, "hdp:f:t:", long_options,
+ while ((c = getopt_long (argc, argv, "df:p:s:t:", long_options,
&option_index)) != -1)
{
switch (c)
{
case 0:
- if (option_index == 3)
+ if (option_index == 1)
dump_api = true;
break;
case 'd':
vat2_debug = true;
break;
- case 't':
- template = optarg;
- break;
- case 's':
- prefix = optarg;
- break;
case 'f':
filename = optarg;
break;
case 'p':
pluginpath = optarg;
break;
+ case 's':
+ prefix = optarg;
+ break;
+ case 't':
+ template = optarg;
+ break;
case '?':
print_help ();
return 1;
diff --git a/test/Makefile b/test/Makefile
index 37f8e2db18b..6196be80a18 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -402,7 +402,7 @@ endif
LCOV_VERSION=$(shell lcov --version | sed -E 's/^lcov: LCOV version ([0-9]+)[.].*/\1/')
LCOV_IGNORE_ERRORS=
ifeq ($(LCOV_VERSION),2)
-LCOV_IGNORE_ERRORS=--ignore-errors unused,empty,mismatch,gcov
+LCOV_IGNORE_ERRORS=--ignore-errors unused,empty,mismatch,gcov,negative
endif
.PHONY: cov-post
diff --git a/test/asf/test_quic.py b/test/asf/test_quic.py
index c4fa6912114..78ebe0f40a7 100644
--- a/test/asf/test_quic.py
+++ b/test/asf/test_quic.py
@@ -178,7 +178,7 @@ class QUICEchoIntTransferTestCase(QUICEchoIntTestCase):
def test_quic_int_transfer(self):
"""QUIC internal transfer"""
self.server()
- self.client("mbytes", "2")
+ self.client("bytes", "2m")
@tag_fixme_vpp_workers
@@ -188,11 +188,11 @@ class QUICEchoIntSerialTestCase(QUICEchoIntTestCase):
def test_quic_serial_int_transfer(self):
"""QUIC serial internal transfer"""
self.server()
- self.client("mbytes", "2")
- self.client("mbytes", "2")
- self.client("mbytes", "2")
- self.client("mbytes", "2")
- self.client("mbytes", "2")
+ self.client("bytes", "2m")
+ self.client("bytes", "2m")
+ self.client("bytes", "2m")
+ self.client("bytes", "2m")
+ self.client("bytes", "2m")
@tag_fixme_vpp_workers
@@ -202,7 +202,7 @@ class QUICEchoIntMStreamTestCase(QUICEchoIntTestCase):
def test_quic_int_multistream_transfer(self):
"""QUIC internal multi-stream transfer"""
self.server()
- self.client("nclients", "10", "mbytes", "1")
+ self.client("nclients", "10", "bytes", "1m")
class QUICEchoExtTestCase(QUICTestCase):
diff --git a/test/asf/test_tcp.py b/test/asf/test_tcp.py
index 23772d34c76..e9c9e1efb68 100644
--- a/test/asf/test_tcp.py
+++ b/test/asf/test_tcp.py
@@ -89,7 +89,7 @@ class TestTCP(VppAsfTestCase):
self.assertNotIn("failed", error)
error = self.vapi.cli(
- "test echo client mbytes 10 appns 1 "
+ "test echo client bytes 10m appns 1 "
+ "fifo-size 4k test-bytes "
+ "syn-timeout 2 uri "
+ uri
diff --git a/test/asf/test_tls.py b/test/asf/test_tls.py
index 2ce87143339..6676132417c 100644
--- a/test/asf/test_tls.py
+++ b/test/asf/test_tls.py
@@ -142,7 +142,7 @@ class TestTLS(VppAsfTestCase):
self.assertNotIn("failed", error)
error = self.vapi.cli(
- "test echo client mbytes 10 appns 1 "
+ "test echo client bytes 10m appns 1 "
"fifo-size 4k test-bytes "
"tls-engine 1 "
"syn-timeout 2 uri " + uri
diff --git a/test/test_udp.py b/test/test_udp.py
index 6315f0efd5e..c7620fb7e9d 100644
--- a/test/test_udp.py
+++ b/test/test_udp.py
@@ -764,7 +764,7 @@ class TestUDP(VppTestCase):
self.assertNotIn("failed", error)
error = self.vapi.cli(
- "test echo client mbytes 10 appns 1 "
+ "test echo client bytes 10m appns 1 "
+ "fifo-size 4k "
+ "syn-timeout 2 uri "
+ uri
diff --git a/test/vpp_iperf.py b/test/vpp_iperf.py
index b325399f8e1..03ced8bf12f 100644
--- a/test/vpp_iperf.py
+++ b/test/vpp_iperf.py
@@ -5,6 +5,8 @@
import subprocess
import os
import sys
+import time
+import signal
class VppIperf:
@@ -196,20 +198,31 @@ def start_iperf(
def stop_iperf(iperf_cmd):
"""Stop the iperf process matching the iperf_cmd string."""
- args = ["pgrep", "-x", "-f", iperf_cmd]
- p = subprocess.Popen(
- args, stdout=subprocess.PIPE, stderr=subprocess.PIPE, encoding="utf-8"
- )
- stdout, _ = p.communicate()
- for pid in stdout.split():
- try:
- subprocess.run(
- f"kill -9 {pid}",
- encoding="utf-8",
- shell=True,
- )
- except Exception:
- pass
+ try:
+ result = subprocess.run(
+ ["pgrep", "-x", "-f", iperf_cmd],
+ stdout=subprocess.PIPE,
+ stderr=subprocess.PIPE,
+ encoding="utf-8",
+ )
+ pids = result.stdout.strip().split()
+ if not pids:
+ # No matching iperf3 processes found
+ return
+
+ for pid in pids:
+ try:
+ # First send SIGTERM to cleanup and notify the parent process
+ os.kill(int(pid), signal.SIGTERM)
+ time.sleep(2)
+ os.kill(int(pid), 0) # Check if still alive
+ os.kill(int(pid), signal.SIGKILL)
+ except ProcessLookupError:
+ pass # Process already exited
+ except Exception as e:
+ print(f"Error terminating iperf3 process {pid}: {e}")
+ except Exception as e:
+ print(f"Failed to run pgrep for '{iperf_cmd}': {e}")
if __name__ == "__main__":