From patchwork Wed Dec 8 18:59:50 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jie Zhou X-Patchwork-Id: 105029 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 4D00EA00C2; Wed, 8 Dec 2021 20:00:20 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id BF1C6426E2; Wed, 8 Dec 2021 20:00:10 +0100 (CET) Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by mails.dpdk.org (Postfix) with ESMTP id B19424114A for ; Wed, 8 Dec 2021 20:00:06 +0100 (CET) Received: from linuxonhyperv3.guj3yctzbm1etfxqx2vob5hsef.xx.internal.cloudapp.net (linux.microsoft.com [13.77.154.182]) by linux.microsoft.com (Postfix) with ESMTPSA id CDC7220B717A; Wed, 8 Dec 2021 11:00:05 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com CDC7220B717A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1638990005; bh=5UIfdLYJoJeqOlhgrU2q0kD43mqSOXp6lQOza03310I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TGFxIwvyFNYuJ6tpydkzbmpVk7EFqmG+Nf8zfem4MYFa7acYA6dz4mWLEMV8l3DU8 DssuxoSzPuo3yagYdkIfh2BAWipwpu0hqoQ2kwhnzbIbLRF3LrRA59VkiaksZ0wTQu Wr2TMo5QKIezVnrL5BNB4thK59Fou9sbHfU6Bcdc= From: Jie Zhou To: dev@dpdk.org Cc: dmitry.kozliuk@gmail.com, bruce.richardson@intel.com, roretzla@microsoft.com, navasile@linux.microsoft.com, dmitrym@microsoft.com, pallavi.kadam@intel.com, talshn@nvidia.com, thomas@monjalon.net, aconole@redhat.com Subject: [PATCH v14 01/11] eal/windows: return ENOTSUP for not supported API Date: Wed, 8 Dec 2021 10:59:50 -0800 Message-Id: <1638990000-3228-2-git-send-email-jizh@linux.microsoft.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1638990000-3228-1-git-send-email-jizh@linux.microsoft.com> References: <1638928262-13177-1-git-send-email-jizh@linux.microsoft.com> <1638990000-3228-1-git-send-email-jizh@linux.microsoft.com> X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org UT memory_autotest on Windows has 2 failed cases on eal APIs eal_memalloc_get_seg_fd and eal_memalloc_get_seg_fd_offset. These 2 APIs are not supported on Windows yet. Should return ENOTSUP such that in test_memory.c these 2 ENOTSUP cases will not be marked as failures, same as other ENOTSUP cases. Signed-off-by: Jie Zhou Acked-by: Dmitry Kozlyuk --- lib/eal/windows/eal_memalloc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/eal/windows/eal_memalloc.c b/lib/eal/windows/eal_memalloc.c index 55d6dcc71c..aa7589b81d 100644 --- a/lib/eal/windows/eal_memalloc.c +++ b/lib/eal/windows/eal_memalloc.c @@ -17,7 +17,7 @@ eal_memalloc_get_seg_fd(int list_idx, int seg_idx) RTE_SET_USED(list_idx); RTE_SET_USED(seg_idx); EAL_LOG_NOT_IMPLEMENTED(); - return -1; + return -ENOTSUP; } int @@ -28,7 +28,7 @@ eal_memalloc_get_seg_fd_offset(int list_idx, int seg_idx, size_t *offset) RTE_SET_USED(seg_idx); RTE_SET_USED(offset); EAL_LOG_NOT_IMPLEMENTED(); - return -1; + return -ENOTSUP; } static int @@ -428,7 +428,7 @@ eal_memalloc_sync_with_primary(void) { /* No multi-process support. */ EAL_LOG_NOT_IMPLEMENTED(); - return -1; + return -ENOTSUP; } int From patchwork Wed Dec 8 18:59:51 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jie Zhou X-Patchwork-Id: 105031 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 2B885A00C2; Wed, 8 Dec 2021 20:00:33 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2E21B426F9; Wed, 8 Dec 2021 20:00:13 +0100 (CET) Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by mails.dpdk.org (Postfix) with ESMTP id A4A3A4111B for ; Wed, 8 Dec 2021 20:00:06 +0100 (CET) Received: from linuxonhyperv3.guj3yctzbm1etfxqx2vob5hsef.xx.internal.cloudapp.net (linux.microsoft.com [13.77.154.182]) by linux.microsoft.com (Postfix) with ESMTPSA id E33F620B717B; Wed, 8 Dec 2021 11:00:05 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com E33F620B717B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1638990005; bh=I6SyQEzooUQo3TvEIh3LrYS1WO2fnQZn35NGY64YolE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Ff9B645Q+/xeRpbS1r8CC8Xbtb8xlO7e80dIt3P6JQC9/qLAzvQSzccu8aKIQjccc oiw9T0SfCdPnKzmExknTsWmYEyWPSxrfamsBhtWJpIEaGywlwt8PFEjId8z7OuDJIF fRywlhw0ZVITSUyVAj9TudyL9s9qvQWsiT1H0FhA= From: Jie Zhou To: dev@dpdk.org Cc: dmitry.kozliuk@gmail.com, bruce.richardson@intel.com, roretzla@microsoft.com, navasile@linux.microsoft.com, dmitrym@microsoft.com, pallavi.kadam@intel.com, talshn@nvidia.com, thomas@monjalon.net, aconole@redhat.com Subject: [PATCH v14 02/11] app/test: remove POSIX-specific code Date: Wed, 8 Dec 2021 10:59:51 -0800 Message-Id: <1638990000-3228-3-git-send-email-jizh@linux.microsoft.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1638990000-3228-1-git-send-email-jizh@linux.microsoft.com> References: <1638928262-13177-1-git-send-email-jizh@linux.microsoft.com> <1638990000-3228-1-git-send-email-jizh@linux.microsoft.com> X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org - Replace POSIX-specific code with DPDK equivalents or conditionally disable it on Windows - Use NUL on Windows as /dev/null for Unix - Exclude tests not supported on Windows yet * multi-process * PMD performance statistics display on signal Signed-off-by: Jie Zhou Signed-off-by: Dmitry Kozlyuk Acked-by: Tyler Retzlaff --- app/test/commands.c | 2 -- app/test/packet_burst_generator.c | 1 + app/test/process.h | 4 +++- app/test/test.c | 5 ++++- app/test/test_byteorder.c | 2 +- app/test/test_cmdline_ipaddr.c | 13 ++++++------- app/test/test_cmdline_lib.c | 13 +++++++++---- app/test/test_crc.c | 1 - app/test/test_memcpy_perf.c | 29 +++++++++++++++-------------- app/test/test_pmd_perf.c | 6 +++++- app/test/test_ring_stress_impl.h | 2 +- app/test/test_telemetry_data.c | 2 ++ 12 files changed, 47 insertions(+), 33 deletions(-) diff --git a/app/test/commands.c b/app/test/commands.c index 2dced3bc44..887cabad64 100644 --- a/app/test/commands.c +++ b/app/test/commands.c @@ -8,8 +8,6 @@ #include #include #include -#include -#include #include #include #include diff --git a/app/test/packet_burst_generator.c b/app/test/packet_burst_generator.c index 8ac24577ba..6b42b9b83b 100644 --- a/app/test/packet_burst_generator.c +++ b/app/test/packet_burst_generator.c @@ -5,6 +5,7 @@ #include #include #include +#include #include "packet_burst_generator.h" diff --git a/app/test/process.h b/app/test/process.h index 5b10cf64df..1f073b9c5c 100644 --- a/app/test/process.h +++ b/app/test/process.h @@ -7,12 +7,14 @@ #include /* errno */ #include /* PATH_MAX */ +#ifndef RTE_EXEC_ENV_WINDOWS #include /* basename et al */ +#include +#endif #include /* NULL */ #include /* strerror */ #include /* readlink */ #include -#include #include /* strlcpy */ diff --git a/app/test/test.c b/app/test/test.c index 5194131026..e69cae3eea 100644 --- a/app/test/test.c +++ b/app/test/test.c @@ -8,7 +8,6 @@ #include #include #include -#include #include #include @@ -63,7 +62,9 @@ do_recursive_call(void) const char *env_var; int (*action_fn)(void); } actions[] = { +#ifndef RTE_EXEC_ENV_WINDOWS { "run_secondary_instances", test_mp_secondary }, +#endif #ifdef RTE_LIB_PDUMP #ifdef RTE_NET_RING { "run_pdump_server_tests", test_pdump }, @@ -82,7 +83,9 @@ do_recursive_call(void) { "test_file_prefix", no_action }, { "test_no_huge_flag", no_action }, #ifdef RTE_LIB_TIMER +#ifndef RTE_EXEC_ENV_WINDOWS { "timer_secondary_spawn_wait", test_timer_secondary }, +#endif #endif }; diff --git a/app/test/test_byteorder.c b/app/test/test_byteorder.c index 03c08d9abf..de14ed539e 100644 --- a/app/test/test_byteorder.c +++ b/app/test/test_byteorder.c @@ -46,7 +46,7 @@ test_byteorder(void) return -1; res_u16 = rte_bswap16(0x1337); - printf("const %"PRIx16" -> %"PRIx16"\n", 0x1337, res_u16); + printf("const %"PRIx16" -> %"PRIx16"\n", (uint16_t)0x1337, res_u16); if (res_u16 != 0x3713) return -1; diff --git a/app/test/test_cmdline_ipaddr.c b/app/test/test_cmdline_ipaddr.c index 2a1ee120fc..f540063508 100644 --- a/app/test/test_cmdline_ipaddr.c +++ b/app/test/test_cmdline_ipaddr.c @@ -1,12 +1,9 @@ /* SPDX-License-Identifier: BSD-3-Clause * Copyright(c) 2010-2014 Intel Corporation */ - #include #include #include -#include -#include #include @@ -15,7 +12,7 @@ #include "test_cmdline.h" -#define IP4(a,b,c,d) {((uint32_t)(((a) & 0xff)) | \ +#define IP4(a,b,c,d) {.s_addr = (uint32_t)(((a) & 0xff) | \ (((b) & 0xff) << 8) | \ (((c) & 0xff) << 16) | \ ((d) & 0xff) << 24)} @@ -25,7 +22,11 @@ /* create IPv6 address, swapping bytes where needed */ #ifndef s6_addr16 -# define s6_addr16 __u6_addr.__u6_addr16 +#ifdef RTE_EXEC_ENV_WINDOWS +#define s6_addr16 u.Word +#else +#define s6_addr16 __u6_addr.__u6_addr16 +#endif #endif #define IP6(a,b,c,d,e,f,g,h) .ipv6 = \ {.s6_addr16 = \ @@ -166,8 +167,6 @@ const char * ipaddr_garbage_network6_strs[] = { }; #define IPv6_GARBAGE_PREFIX 64 - - const char * ipaddr_invalid_strs[] = { /** IPv4 **/ diff --git a/app/test/test_cmdline_lib.c b/app/test/test_cmdline_lib.c index f50ccdb599..fcd58cb76a 100644 --- a/app/test/test_cmdline_lib.c +++ b/app/test/test_cmdline_lib.c @@ -8,7 +8,6 @@ #include #include #include -#include #include #include @@ -22,6 +21,12 @@ #include "test_cmdline.h" +#ifndef RTE_EXEC_ENV_WINDOWS +#define NULL_INPUT "/dev/null" +#else +#define NULL_INPUT "NUL" +#endif + /****************************************************************/ /* static functions required for some tests */ static void @@ -156,10 +161,10 @@ test_cmdline_socket_fns(void) cl = cmdline_stdin_new(&ctx, NULL); if (cl != NULL) goto error; - cl = cmdline_file_new(NULL, "prompt", "/dev/null"); + cl = cmdline_file_new(NULL, "prompt", NULL_INPUT); if (cl != NULL) goto error; - cl = cmdline_file_new(&ctx, NULL, "/dev/null"); + cl = cmdline_file_new(&ctx, NULL, NULL_INPUT); if (cl != NULL) goto error; cl = cmdline_file_new(&ctx, "prompt", NULL); @@ -171,7 +176,7 @@ test_cmdline_socket_fns(void) cmdline_free(cl); return -1; } - cl = cmdline_file_new(&ctx, "prompt", "/dev/null"); + cl = cmdline_file_new(&ctx, "prompt", NULL_INPUT); if (cl == NULL) { printf("Error: failed to open /dev/null for reading!"); return -1; diff --git a/app/test/test_crc.c b/app/test/test_crc.c index bf1d344359..0ed080e482 100644 --- a/app/test/test_crc.c +++ b/app/test/test_crc.c @@ -14,7 +14,6 @@ #define CRC32_VEC_LEN2 348 #define CRC16_VEC_LEN1 12 #define CRC16_VEC_LEN2 2 -#define LINE_LEN 75 /* CRC test vector */ static const uint8_t crc_vec[CRC_VEC_LEN] = { diff --git a/app/test/test_memcpy_perf.c b/app/test/test_memcpy_perf.c index c711e36ba7..3727c160e6 100644 --- a/app/test/test_memcpy_perf.c +++ b/app/test/test_memcpy_perf.c @@ -6,10 +6,11 @@ #include #include #include -#include +#include #include #include +#include #include #include @@ -271,7 +272,7 @@ static int perf_test(void) { int ret; - struct timeval tv_begin, tv_end; + struct timespec tv_begin, tv_end; double time_aligned, time_unaligned; double time_aligned_const, time_unaligned_const; @@ -298,32 +299,32 @@ perf_test(void) printf("\n================================= %2dB aligned =================================", ALIGNMENT_UNIT); /* Do aligned tests where size is a variable */ - gettimeofday(&tv_begin, NULL); + timespec_get(&tv_begin, TIME_UTC); perf_test_variable_aligned(); - gettimeofday(&tv_end, NULL); + timespec_get(&tv_end, TIME_UTC); time_aligned = (double)(tv_end.tv_sec - tv_begin.tv_sec) - + ((double)tv_end.tv_usec - tv_begin.tv_usec)/1000000; + + ((double)tv_end.tv_nsec - tv_begin.tv_nsec) / NS_PER_S; printf("\n------- ----------------- ----------------- ----------------- -----------------"); /* Do aligned tests where size is a compile-time constant */ - gettimeofday(&tv_begin, NULL); + timespec_get(&tv_begin, TIME_UTC); perf_test_constant_aligned(); - gettimeofday(&tv_end, NULL); + timespec_get(&tv_end, TIME_UTC); time_aligned_const = (double)(tv_end.tv_sec - tv_begin.tv_sec) - + ((double)tv_end.tv_usec - tv_begin.tv_usec)/1000000; + + ((double)tv_end.tv_nsec - tv_begin.tv_nsec) / NS_PER_S; printf("\n================================== Unaligned =================================="); /* Do unaligned tests where size is a variable */ - gettimeofday(&tv_begin, NULL); + timespec_get(&tv_begin, TIME_UTC); perf_test_variable_unaligned(); - gettimeofday(&tv_end, NULL); + timespec_get(&tv_end, TIME_UTC); time_unaligned = (double)(tv_end.tv_sec - tv_begin.tv_sec) - + ((double)tv_end.tv_usec - tv_begin.tv_usec)/1000000; + + ((double)tv_end.tv_nsec - tv_begin.tv_nsec) / NS_PER_S; printf("\n------- ----------------- ----------------- ----------------- -----------------"); /* Do unaligned tests where size is a compile-time constant */ - gettimeofday(&tv_begin, NULL); + timespec_get(&tv_begin, TIME_UTC); perf_test_constant_unaligned(); - gettimeofday(&tv_end, NULL); + timespec_get(&tv_end, TIME_UTC); time_unaligned_const = (double)(tv_end.tv_sec - tv_begin.tv_sec) - + ((double)tv_end.tv_usec - tv_begin.tv_usec)/1000000; + + ((double)tv_end.tv_nsec - tv_begin.tv_nsec) / NS_PER_S; printf("\n======= ================= ================= ================= =================\n\n"); printf("Test Execution Time (seconds):\n"); diff --git a/app/test/test_pmd_perf.c b/app/test/test_pmd_perf.c index 0aa9dc1b1c..25611bfe9b 100644 --- a/app/test/test_pmd_perf.c +++ b/app/test/test_pmd_perf.c @@ -296,6 +296,7 @@ reset_count(void) idle = 0; } +#ifndef RTE_EXEC_ENV_WINDOWS static void stats_display(uint16_t port_id) { @@ -325,6 +326,7 @@ signal_handler(int signum) if (signum == SIGUSR2) stats_display(0); } +#endif struct rte_mbuf **tx_burst; @@ -638,7 +640,7 @@ exec_burst(uint32_t flags, int lcore) i = (i >= conf->nb_ports - 1) ? 0 : (i + 1); } - sleep(5); + rte_delay_us(5 * US_PER_S); /* only when polling second */ if (flags == SC_BURST_XMIT_FIRST) @@ -669,8 +671,10 @@ test_pmd_perf(void) printf("Start PMD RXTX cycles cost test.\n"); +#ifndef RTE_EXEC_ENV_WINDOWS signal(SIGUSR1, signal_handler); signal(SIGUSR2, signal_handler); +#endif nb_ports = rte_eth_dev_count_avail(); if (nb_ports < NB_ETHPORTS_USED) { diff --git a/app/test/test_ring_stress_impl.h b/app/test/test_ring_stress_impl.h index 2825a9dce6..62f046a91a 100644 --- a/app/test/test_ring_stress_impl.h +++ b/app/test/test_ring_stress_impl.h @@ -360,7 +360,7 @@ test_mt1(int (*test)(void *)) /* signal worker to start test */ __atomic_store_n(&wrk_cmd, WRK_CMD_RUN, __ATOMIC_RELEASE); - usleep(run_time * US_PER_S); + rte_delay_us(run_time * US_PER_S); /* signal worker to start test */ __atomic_store_n(&wrk_cmd, WRK_CMD_STOP, __ATOMIC_RELEASE); diff --git a/app/test/test_telemetry_data.c b/app/test/test_telemetry_data.c index 18b93db8ef..73eee293a1 100644 --- a/app/test/test_telemetry_data.c +++ b/app/test/test_telemetry_data.c @@ -4,7 +4,9 @@ #include #include +#ifndef RTE_EXEC_ENV_WINDOWS #include +#endif #include #include From patchwork Wed Dec 8 18:59:52 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jie Zhou X-Patchwork-Id: 105027 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 03B8BA00C2; Wed, 8 Dec 2021 20:00:08 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 91BBD4111B; Wed, 8 Dec 2021 20:00:08 +0100 (CET) Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by mails.dpdk.org (Postfix) with ESMTP id A94DB41143 for ; Wed, 8 Dec 2021 20:00:06 +0100 (CET) Received: from linuxonhyperv3.guj3yctzbm1etfxqx2vob5hsef.xx.internal.cloudapp.net (linux.microsoft.com [13.77.154.182]) by linux.microsoft.com (Postfix) with ESMTPSA id 0500020B7185; Wed, 8 Dec 2021 11:00:06 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 0500020B7185 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1638990006; bh=rV9pA/ciz3QkqEkZfBtrMAEvc8bMFvXbopBNZosfacI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XsVT5+ZzgcM+jFj/jPD5PYKLAactnC2xSdbPo+Gz82Eo8LBW5HhXSARbVZ0zXMmDc M81hNQzuVohjbHWgx8nCZ/3w8HRHdbWETAY0/1UEh6RlpPlNoZjicyqk4e9N3s88Xo D6Yt/rRJP39VOOF2tzgNh4qwEf2HMLrt6gAaSR9A= From: Jie Zhou To: dev@dpdk.org Cc: dmitry.kozliuk@gmail.com, bruce.richardson@intel.com, roretzla@microsoft.com, navasile@linux.microsoft.com, dmitrym@microsoft.com, pallavi.kadam@intel.com, talshn@nvidia.com, thomas@monjalon.net, aconole@redhat.com Subject: [PATCH v14 03/11] app/test: fix incorrect errno variable Date: Wed, 8 Dec 2021 10:59:52 -0800 Message-Id: <1638990000-3228-4-git-send-email-jizh@linux.microsoft.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1638990000-3228-1-git-send-email-jizh@linux.microsoft.com> References: <1638928262-13177-1-git-send-email-jizh@linux.microsoft.com> <1638990000-3228-1-git-send-email-jizh@linux.microsoft.com> X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Fix incorrect errno variable used in memory autotest. Use rte_errno instead. Fixes: 086d426406bd ("app/test: fix memory autotests on FreeBSD") Cc: bruce.richardson@intel.com Signed-off-by: Jie Zhou Acked-by: Dmitry Kozlyuk --- app/test/test_memory.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/test/test_memory.c b/app/test/test_memory.c index dbf6871e71..140ac3f3cf 100644 --- a/app/test/test_memory.c +++ b/app/test/test_memory.c @@ -63,7 +63,7 @@ check_seg_fds(const struct rte_memseg_list *msl, const struct rte_memseg *ms, /* we're able to get memseg fd - try getting its offset */ ret = rte_memseg_get_fd_offset_thread_unsafe(ms, &offset); if (ret < 0) { - if (errno == ENOTSUP) + if (rte_errno == ENOTSUP) return 1; return -1; } From patchwork Wed Dec 8 18:59:53 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jie Zhou X-Patchwork-Id: 105030 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id A9486A00C2; Wed, 8 Dec 2021 20:00:26 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 195D1426ED; Wed, 8 Dec 2021 20:00:12 +0100 (CET) Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by mails.dpdk.org (Postfix) with ESMTP id C607D4114F for ; Wed, 8 Dec 2021 20:00:06 +0100 (CET) Received: from linuxonhyperv3.guj3yctzbm1etfxqx2vob5hsef.xx.internal.cloudapp.net (linux.microsoft.com [13.77.154.182]) by linux.microsoft.com (Postfix) with ESMTPSA id 1A7B120B7186; Wed, 8 Dec 2021 11:00:06 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 1A7B120B7186 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1638990006; bh=CJ8IXYZQ4Q/aShzvtmHU8+ePXTv4diXKywJvLS/GuJw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rlfT6+i1kSj0ykSpPi1TvpSbBn5zYooJsZTHCCLBob+/I0acLiQfzYGED1F7zX12F jIo8bFM2qIW7YPgl752NI3VJmjsqI6OMUU/FpdHO0zszdOyraeHzuOJnyiX0DDs+/A W3JQ/F0q6Sm+gWliYTcy1cGlSNGqUCQigXEt+CE0= From: Jie Zhou To: dev@dpdk.org Cc: dmitry.kozliuk@gmail.com, bruce.richardson@intel.com, roretzla@microsoft.com, navasile@linux.microsoft.com, dmitrym@microsoft.com, pallavi.kadam@intel.com, talshn@nvidia.com, thomas@monjalon.net, aconole@redhat.com Subject: [PATCH v14 04/11] app/test: skip interrupt tests on Windows Date: Wed, 8 Dec 2021 10:59:53 -0800 Message-Id: <1638990000-3228-5-git-send-email-jizh@linux.microsoft.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1638990000-3228-1-git-send-email-jizh@linux.microsoft.com> References: <1638928262-13177-1-git-send-email-jizh@linux.microsoft.com> <1638990000-3228-1-git-send-email-jizh@linux.microsoft.com> X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Even though test_interrupts.c can compile on Windows, skip interrupt tests for now since majority of eal_interrupt on Windows are stubs. Will remove the skip after interrupt being fully enabled on Windows. Signed-off-by: Jie Zhou Acked-by: Dmitry Kozlyuk --- app/test/test_interrupts.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/app/test/test_interrupts.c b/app/test/test_interrupts.c index 2a05399f96..eec9b2805b 100644 --- a/app/test/test_interrupts.c +++ b/app/test/test_interrupts.c @@ -12,6 +12,15 @@ #include "test.h" +#ifdef RTE_EXEC_ENV_WINDOWS +static int +test_interrupt(void) +{ + printf("Interrupt on Windows is not fully supported yet, skipping test\n"); + return TEST_SKIPPED; +} +#else + #define TEST_INTERRUPT_CHECK_INTERVAL 100 /* ms */ /* predefined interrupt handle types */ @@ -590,5 +599,6 @@ test_interrupt(void) return ret; } +#endif /*ifdef RTE_EXEC_ENV_WINDOWS*/ REGISTER_TEST_COMMAND(interrupt_autotest, test_interrupt); From patchwork Wed Dec 8 18:59:54 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jie Zhou X-Patchwork-Id: 105032 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 64199A00C2; Wed, 8 Dec 2021 20:00:39 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6E0EF426FF; Wed, 8 Dec 2021 20:00:14 +0100 (CET) Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by mails.dpdk.org (Postfix) with ESMTP id 728EC410F3 for ; Wed, 8 Dec 2021 20:00:07 +0100 (CET) Received: from linuxonhyperv3.guj3yctzbm1etfxqx2vob5hsef.xx.internal.cloudapp.net (linux.microsoft.com [13.77.154.182]) by linux.microsoft.com (Postfix) with ESMTPSA id 307D220B7187; Wed, 8 Dec 2021 11:00:06 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 307D220B7187 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1638990006; bh=I7CwcRiVEtDlrx2C/+7MrCrhr17EFreOl0A6jYVVxrE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dK0JUOxfPh+BnpBBWa7jXoPzOmo3bhwRmfDrEQzeCcWzHRYvzXZ/VGVrdI2yGuxSi VvnaQX24MQ75MUvLCDhsDLOy10nlrEfZTFioH5dykd51RSZDrauUID8T6Vzn+KRYg6 ZqMOKGxGNnVTyzabguz3Ej37E8u6XbSvQST9nQsI= From: Jie Zhou To: dev@dpdk.org Cc: dmitry.kozliuk@gmail.com, bruce.richardson@intel.com, roretzla@microsoft.com, navasile@linux.microsoft.com, dmitrym@microsoft.com, pallavi.kadam@intel.com, talshn@nvidia.com, thomas@monjalon.net, aconole@redhat.com Subject: [PATCH v14 05/11] app/test: skip two logs_autotest cases on Windows Date: Wed, 8 Dec 2021 10:59:54 -0800 Message-Id: <1638990000-3228-6-git-send-email-jizh@linux.microsoft.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1638990000-3228-1-git-send-email-jizh@linux.microsoft.com> References: <1638928262-13177-1-git-send-email-jizh@linux.microsoft.com> <1638990000-3228-1-git-send-email-jizh@linux.microsoft.com> X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org DPDK logs_autotest on Windows failed at "dynamic log types" tests. The failures are on 2 test cases for rte_log_set_level_regexp API, due to regular expression is not supported on Windows in DPDK yet and regcomp/regexec are just stubs on Windows (in regex.h). In app\test\test_logs.c, ifndef these two test cases, and for the rte_log_set_level_pattern validation case following these two cases, differentiate the expected log level passed into macro CHECK_LEVELS Now logs_autotest completes for all dynamic log types and static log types. Signed-off-by: Jie Zhou Acked-by: Dmitry Kozlyuk --- app/test/test_logs.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/test/test_logs.c b/app/test/test_logs.c index 7abb6eeca2..7c001c1ab3 100644 --- a/app/test/test_logs.c +++ b/app/test/test_logs.c @@ -113,6 +113,7 @@ test_logs(void) rte_log_set_level(logtype1, RTE_LOG_ERR); CHECK_LEVELS(RTE_LOG_ERR, RTE_LOG_INFO, RTE_LOG_ERR); +#ifndef RTE_EXEC_ENV_WINDOWS rte_log_set_level_regexp("type$", RTE_LOG_EMERG); CHECK_LEVELS(RTE_LOG_ERR, RTE_LOG_INFO, RTE_LOG_ERR); @@ -121,7 +122,10 @@ test_logs(void) rte_log_set_level_pattern("logtype", RTE_LOG_DEBUG); CHECK_LEVELS(RTE_LOG_ERR, RTE_LOG_EMERG, RTE_LOG_EMERG); - +#else + ret = rte_log_set_level_pattern("logtype", RTE_LOG_DEBUG); + CHECK_LEVELS(RTE_LOG_ERR, RTE_LOG_INFO, RTE_LOG_ERR); +#endif /* set logtype level low to so we can test global level */ rte_log_set_level_pattern("logtype*", RTE_LOG_DEBUG); CHECK_LEVELS(RTE_LOG_DEBUG, RTE_LOG_DEBUG, RTE_LOG_DEBUG); From patchwork Wed Dec 8 18:59:55 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jie Zhou X-Patchwork-Id: 105035 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id C914AA00C2; Wed, 8 Dec 2021 20:00:56 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id CA46F4271A; Wed, 8 Dec 2021 20:00:17 +0100 (CET) Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by mails.dpdk.org (Postfix) with ESMTP id 73ED54111B for ; Wed, 8 Dec 2021 20:00:07 +0100 (CET) Received: from linuxonhyperv3.guj3yctzbm1etfxqx2vob5hsef.xx.internal.cloudapp.net (linux.microsoft.com [13.77.154.182]) by linux.microsoft.com (Postfix) with ESMTPSA id 4632E20B7189; Wed, 8 Dec 2021 11:00:06 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 4632E20B7189 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1638990006; bh=fXG6QRWDuqosgbodRfBD3bU01lHTBhToToexzk+7bBM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qO+uSw98DM1x1w+8EyECt+y4sEyM9QxOaEqySztzwU7N/pg4oR0V3n0i+IhXo8uNs rQdNS1tmcYpjgRb27sxUqeVcG2IIlXkUSThYGZRwCz+KyqAJ9oamzAmHQ9FQoTL1mH 3kjtQGidBvsr/XBnCWrO8l8wA6W5JKJvwqcKdQmM= From: Jie Zhou To: dev@dpdk.org Cc: dmitry.kozliuk@gmail.com, bruce.richardson@intel.com, roretzla@microsoft.com, navasile@linux.microsoft.com, dmitrym@microsoft.com, pallavi.kadam@intel.com, talshn@nvidia.com, thomas@monjalon.net, aconole@redhat.com Subject: [PATCH v14 06/11] app/test: differentiate a strerror on different OS Date: Wed, 8 Dec 2021 10:59:55 -0800 Message-Id: <1638990000-3228-7-git-send-email-jizh@linux.microsoft.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1638990000-3228-1-git-send-email-jizh@linux.microsoft.com> References: <1638928262-13177-1-git-send-email-jizh@linux.microsoft.com> <1638990000-3228-1-git-send-email-jizh@linux.microsoft.com> X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org On Windows, strerror returns just "Unknown error" for errnum greater than MAX_ERRNO, while linux and freebsd returns "Unknown error ", which is the current expectation for errno_autotest. Differentiate the error string on Windows to remove a "duplicate error code" failure. Signed-off-by: Jie Zhou Acked-by: Dmitry Kozlyuk --- app/test/test_errno.c | 12 +++++++++++- lib/eal/common/eal_common_errno.c | 4 ++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/app/test/test_errno.c b/app/test/test_errno.c index 3ff0456a58..0db4fbc8b3 100644 --- a/app/test/test_errno.c +++ b/app/test/test_errno.c @@ -18,13 +18,19 @@ test_errno(void) { const char *rte_retval; const char *libc_retval; + +#ifndef RTE_EXEC_ENV_WINDOWS #ifdef RTE_EXEC_ENV_FREEBSD /* BSD has a colon in the string, unlike linux */ const char unknown_code_result[] = "Unknown error: %d"; #else const char unknown_code_result[] = "Unknown error %d"; #endif - char expected_libc_retval[sizeof(unknown_code_result)+3]; + char expected_libc_retval[sizeof(unknown_code_result) + 3]; +#else + /* Windows doesn't return error number for error greater than MAX_errno*/ + static const char expected_libc_retval[] = "Unknown error"; +#endif /* use a small selection of standard errors for testing */ int std_errs[] = {EAGAIN, EBADF, EACCES, EINTR, EINVAL}; @@ -54,11 +60,13 @@ test_errno(void) rte_retval, libc_retval); if (strcmp(rte_retval, libc_retval) == 0) return -1; +#ifndef RTE_EXEC_ENV_WINDOWS /* generate appropriate error string for unknown error number * and then check that this is what we got back. If not, we have * a duplicate error number that conflicts with errno.h */ snprintf(expected_libc_retval, sizeof(expected_libc_retval), unknown_code_result, rte_errs[i]); +#endif if ((strcmp(expected_libc_retval, libc_retval) != 0) && (strcmp("", libc_retval) != 0)){ printf("Error, duplicate error code %d\n", rte_errs[i]); @@ -69,8 +77,10 @@ test_errno(void) /* ensure that beyond RTE_MAX_ERRNO, we always get an unknown code */ rte_retval = rte_strerror(RTE_MAX_ERRNO + 1); libc_retval = strerror(RTE_MAX_ERRNO + 1); +#ifndef RTE_EXEC_ENV_WINDOWS snprintf(expected_libc_retval, sizeof(expected_libc_retval), unknown_code_result, RTE_MAX_ERRNO + 1); +#endif printf("rte_strerror: '%s', strerror: '%s'\n", rte_retval, libc_retval); if ((strcmp(rte_retval, libc_retval) != 0) || diff --git a/lib/eal/common/eal_common_errno.c b/lib/eal/common/eal_common_errno.c index f86802705a..7507c746ec 100644 --- a/lib/eal/common/eal_common_errno.c +++ b/lib/eal/common/eal_common_errno.c @@ -37,7 +37,11 @@ rte_strerror(int errnum) /* since some implementations of strerror_r throw an error * themselves if errnum is too big, we handle that case here */ if (errnum >= RTE_MAX_ERRNO) +#ifdef RTE_EXEC_ENV_WINDOWS + snprintf(ret, RETVAL_SZ, "Unknown error"); +#else snprintf(ret, RETVAL_SZ, "Unknown error%s %d", sep, errnum); +#endif else switch (errnum){ case E_RTE_SECONDARY: From patchwork Wed Dec 8 18:59:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jie Zhou X-Patchwork-Id: 105036 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 151E8A00C2; Wed, 8 Dec 2021 20:01:03 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id ADF964272A; Wed, 8 Dec 2021 20:00:18 +0100 (CET) Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by mails.dpdk.org (Postfix) with ESMTP id AD8E54118F for ; Wed, 8 Dec 2021 20:00:07 +0100 (CET) Received: from linuxonhyperv3.guj3yctzbm1etfxqx2vob5hsef.xx.internal.cloudapp.net (linux.microsoft.com [13.77.154.182]) by linux.microsoft.com (Postfix) with ESMTPSA id 5C4E920B718A; Wed, 8 Dec 2021 11:00:06 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 5C4E920B718A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1638990006; bh=UZpYfFrKU35m6epUeUaxDxXFz7e5CX7pif99FZ+wt8Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KdKsLSrW4AblO8NfhlUihz5jDjlRVdaZ2njRMYKe8nDOU0sPMwQ2w3NBlqUoJnbRE 3dXguLVwFB2V0h8a+jL33B+SHMArN+KCypI0nMWbaDlJU91FxZRy7oYBs9flNNRr0E fFrpAiM8uPZtQuUps9Iuw0OftDmewDPNTlGf7DVI= From: Jie Zhou To: dev@dpdk.org Cc: dmitry.kozliuk@gmail.com, bruce.richardson@intel.com, roretzla@microsoft.com, navasile@linux.microsoft.com, dmitrym@microsoft.com, pallavi.kadam@intel.com, talshn@nvidia.com, thomas@monjalon.net, aconole@redhat.com Subject: [PATCH v14 07/11] app/test: remove two alarm_autotest cases Date: Wed, 8 Dec 2021 10:59:56 -0800 Message-Id: <1638990000-3228-8-git-send-email-jizh@linux.microsoft.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1638990000-3228-1-git-send-email-jizh@linux.microsoft.com> References: <1638928262-13177-1-git-send-email-jizh@linux.microsoft.com> <1638990000-3228-1-git-send-email-jizh@linux.microsoft.com> X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Remove two alarm_autotest test cases which do bogus range check on Windows. Signed-off-by: Jie Zhou Acked-by: Dmitry Kozlyuk --- app/test/test_alarm.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/test/test_alarm.c b/app/test/test_alarm.c index b4034339b8..70e97a3109 100644 --- a/app/test/test_alarm.c +++ b/app/test/test_alarm.c @@ -10,6 +10,7 @@ #include "test.h" +#ifndef RTE_EXEC_ENV_WINDOWS static volatile int flag; static void @@ -18,6 +19,7 @@ test_alarm_callback(void *cb_arg) flag = 1; printf("Callback setting flag - OK. [cb_arg = %p]\n", cb_arg); } +#endif static int test_alarm(void) @@ -27,6 +29,7 @@ test_alarm(void) return 0; #endif +#ifndef RTE_EXEC_ENV_WINDOWS /* check if it will fail to set alarm with wrong us value */ printf("check if it will fail to set alarm with wrong ms values\n"); if (rte_eal_alarm_set(0, test_alarm_callback, @@ -39,6 +42,7 @@ test_alarm(void) printf("should not be successful with (UINT64_MAX-1) us value\n"); return -1; } +#endif /* check if it will fail to set alarm with null callback parameter */ printf("check if it will fail to set alarm with null callback parameter\n"); From patchwork Wed Dec 8 18:59:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jie Zhou X-Patchwork-Id: 105034 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 24814A00C2; Wed, 8 Dec 2021 20:00:51 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B287742710; Wed, 8 Dec 2021 20:00:16 +0100 (CET) Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by mails.dpdk.org (Postfix) with ESMTP id 858914114F for ; Wed, 8 Dec 2021 20:00:07 +0100 (CET) Received: from linuxonhyperv3.guj3yctzbm1etfxqx2vob5hsef.xx.internal.cloudapp.net (linux.microsoft.com [13.77.154.182]) by linux.microsoft.com (Postfix) with ESMTPSA id 71EA620B718B; Wed, 8 Dec 2021 11:00:06 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 71EA620B718B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1638990006; bh=l7fE7rR5cUsqlFJr5f/Ru6P/9Q44hFOWSCOyg+D0ovE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nbkcqrengwESJH0OybtvBaWKCZdqk4kT4nc7ksmN2gGJtmAb5cNL/BkINMg0UaO8j RIPQL8k1isjfLQE3s2Bw5IrMlWuMOXclSia83dtiG4IzHQjyCLYhXXyre06mA6KXLZ YeO4l4UD/EuhNF7j7ljPvSDJl50pDD5vlUArEF3w= From: Jie Zhou To: dev@dpdk.org Cc: dmitry.kozliuk@gmail.com, bruce.richardson@intel.com, roretzla@microsoft.com, navasile@linux.microsoft.com, dmitrym@microsoft.com, pallavi.kadam@intel.com, talshn@nvidia.com, thomas@monjalon.net, aconole@redhat.com Subject: [PATCH v14 08/11] app/test: resolve name collision Date: Wed, 8 Dec 2021 10:59:57 -0800 Message-Id: <1638990000-3228-9-git-send-email-jizh@linux.microsoft.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1638990000-3228-1-git-send-email-jizh@linux.microsoft.com> References: <1638928262-13177-1-git-send-email-jizh@linux.microsoft.com> <1638990000-3228-1-git-send-email-jizh@linux.microsoft.com> X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Add OP_ prefix to resolve name collision to enable hash_perf test Signed-off-by: Jie Zhou Acked-by: Dmitry Kozlyuk --- app/test/test_hash_perf.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/app/test/test_hash_perf.c b/app/test/test_hash_perf.c index 76cdac5d53..7e98ec3964 100644 --- a/app/test/test_hash_perf.c +++ b/app/test/test_hash_perf.c @@ -30,10 +30,10 @@ #define BURST_SIZE 16 enum operations { - ADD = 0, - LOOKUP, - LOOKUP_MULTI, - DELETE, + OP_ADD = 0, + OP_LOOKUP, + OP_LOOKUP_MULTI, + OP_DELETE, NUM_OPERATIONS }; @@ -308,7 +308,7 @@ timed_adds(unsigned int with_hash, unsigned int with_data, const uint64_t end_tsc = rte_rdtsc(); const uint64_t time_taken = end_tsc - start_tsc; - cycles[table_index][ADD][with_hash][with_data] = time_taken/keys_to_add; + cycles[table_index][OP_ADD][with_hash][with_data] = time_taken/keys_to_add; return 0; } @@ -385,7 +385,7 @@ timed_lookups(unsigned int with_hash, unsigned int with_data, const uint64_t end_tsc = rte_rdtsc(); const uint64_t time_taken = end_tsc - start_tsc; - cycles[table_index][LOOKUP][with_hash][with_data] = time_taken/num_lookups; + cycles[table_index][OP_LOOKUP][with_hash][with_data] = time_taken/num_lookups; return 0; } @@ -511,7 +511,7 @@ timed_lookups_multi(unsigned int with_hash, unsigned int with_data, const uint64_t end_tsc = rte_rdtsc(); const uint64_t time_taken = end_tsc - start_tsc; - cycles[table_index][LOOKUP_MULTI][with_hash][with_data] = + cycles[table_index][OP_LOOKUP_MULTI][with_hash][with_data] = time_taken/num_lookups; return 0; @@ -550,7 +550,7 @@ timed_deletes(unsigned int with_hash, unsigned int with_data, const uint64_t end_tsc = rte_rdtsc(); const uint64_t time_taken = end_tsc - start_tsc; - cycles[table_index][DELETE][with_hash][with_data] = time_taken/keys_to_add; + cycles[table_index][OP_DELETE][with_hash][with_data] = time_taken/keys_to_add; return 0; } From patchwork Wed Dec 8 18:59:58 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jie Zhou X-Patchwork-Id: 105038 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id ED8BAA00C2; Wed, 8 Dec 2021 20:01:15 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A810842746; Wed, 8 Dec 2021 20:00:20 +0100 (CET) Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by mails.dpdk.org (Postfix) with ESMTP id 766A441143 for ; Wed, 8 Dec 2021 20:00:07 +0100 (CET) Received: from linuxonhyperv3.guj3yctzbm1etfxqx2vob5hsef.xx.internal.cloudapp.net (linux.microsoft.com [13.77.154.182]) by linux.microsoft.com (Postfix) with ESMTPSA id 8825D20B718C; Wed, 8 Dec 2021 11:00:06 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 8825D20B718C DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1638990006; bh=NqXg6Ln/THXbFwxm1jAi06QJTWNZNld4j5MJuqasTDA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HhQYfQ6bjW8GyP330ysl4w8vH0tEwic3hqfxt1GAq0tUL4AsV8romIa6YXK57jCv8 wLsrWKKfOUsYuD7QwiMyB1ANXDbu0jLGOxg6+fVeesS/5Yat1M42oeehajgqTkJuok ki/u0yFnvxSQ7vWhvqhT3lWYgFh14XM/QXmaVRb0= From: Jie Zhou To: dev@dpdk.org Cc: dmitry.kozliuk@gmail.com, bruce.richardson@intel.com, roretzla@microsoft.com, navasile@linux.microsoft.com, dmitrym@microsoft.com, pallavi.kadam@intel.com, talshn@nvidia.com, thomas@monjalon.net, aconole@redhat.com Subject: [PATCH v14 09/11] app/test: add test stubs for not supported ones Date: Wed, 8 Dec 2021 10:59:58 -0800 Message-Id: <1638990000-3228-10-git-send-email-jizh@linux.microsoft.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1638990000-3228-1-git-send-email-jizh@linux.microsoft.com> References: <1638928262-13177-1-git-send-email-jizh@linux.microsoft.com> <1638990000-3228-1-git-send-email-jizh@linux.microsoft.com> X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Add test stubs for tests which are not yet supported for Windows: - The libraries that tests depend on are not enabled on Windows yet - The tests can compile but with issue still under investigation * test_func_reentrancy: Windows EAL has no protection against repeated calls. * test_lcores: Execution enters an infinite loops, requires investigation. * test_rcu_qsbr_perf: Execution hangs on Windows, requires investigation. Signed-off-by: Jie Zhou Signed-off-by: Dmitry Kozlyuk Acked-by: Tyler Retzlaff --- app/test/test_acl.c | 12 ++++ app/test/test_bpf.c | 15 +++- app/test/test_cryptodev.c | 4 ++ app/test/test_cryptodev_asym.c | 4 ++ app/test/test_cryptodev_blockcipher.c | 4 ++ app/test/test_cryptodev_security_ipsec.c | 4 ++ app/test/test_cryptodev_security_pdcp.c | 4 ++ app/test/test_debug.c | 17 ++++- app/test/test_distributor.c | 13 ++++ app/test/test_distributor_perf.c | 13 ++++ app/test/test_eal_flags.c | 90 ++++++++++++++++++++++++ app/test/test_eal_fs.c | 12 ++++ app/test/test_efd.c | 15 +++- app/test/test_efd_perf.c | 16 ++++- app/test/test_event_crypto_adapter.c | 15 +++- app/test/test_event_eth_rx_adapter.c | 25 ++++++- app/test/test_event_eth_tx_adapter.c | 12 ++++ app/test/test_event_ring.c | 16 ++++- app/test/test_event_timer_adapter.c | 16 ++++- app/test/test_eventdev.c | 20 +++++- app/test/test_external_mem.c | 18 ++++- app/test/test_fib.c | 22 +++++- app/test/test_fib6.c | 24 ++++++- app/test/test_fib6_perf.c | 16 ++++- app/test/test_fib_perf.c | 15 +++- app/test/test_flow_classify.c | 13 ++++ app/test/test_func_reentrancy.c | 12 ++++ app/test/test_graph.c | 18 ++++- app/test/test_graph_perf.c | 16 ++++- app/test/test_hash_perf.c | 12 ++++ app/test/test_ipfrag.c | 16 ++++- app/test/test_ipsec.c | 15 +++- app/test/test_ipsec_perf.c | 15 +++- app/test/test_ipsec_sad.c | 14 +++- app/test/test_kni.c | 10 +-- app/test/test_lcores.c | 12 ++++ app/test/test_lpm.c | 14 +++- app/test/test_lpm6.c | 14 +++- app/test/test_lpm6_perf.c | 14 +++- app/test/test_lpm_perf.c | 13 +++- app/test/test_malloc.c | 20 ++++-- app/test/test_mbuf.c | 15 +++- app/test/test_member.c | 16 ++++- app/test/test_member_perf.c | 16 ++++- app/test/test_memcpy_perf.c | 1 - app/test/test_mp_secondary.c | 12 ++++ app/test/test_pie.c | 30 +++++++- app/test/test_rawdev.c | 17 ++++- app/test/test_rcu_qsbr_perf.c | 12 ++++ app/test/test_red.c | 29 +++++++- app/test/test_reorder.c | 15 +++- app/test/test_rib.c | 22 +++++- app/test/test_rib6.c | 22 +++++- app/test/test_sched.c | 14 +++- app/test/test_security.c | 4 +- app/test/test_table.c | 13 ++++ app/test/test_table_acl.c | 3 + app/test/test_table_combined.c | 4 ++ app/test/test_table_pipeline.c | 4 ++ app/test/test_table_ports.c | 4 ++ app/test/test_table_tables.c | 4 ++ app/test/test_timer_secondary.c | 13 ++++ app/test/test_trace.c | 32 +++++++-- 63 files changed, 880 insertions(+), 72 deletions(-) diff --git a/app/test/test_acl.c b/app/test/test_acl.c index 5b32347954..7814e25a53 100644 --- a/app/test/test_acl.c +++ b/app/test/test_acl.c @@ -11,6 +11,16 @@ #include #include #include + +#ifdef RTE_EXEC_ENV_WINDOWS +static int +test_acl(void) +{ + printf("acl not supported on Windows, skipping test\n"); + return TEST_SKIPPED; +} + +#else #include #include @@ -1741,4 +1751,6 @@ test_acl(void) return 0; } +#endif /*ifdef RTE_EXEC_ENV_WINDOWS*/ + REGISTER_TEST_COMMAND(acl_autotest, test_acl); diff --git a/app/test/test_bpf.c b/app/test/test_bpf.c index 46bcb51f86..055df252ba 100644 --- a/app/test/test_bpf.c +++ b/app/test/test_bpf.c @@ -14,11 +14,22 @@ #include #include #include +#include "test.h" + +#if !defined(RTE_LIB_BPF) + +static int +test_bpf(void) +{ + printf("BPF not supported, skipping test\n"); + return TEST_SKIPPED; +} + +#else #include #include #include -#include "test.h" /* * Basic functional tests for librte_bpf. @@ -3248,6 +3259,8 @@ test_bpf(void) return rc; } +#endif + REGISTER_TEST_COMMAND(bpf_autotest, test_bpf); #ifdef RTE_HAS_LIBPCAP diff --git a/app/test/test_cryptodev.c b/app/test/test_cryptodev.c index 10b48cdadb..f83c844e42 100644 --- a/app/test/test_cryptodev.c +++ b/app/test/test_cryptodev.c @@ -3,6 +3,8 @@ * Copyright 2020 NXP */ +#ifndef RTE_EXEC_ENV_WINDOWS + #include #include @@ -15739,3 +15741,5 @@ REGISTER_TEST_COMMAND(cryptodev_nitrox_autotest, test_cryptodev_nitrox); REGISTER_TEST_COMMAND(cryptodev_bcmfs_autotest, test_cryptodev_bcmfs); REGISTER_TEST_COMMAND(cryptodev_cn9k_autotest, test_cryptodev_cn9k); REGISTER_TEST_COMMAND(cryptodev_cn10k_autotest, test_cryptodev_cn10k); + +#endif /*ifndef RTE_EXEC_ENV_WINDOWS*/ diff --git a/app/test/test_cryptodev_asym.c b/app/test/test_cryptodev_asym.c index 9d19a6d6d9..680ced4dbe 100644 --- a/app/test/test_cryptodev_asym.c +++ b/app/test/test_cryptodev_asym.c @@ -3,6 +3,8 @@ * Copyright (c) 2019 Intel Corporation */ +#ifndef RTE_EXEC_ENV_WINDOWS + #include #include #include @@ -2429,3 +2431,5 @@ REGISTER_TEST_COMMAND(cryptodev_octeontx2_asym_autotest, test_cryptodev_octeontx2_asym); REGISTER_TEST_COMMAND(cryptodev_cn9k_asym_autotest, test_cryptodev_cn9k_asym); REGISTER_TEST_COMMAND(cryptodev_cn10k_asym_autotest, test_cryptodev_cn10k_asym); + +#endif /*ifndef RTE_EXEC_ENV_WINDOWS*/ diff --git a/app/test/test_cryptodev_blockcipher.c b/app/test/test_cryptodev_blockcipher.c index 5688a45377..3860433ffd 100644 --- a/app/test/test_cryptodev_blockcipher.c +++ b/app/test/test_cryptodev_blockcipher.c @@ -2,6 +2,8 @@ * Copyright(c) 2015-2017 Intel Corporation */ +#ifndef RTE_EXEC_ENV_WINDOWS + #include #include #include @@ -1221,3 +1223,5 @@ free_blockcipher_test_suite(struct unit_test_suite *ts) { free(ts); } + +#endif /*ifndef RTE_EXEC_ENV_WINDOWS*/ diff --git a/app/test/test_cryptodev_security_ipsec.c b/app/test/test_cryptodev_security_ipsec.c index 4708803bd2..a84afae7f5 100644 --- a/app/test/test_cryptodev_security_ipsec.c +++ b/app/test/test_cryptodev_security_ipsec.c @@ -2,6 +2,8 @@ * Copyright(C) 2021 Marvell. */ +#ifndef RTE_EXEC_ENV_WINDOWS + #include #include #include @@ -672,3 +674,5 @@ test_ipsec_status_check(struct rte_crypto_op *op, return ret; } + +#endif /*ifndef RTE_EXEC_ENV_WINDOWS*/ diff --git a/app/test/test_cryptodev_security_pdcp.c b/app/test/test_cryptodev_security_pdcp.c index a7641bab7a..3409add715 100644 --- a/app/test/test_cryptodev_security_pdcp.c +++ b/app/test/test_cryptodev_security_pdcp.c @@ -4,6 +4,8 @@ * Copyright 2018-2019 NXP */ +#ifndef RTE_EXEC_ENV_WINDOWS + #include #include @@ -587,3 +589,5 @@ test_PDCP_PROTO_uplane_decap_all(void) return n - i; }; + +#endif /*ifndef RTE_EXEC_ENV_WINDOWS*/ diff --git a/app/test/test_debug.c b/app/test/test_debug.c index 23b24db177..c4038a4ed1 100644 --- a/app/test/test_debug.c +++ b/app/test/test_debug.c @@ -2,8 +2,21 @@ * Copyright(c) 2010-2014 Intel Corporation */ +#include "test.h" + #include #include + +#ifdef RTE_EXEC_ENV_WINDOWS +static int +test_debug(void) +{ + printf("debug not supported on Windows, skipping test\n"); + return TEST_SKIPPED; +} + +#else + #include #include #include @@ -14,8 +27,6 @@ #include #include -#include "test.h" - /* * Debug test * ========== @@ -127,4 +138,6 @@ test_debug(void) return 0; } +#endif /*ifdef RTE_EXEC_ENV_WINDOWS*/ + REGISTER_TEST_COMMAND(debug_autotest, test_debug); diff --git a/app/test/test_distributor.c b/app/test/test_distributor.c index 961f326cd5..0ecd5ba232 100644 --- a/app/test/test_distributor.c +++ b/app/test/test_distributor.c @@ -11,6 +11,17 @@ #include #include #include + +#ifdef RTE_EXEC_ENV_WINDOWS +static int +test_distributor(void) +{ + printf("distributor not supported on Windows, skipping test\n"); + return TEST_SKIPPED; +} + +#else + #include #include @@ -939,4 +950,6 @@ test_distributor(void) return -1; } +#endif /*ifdef RTE_EXEC_ENV_WINDOWS*/ + REGISTER_TEST_COMMAND(distributor_autotest, test_distributor); diff --git a/app/test/test_distributor_perf.c b/app/test/test_distributor_perf.c index 92e330f194..650a0317ef 100644 --- a/app/test/test_distributor_perf.c +++ b/app/test/test_distributor_perf.c @@ -10,6 +10,17 @@ #include #include #include + +#ifdef RTE_EXEC_ENV_WINDOWS +static int +test_distributor_perf(void) +{ + printf("distributor perf not supported on Windows, skipping test\n"); + return TEST_SKIPPED; +} + +#else + #include #include @@ -264,4 +275,6 @@ test_distributor_perf(void) return 0; } +#endif /*ifdef RTE_EXEC_ENV_WINDOWS*/ + REGISTER_TEST_COMMAND(distributor_perf_autotest, test_distributor_perf); diff --git a/app/test/test_eal_flags.c b/app/test/test_eal_flags.c index d7f4c2cd47..5e7e391881 100644 --- a/app/test/test_eal_flags.c +++ b/app/test/test_eal_flags.c @@ -9,6 +9,94 @@ #include #include + +#ifdef RTE_EXEC_ENV_WINDOWS +static int +test_missing_c_flag(void) +{ + printf("emissing_c_flag not supported on Windows, skipping test\n"); + return TEST_SKIPPED; +} + +static int +test_main_lcore_flag(void) +{ + printf("main_lcore_flag not supported on Windows, skipping test\n"); + return TEST_SKIPPED; +} + +static int +test_invalid_n_flag(void) +{ + printf("invalid_n_flag not supported on Windows, skipping test\n"); + return TEST_SKIPPED; +} + +static int +test_no_hpet_flag(void) +{ + printf("no_hpet_flag not supported on Windows, skipping test\n"); + return TEST_SKIPPED; +} + +static int +test_no_huge_flag(void) +{ + printf("no_huge_flag not supported on Windows, skipping test\n"); + return TEST_SKIPPED; +} + +static int +test_allow_flag(void) +{ + printf("allow_flag not supported on Windows, skipping test\n"); + return TEST_SKIPPED; +} + +static int +test_invalid_b_flag(void) +{ + printf("invalid_b_flag not supported on Windows, skipping test\n"); + return TEST_SKIPPED; +} + +static int +test_invalid_vdev_flag(void) +{ + printf("invalid_vdev_flag not supported on Windows, skipping test\n"); + return TEST_SKIPPED; +} + +static int +test_invalid_r_flag(void) +{ + printf("invalid_r_flag not supported on Windows, skipping test\n"); + return TEST_SKIPPED; +} + +static int +test_memory_flags(void) +{ + printf("memory_flags not supported on Windows, skipping test\n"); + return TEST_SKIPPED; +} + +static int +test_file_prefix(void) +{ + printf("file_prefix not supported on Windows, skipping test\n"); + return TEST_SKIPPED; +} + +static int +test_misc_flags(void) +{ + printf("misc_flags not supported on Windows, skipping test\n"); + return TEST_SKIPPED; +} + +#else + #include #include #include @@ -1498,6 +1586,8 @@ test_memory_flags(void) return 0; } +#endif /*ifdef RTE_EXEC_ENV_WINDOWS*/ + REGISTER_TEST_COMMAND(eal_flags_c_opt_autotest, test_missing_c_flag); REGISTER_TEST_COMMAND(eal_flags_main_opt_autotest, test_main_lcore_flag); REGISTER_TEST_COMMAND(eal_flags_n_opt_autotest, test_invalid_n_flag); diff --git a/app/test/test_eal_fs.c b/app/test/test_eal_fs.c index 39ac6961b3..5d24ae3d32 100644 --- a/app/test/test_eal_fs.c +++ b/app/test/test_eal_fs.c @@ -10,6 +10,16 @@ #include "eal_filesystem.h" +#ifdef RTE_EXEC_ENV_WINDOWS +static int +test_eal_fs(void) +{ + printf("eal_fs not supported on Windows, skipping test\n"); + return TEST_SKIPPED; +} + +#else + static int test_parse_sysfs_value(void) { @@ -173,4 +183,6 @@ test_eal_fs(void) return 0; } +#endif /*ifdef RTE_EXEC_ENV_WINDOWS*/ + REGISTER_TEST_COMMAND(eal_fs_autotest, test_eal_fs); diff --git a/app/test/test_efd.c b/app/test/test_efd.c index 1b249e0447..f8f356dcd9 100644 --- a/app/test/test_efd.c +++ b/app/test/test_efd.c @@ -1,6 +1,17 @@ /* SPDX-License-Identifier: BSD-3-Clause * Copyright(c) 2016-2017 Intel Corporation */ +#include "test.h" + +#ifdef RTE_EXEC_ENV_WINDOWS +static int +test_efd(void) +{ + printf("efd not supported on Windows, skipping test\n"); + return TEST_SKIPPED; +} + +#else #include #include @@ -10,8 +21,6 @@ #include #include -#include "test.h" - #define EFD_TEST_KEY_LEN 8 #define TABLE_SIZE (1 << 21) #define ITERATIONS 3 @@ -462,4 +471,6 @@ test_efd(void) return 0; } +#endif /*ifdef RTE_EXEC_ENV_WINDOWS*/ + REGISTER_TEST_COMMAND(efd_autotest, test_efd); diff --git a/app/test/test_efd_perf.c b/app/test/test_efd_perf.c index f3fe3b1736..1bf6bcb0ca 100644 --- a/app/test/test_efd_perf.c +++ b/app/test/test_efd_perf.c @@ -2,6 +2,18 @@ * Copyright(c) 2016-2017 Intel Corporation */ +#include "test.h" + +#ifdef RTE_EXEC_ENV_WINDOWS +static int +test_efd_perf(void) +{ + printf("efd_perf not supported on Windows, skipping test\n"); + return TEST_SKIPPED; +} + +#else + #include #include @@ -13,8 +25,6 @@ #include #include -#include "test.h" - #define NUM_KEYSIZES 10 #define NUM_SHUFFLES 10 #define MAX_KEYSIZE 64 @@ -382,4 +392,6 @@ test_efd_perf(void) return 0; } +#endif /*ifdef RTE_EXEC_ENV_WINDOWS*/ + REGISTER_TEST_COMMAND(efd_perf_autotest, test_efd_perf); diff --git a/app/test/test_event_crypto_adapter.c b/app/test/test_event_crypto_adapter.c index 3d7e9fb93c..8f5fd78723 100644 --- a/app/test/test_event_crypto_adapter.c +++ b/app/test/test_event_crypto_adapter.c @@ -3,16 +3,27 @@ * All rights reserved. */ +#include "test.h" #include #include #include #include + +#ifdef RTE_EXEC_ENV_WINDOWS +static int +test_event_crypto_adapter(void) +{ + printf("event_crypto_adapter not supported on Windows, skipping test\n"); + return TEST_SKIPPED; +} + +#else + #include #include #include #include #include -#include "test.h" #define PKT_TRACE 0 #define NUM 1 @@ -1011,5 +1022,7 @@ test_event_crypto_adapter(void) return unit_test_suite_runner(&functional_testsuite); } +#endif /*ifdef RTE_EXEC_ENV_WINDOWS*/ + REGISTER_TEST_COMMAND(event_crypto_adapter_autotest, test_event_crypto_adapter); diff --git a/app/test/test_event_eth_rx_adapter.c b/app/test/test_event_eth_rx_adapter.c index 7cb91b152f..1df24fdce2 100644 --- a/app/test/test_event_eth_rx_adapter.c +++ b/app/test/test_event_eth_rx_adapter.c @@ -1,18 +1,37 @@ /* SPDX-License-Identifier: BSD-3-Clause * Copyright(c) 2017 Intel Corporation */ + +#include "test.h" + #include #include #include #include #include + +#ifdef RTE_EXEC_ENV_WINDOWS +static int +test_event_eth_rx_adapter_common(void) +{ + printf("event_eth_rx_adapter not supported on Windows, skipping test\n"); + return TEST_SKIPPED; +} + +static int +test_event_eth_rx_intr_adapter_common(void) +{ + printf("event_eth_rx_intr_adapter not supported on Windows, skipping test\n"); + return TEST_SKIPPED; +} + +#else + #include #include #include -#include "test.h" - #define MAX_NUM_RX_QUEUE 64 #define NB_MBUFS (8192 * num_ports * MAX_NUM_RX_QUEUE) #define MBUF_CACHE_SIZE 512 @@ -1027,6 +1046,8 @@ test_event_eth_rx_intr_adapter_common(void) return unit_test_suite_runner(&event_eth_rx_intr_tests); } +#endif /*ifdef RTE_EXEC_ENV_WINDOWS*/ + REGISTER_TEST_COMMAND(event_eth_rx_adapter_autotest, test_event_eth_rx_adapter_common); REGISTER_TEST_COMMAND(event_eth_rx_intr_adapter_autotest, diff --git a/app/test/test_event_eth_tx_adapter.c b/app/test/test_event_eth_tx_adapter.c index cfcc784351..c1c9732dd4 100644 --- a/app/test/test_event_eth_tx_adapter.c +++ b/app/test/test_event_eth_tx_adapter.c @@ -16,6 +16,16 @@ #include "test.h" +#ifdef RTE_EXEC_ENV_WINDOWS +static int +test_event_eth_tx_adapter_common(void) +{ + printf("event_eth_tx_adapter not supported on Windows, skipping test\n"); + return TEST_SKIPPED; +} + +#else + #define MAX_NUM_QUEUE RTE_PMD_RING_MAX_RX_RINGS #define TEST_INST_ID 0 #define TEST_DEV_ID 0 @@ -696,5 +706,7 @@ test_event_eth_tx_adapter_common(void) return unit_test_suite_runner(&event_eth_tx_tests); } +#endif /*ifdef RTE_EXEC_ENV_WINDOWS*/ + REGISTER_TEST_COMMAND(event_eth_tx_adapter_autotest, test_event_eth_tx_adapter_common); diff --git a/app/test/test_event_ring.c b/app/test/test_event_ring.c index 70eb9845e1..9c5e28fb81 100644 --- a/app/test/test_event_ring.c +++ b/app/test/test_event_ring.c @@ -2,11 +2,21 @@ * Copyright(c) 2010-2017 Intel Corporation */ +#include "test.h" + #include -#include +#ifdef RTE_EXEC_ENV_WINDOWS +static int +test_event_ring(void) +{ + printf("event_ring not supported on Windows, skipping test\n"); + return TEST_SKIPPED; +} -#include "test.h" +#else + +#include /* * Event Ring @@ -244,4 +254,6 @@ test_event_ring(void) return 0; } +#endif /*ifdef RTE_EXEC_ENV_WINDOWS*/ + REGISTER_TEST_COMMAND(event_ring_autotest, test_event_ring); diff --git a/app/test/test_event_timer_adapter.c b/app/test/test_event_timer_adapter.c index 25bac2d155..6f7145ef76 100644 --- a/app/test/test_event_timer_adapter.c +++ b/app/test/test_event_timer_adapter.c @@ -2,6 +2,7 @@ * Copyright(c) 2017 Cavium, Inc * Copyright(c) 2017-2018 Intel Corporation. */ +#include "test.h" #include @@ -10,6 +11,17 @@ #include #include #include + +#ifdef RTE_EXEC_ENV_WINDOWS +static int +test_event_timer_adapter_func(void) +{ + printf("event_timer_adapter not supported on Windows, skipping test\n"); + return TEST_SKIPPED; +} + +#else + #include #include #include @@ -21,8 +33,6 @@ #include #include -#include "test.h" - /* 4K timers corresponds to sw evdev max inflight events */ #define MAX_TIMERS (4 * 1024) #define BKT_TCK_NSEC @@ -1950,4 +1960,6 @@ test_event_timer_adapter_func(void) return unit_test_suite_runner(&event_timer_adptr_functional_testsuite); } +#endif /*ifdef RTE_EXEC_ENV_WINDOWS*/ + REGISTER_TEST_COMMAND(event_timer_adapter_test, test_event_timer_adapter_func); diff --git a/app/test/test_eventdev.c b/app/test/test_eventdev.c index 843d9766b0..fee2ecaa22 100644 --- a/app/test/test_eventdev.c +++ b/app/test/test_eventdev.c @@ -1,18 +1,28 @@ /* SPDX-License-Identifier: BSD-3-Clause * Copyright(c) 2016 Cavium, Inc */ +#include "test.h" #include #include #include #include #include + +#ifdef RTE_EXEC_ENV_WINDOWS +static int +test_eventdev_common(void) +{ + printf("eventdev_common not supported on Windows, skipping test\n"); + return TEST_SKIPPED; +} + +#else + #include #include #include -#include "test.h" - #define TEST_DEV_ID 0 static int @@ -1048,7 +1058,11 @@ test_eventdev_selftest_cn10k(void) return test_eventdev_selftest_impl("event_cn10k", ""); } +#endif /*ifdef RTE_EXEC_ENV_WINDOWS*/ + REGISTER_TEST_COMMAND(eventdev_common_autotest, test_eventdev_common); + +#ifndef RTE_EXEC_ENV_WINDOWS REGISTER_TEST_COMMAND(eventdev_selftest_sw, test_eventdev_selftest_sw); REGISTER_TEST_COMMAND(eventdev_selftest_octeontx, test_eventdev_selftest_octeontx); @@ -1058,3 +1072,5 @@ REGISTER_TEST_COMMAND(eventdev_selftest_dpaa2, test_eventdev_selftest_dpaa2); REGISTER_TEST_COMMAND(eventdev_selftest_dlb2, test_eventdev_selftest_dlb2); REGISTER_TEST_COMMAND(eventdev_selftest_cn9k, test_eventdev_selftest_cn9k); REGISTER_TEST_COMMAND(eventdev_selftest_cn10k, test_eventdev_selftest_cn10k); + +#endif /*ifndef RTE_EXEC_ENV_WINDOWS*/ diff --git a/app/test/test_external_mem.c b/app/test/test_external_mem.c index 5edf88b9f6..759f4fce6b 100644 --- a/app/test/test_external_mem.c +++ b/app/test/test_external_mem.c @@ -2,11 +2,25 @@ * Copyright(c) 2018 Intel Corporation */ +#include "test.h" + #include #include #include #include #include + + +#ifdef RTE_EXEC_ENV_WINDOWS +static int +test_external_mem(void) +{ + printf("external_mem not supported on Windows, skipping test\n"); + return TEST_SKIPPED; +} + +#else + #include #include @@ -19,8 +33,6 @@ #include #include -#include "test.h" - #define EXTERNAL_MEM_SZ (RTE_PGSIZE_4K << 10) /* 4M of data */ static int @@ -574,4 +586,6 @@ test_external_mem(void) return ret; } +#endif /*ifdef RTE_EXEC_ENV_WINDOWS*/ + REGISTER_TEST_COMMAND(external_mem_autotest, test_external_mem); diff --git a/app/test/test_fib.c b/app/test/test_fib.c index eb69d6e2fd..50b3fa760c 100644 --- a/app/test/test_fib.c +++ b/app/test/test_fib.c @@ -9,10 +9,28 @@ #include #include -#include #include "test.h" +#ifdef RTE_EXEC_ENV_WINDOWS +static int +test_fib(void) +{ + printf("fib not supported on Windows, skipping test\n"); + return TEST_SKIPPED; +} + +static int +test_slow_fib(void) +{ + printf("slow_fib not supported on Windows, skipping test\n"); + return TEST_SKIPPED; +} + +#else + +#include + typedef int32_t (*rte_fib_test)(void); static int32_t test_create_invalid(void); @@ -415,5 +433,7 @@ test_slow_fib(void) return unit_test_suite_runner(&fib_slow_tests); } +#endif /*ifdef RTE_EXEC_ENV_WINDOWS*/ + REGISTER_TEST_COMMAND(fib_autotest, test_fib); REGISTER_TEST_COMMAND(fib_slow_autotest, test_slow_fib); diff --git a/app/test/test_fib6.c b/app/test/test_fib6.c index 15ad09178a..53cca26ff1 100644 --- a/app/test/test_fib6.c +++ b/app/test/test_fib6.c @@ -9,11 +9,29 @@ #include #include -#include -#include #include "test.h" +#ifdef RTE_EXEC_ENV_WINDOWS +static int +test_fib6(void) +{ + printf("fib not supported on Windows, skipping test\n"); + return TEST_SKIPPED; +} + +static int +test_slow_fib6(void) +{ + printf("slow_fib not supported on Windows, skipping test\n"); + return TEST_SKIPPED; +} + +#else + +#include +#include + typedef int32_t (*rte_fib6_test)(void); static int32_t test_create_invalid(void); @@ -424,5 +442,7 @@ test_slow_fib6(void) return unit_test_suite_runner(&fib6_slow_tests); } +#endif /*ifdef RTE_EXEC_ENV_WINDOWS*/ + REGISTER_TEST_COMMAND(fib6_autotest, test_fib6); REGISTER_TEST_COMMAND(fib6_slow_autotest, test_slow_fib6); diff --git a/app/test/test_fib6_perf.c b/app/test/test_fib6_perf.c index e565799155..21d2b65318 100644 --- a/app/test/test_fib6_perf.c +++ b/app/test/test_fib6_perf.c @@ -10,9 +10,21 @@ #include #include #include -#include #include "test.h" + +#ifdef RTE_EXEC_ENV_WINDOWS +static int +test_fib6_perf(void) +{ + printf("fib6_perf not supported on Windows, skipping test\n"); + return TEST_SKIPPED; +} + +#else + +#include + #include "test_lpm6_data.h" #define TEST_FIB_ASSERT(cond) do { \ @@ -155,4 +167,6 @@ test_fib6_perf(void) return 0; } +#endif /*ifdef RTE_EXEC_ENV_WINDOWS*/ + REGISTER_TEST_COMMAND(fib6_perf_autotest, test_fib6_perf); diff --git a/app/test/test_fib_perf.c b/app/test/test_fib_perf.c index 86b2f832b8..ec7f20e102 100644 --- a/app/test/test_fib_perf.c +++ b/app/test/test_fib_perf.c @@ -12,11 +12,22 @@ #include #include #include -#include #include "test.h" #include "test_xmmt_ops.h" +#ifdef RTE_EXEC_ENV_WINDOWS +static int +test_fib_perf(void) +{ + printf("fib_perf not supported on Windows, skipping test\n"); + return TEST_SKIPPED; +} + +#else + +#include + #define TEST_FIB_ASSERT(cond) do { \ if (!(cond)) { \ printf("Error at line %d:\n", __LINE__); \ @@ -409,4 +420,6 @@ test_fib_perf(void) return 0; } +#endif /*ifdef RTE_EXEC_ENV_WINDOWS*/ + REGISTER_TEST_COMMAND(fib_perf_autotest, test_fib_perf); diff --git a/app/test/test_flow_classify.c b/app/test/test_flow_classify.c index 4f64be5357..d9893766d1 100644 --- a/app/test/test_flow_classify.c +++ b/app/test/test_flow_classify.c @@ -11,6 +11,17 @@ #include #include #include + +#ifdef RTE_EXEC_ENV_WINDOWS +static int +test_flow_classify(void) +{ + printf("flow_classify not supported on Windows, skipping test\n"); + return TEST_SKIPPED; +} + +#else + #include #include #include @@ -879,4 +890,6 @@ test_flow_classify(void) return TEST_SUCCESS; } +#endif /*ifdef RTE_EXEC_ENV_WINDOWS*/ + REGISTER_TEST_COMMAND(flow_classify_autotest, test_flow_classify); diff --git a/app/test/test_func_reentrancy.c b/app/test/test_func_reentrancy.c index ce40c3ce96..2924308dda 100644 --- a/app/test/test_func_reentrancy.c +++ b/app/test/test_func_reentrancy.c @@ -40,6 +40,16 @@ #include "test.h" +#ifdef RTE_EXEC_ENV_WINDOWS +static int +test_func_reentrancy(void) +{ + printf("reentrancy not supported on Windows, skipping test\n"); + return TEST_SKIPPED; +} + +#else + typedef int (*case_func_t)(void* arg); typedef void (*case_clean_t)(unsigned lcore_id); @@ -511,4 +521,6 @@ test_func_reentrancy(void) return 0; } +#endif /*ifdef RTE_EXEC_ENV_WINDOWS*/ + REGISTER_TEST_COMMAND(func_reentrancy_autotest, test_func_reentrancy); diff --git a/app/test/test_graph.c b/app/test/test_graph.c index 81bdcb9bea..ce4cdecd34 100644 --- a/app/test/test_graph.c +++ b/app/test/test_graph.c @@ -1,6 +1,8 @@ /* SPDX-License-Identifier: BSD-3-Clause * Copyright(C) 2020 Marvell International Ltd. */ +#include "test.h" + #include #include #include @@ -9,14 +11,23 @@ #include #include + +#ifdef RTE_EXEC_ENV_WINDOWS +static int +test_node_list_dump(void) +{ + printf("node_list_dump not supported on Windows, skipping test\n"); + return TEST_SKIPPED; +} + +#else + #include #include #include #include #include -#include "test.h" - static uint16_t test_node_worker_source(struct rte_graph *graph, struct rte_node *node, void **objs, uint16_t nb_objs); @@ -841,4 +852,7 @@ test_node_list_dump(void) return TEST_SUCCESS; } + +#endif /*ifdef RTE_EXEC_ENV_WINDOWS*/ + REGISTER_TEST_COMMAND(node_list_dump, test_node_list_dump); diff --git a/app/test/test_graph_perf.c b/app/test/test_graph_perf.c index 296d99a9d3..a58cde1f22 100644 --- a/app/test/test_graph_perf.c +++ b/app/test/test_graph_perf.c @@ -1,6 +1,8 @@ /* SPDX-License-Identifier: BSD-3-Clause * Copyright(C) 2020 Marvell International Ltd. */ +#include "test.h" + #include #include #include @@ -9,14 +11,22 @@ #include #include #include +#ifdef RTE_EXEC_ENV_WINDOWS +static int +test_graph_perf_func(void) +{ + printf("graph_perf not supported on Windows, skipping test\n"); + return TEST_SKIPPED; +} + +#else + #include #include #include #include #include -#include "test.h" - #define TEST_GRAPH_PERF_MZ "graph_perf_data" #define TEST_GRAPH_SRC_NAME "test_graph_perf_source" #define TEST_GRAPH_SRC_BRST_ONE_NAME "test_graph_perf_source_one" @@ -1060,4 +1070,6 @@ test_graph_perf_func(void) return unit_test_suite_runner(&graph_perf_testsuite); } +#endif /*ifdef RTE_EXEC_ENV_WINDOWS*/ + REGISTER_TEST_COMMAND(graph_perf_autotest, test_graph_perf_func); diff --git a/app/test/test_hash_perf.c b/app/test/test_hash_perf.c index 7e98ec3964..a3e9f43967 100644 --- a/app/test/test_hash_perf.c +++ b/app/test/test_hash_perf.c @@ -17,6 +17,16 @@ #include "test.h" +#ifdef RTE_EXEC_ENV_WINDOWS +static int +test_hash_perf(void) +{ + printf("hash_perf not supported on Windows, skipping test\n"); + return TEST_SKIPPED; +} + +#else + #define MAX_ENTRIES (1 << 19) #define KEYS_TO_ADD (MAX_ENTRIES) #define ADD_PERCENT 0.75 /* 75% table utilization */ @@ -749,4 +759,6 @@ test_hash_perf(void) return 0; } +#endif /*ifdef RTE_EXEC_ENV_WINDOWS*/ + REGISTER_TEST_COMMAND(hash_perf_autotest, test_hash_perf); diff --git a/app/test/test_ipfrag.c b/app/test/test_ipfrag.c index 1ced25a123..52987b6de7 100644 --- a/app/test/test_ipfrag.c +++ b/app/test/test_ipfrag.c @@ -1,6 +1,7 @@ /* SPDX-License-Identifier: BSD-3-Clause * Copyright(c) 2020 Red Hat, Inc. */ +#include "test.h" #include @@ -8,13 +9,22 @@ #include #include #include + +#ifdef RTE_EXEC_ENV_WINDOWS +static int +test_ipfrag(void) +{ + printf("ipfrag not supported on Windows, skipping test\n"); + return TEST_SKIPPED; +} + +#else + #include #include #include #include -#include "test.h" - #define NUM_MBUFS 128 #define BURST 32 @@ -322,4 +332,6 @@ test_ipfrag(void) return unit_test_suite_runner(&ipfrag_testsuite); } +#endif /*ifdef RTE_EXEC_ENV_WINDOWS*/ + REGISTER_TEST_COMMAND(ipfrag_autotest, test_ipfrag); diff --git a/app/test/test_ipsec.c b/app/test/test_ipsec.c index bc2a3dbc2e..ed4d166f0d 100644 --- a/app/test/test_ipsec.c +++ b/app/test/test_ipsec.c @@ -1,6 +1,7 @@ /* SPDX-License-Identifier: BSD-3-Clause * Copyright(c) 2018 Intel Corporation */ +#include "test.h" #include @@ -13,15 +14,25 @@ #include #include +#ifdef RTE_EXEC_ENV_WINDOWS +static int +test_ipsec(void) +{ + printf("ipsec not supported on Windows, skipping test\n"); + return TEST_SKIPPED; +} + +#else + #include #include #include + #include #include #include #include -#include "test.h" #include "test_cryptodev.h" #define VDEV_ARGS_SIZE 100 @@ -2536,4 +2547,6 @@ test_ipsec(void) return unit_test_suite_runner(&ipsec_testsuite); } +#endif /*ifdef RTE_EXEC_ENV_WINDOWS*/ + REGISTER_TEST_COMMAND(ipsec_autotest, test_ipsec); diff --git a/app/test/test_ipsec_perf.c b/app/test/test_ipsec_perf.c index 92106bf374..5ebb61ce18 100644 --- a/app/test/test_ipsec_perf.c +++ b/app/test/test_ipsec_perf.c @@ -1,6 +1,7 @@ /* SPDX-License-Identifier: BSD-3-Clause * Copyright(c) 2020 Intel Corporation */ +#include "test.h" #include #include @@ -8,10 +9,20 @@ #include #include #include + +#ifdef RTE_EXEC_ENV_WINDOWS +static int +test_libipsec_perf(void) +{ + printf("ipsec_perf not supported on Windows, skipping test\n"); + return TEST_SKIPPED; +} + +#else + #include #include -#include "test.h" #include "test_cryptodev.h" #define RING_SIZE 4096 @@ -611,4 +622,6 @@ test_libipsec_perf(void) return TEST_SUCCESS; } +#endif /*ifdef RTE_EXEC_ENV_WINDOWS*/ + REGISTER_TEST_COMMAND(ipsec_perf_autotest, test_libipsec_perf); diff --git a/app/test/test_ipsec_sad.c b/app/test/test_ipsec_sad.c index 491164689e..07f3ed245b 100644 --- a/app/test/test_ipsec_sad.c +++ b/app/test/test_ipsec_sad.c @@ -1,16 +1,26 @@ /* SPDX-License-Identifier: BSD-3-Clause * Copyright(c) 2010-2014 Intel Corporation */ +#include "test.h" #include #include #include #include +#ifdef RTE_EXEC_ENV_WINDOWS +static int +test_ipsec_sad(void) +{ + printf("ipsec_sad not supported on Windows, skipping test\n"); + return TEST_SKIPPED; +} + +#else + #include #include -#include "test.h" #include "test_xmmt_ops.h" typedef int32_t (*rte_ipsec_sad_test)(void); @@ -884,4 +894,6 @@ test_ipsec_sad(void) return unit_test_suite_runner(&ipsec_sad_tests); } +#endif /*ifdef RTE_EXEC_ENV_WINDOWS*/ + REGISTER_TEST_COMMAND(ipsec_sad_autotest, test_ipsec_sad); diff --git a/app/test/test_kni.c b/app/test/test_kni.c index 40ab0d5c4c..8f4e92f6ca 100644 --- a/app/test/test_kni.c +++ b/app/test/test_kni.c @@ -2,15 +2,12 @@ * Copyright(c) 2010-2014 Intel Corporation */ +#include "test.h" + #include #include #include #include -#include -#include - -#include "test.h" - #if !defined(RTE_EXEC_ENV_LINUX) || !defined(RTE_LIB_KNI) static int @@ -22,6 +19,9 @@ test_kni(void) #else +#include +#include + #include #include #include diff --git a/app/test/test_lcores.c b/app/test/test_lcores.c index 35c47d5372..2277ae597f 100644 --- a/app/test/test_lcores.c +++ b/app/test/test_lcores.c @@ -11,6 +11,16 @@ #include "test.h" +#ifdef RTE_EXEC_ENV_WINDOWS +static int +test_lcores(void) +{ + printf("lcore not supported on Windows, skipping test\n"); + return TEST_SKIPPED; +} + +#else + struct thread_context { enum { INIT, ERROR, DONE } state; bool lcore_id_any; @@ -411,4 +421,6 @@ test_lcores(void) return TEST_SUCCESS; } +#endif /*ifdef RTE_EXEC_ENV_WINDOWS*/ + REGISTER_TEST_COMMAND(lcores_autotest, test_lcores); diff --git a/app/test/test_lpm.c b/app/test/test_lpm.c index 37b460af3a..55ae46207a 100644 --- a/app/test/test_lpm.c +++ b/app/test/test_lpm.c @@ -1,6 +1,17 @@ /* SPDX-License-Identifier: BSD-3-Clause * Copyright(c) 2010-2014 Intel Corporation */ +#include "test.h" + +#ifdef RTE_EXEC_ENV_WINDOWS +static int +test_lpm(void) +{ + printf("lpm not supported on Windows, skipping test\n"); + return TEST_SKIPPED; +} + +#else #include #include @@ -10,7 +21,6 @@ #include #include -#include "test.h" #include "test_xmmt_ops.h" #define TEST_LPM_ASSERT(cond) do { \ @@ -1584,4 +1594,6 @@ test_lpm(void) return global_status; } +#endif /*ifdef RTE_EXEC_ENV_WINDOWS*/ + REGISTER_TEST_COMMAND(lpm_autotest, test_lpm); diff --git a/app/test/test_lpm6.c b/app/test/test_lpm6.c index 17221f992a..a4d8eda62d 100644 --- a/app/test/test_lpm6.c +++ b/app/test/test_lpm6.c @@ -1,6 +1,7 @@ /* SPDX-License-Identifier: BSD-3-Clause * Copyright(c) 2010-2014 Intel Corporation */ +#include "test.h" #include #include @@ -8,9 +9,18 @@ #include #include +#ifdef RTE_EXEC_ENV_WINDOWS +static int +test_lpm6(void) +{ + printf("lpm6 not supported on Windows, skipping test\n"); + return TEST_SKIPPED; +} + +#else + #include -#include "test.h" #include "test_lpm6_data.h" #define TEST_LPM_ASSERT(cond) do { \ @@ -1792,4 +1802,6 @@ test_lpm6(void) return global_status; } +#endif /*ifdef RTE_EXEC_ENV_WINDOWS*/ + REGISTER_TEST_COMMAND(lpm6_autotest, test_lpm6); diff --git a/app/test/test_lpm6_perf.c b/app/test/test_lpm6_perf.c index 0b43ad824a..622418ddfe 100644 --- a/app/test/test_lpm6_perf.c +++ b/app/test/test_lpm6_perf.c @@ -1,6 +1,17 @@ /* SPDX-License-Identifier: BSD-3-Clause * Copyright(c) 2010-2014 Intel Corporation */ +#include "test.h" + +#ifdef RTE_EXEC_ENV_WINDOWS +static int +test_lpm6_perf(void) +{ + printf("lpm6_perf not supported on Windows, skipping test\n"); + return TEST_SKIPPED; +} + +#else #include #include @@ -12,7 +23,6 @@ #include #include -#include "test.h" #include "test_lpm6_data.h" #define TEST_LPM_ASSERT(cond) do { \ @@ -160,4 +170,6 @@ test_lpm6_perf(void) return 0; } +#endif /*ifdef RTE_EXEC_ENV_WINDOWS*/ + REGISTER_TEST_COMMAND(lpm6_perf_autotest, test_lpm6_perf); diff --git a/app/test/test_lpm_perf.c b/app/test/test_lpm_perf.c index 2bed00d064..d49bce5d36 100644 --- a/app/test/test_lpm_perf.c +++ b/app/test/test_lpm_perf.c @@ -2,7 +2,17 @@ * Copyright(c) 2010-2014 Intel Corporation * Copyright(c) 2020 Arm Limited */ +#include "test.h" + +#ifdef RTE_EXEC_ENV_WINDOWS +static int +test_lpm_perf(void) +{ + printf("lpm_perf not supported on Windows, skipping test\n"); + return TEST_SKIPPED; +} +#else #include #include #include @@ -15,7 +25,6 @@ #include #include -#include "test.h" #include "test_xmmt_ops.h" struct rte_lpm *lpm; @@ -763,4 +772,6 @@ test_lpm_perf(void) return 0; } +#endif /*ifdef RTE_EXEC_ENV_WINDOWS*/ + REGISTER_TEST_COMMAND(lpm_perf_autotest, test_lpm_perf); diff --git a/app/test/test_malloc.c b/app/test/test_malloc.c index 6d9249f831..fe6b83271b 100644 --- a/app/test/test_malloc.c +++ b/app/test/test_malloc.c @@ -1,6 +1,7 @@ /* SPDX-License-Identifier: BSD-3-Clause * Copyright(c) 2010-2019 Intel Corporation */ +#include "test.h" #include #include @@ -8,7 +9,9 @@ #include #include #include +#ifndef RTE_EXEC_ENV_WINDOWS #include +#endif #include #include @@ -23,11 +26,8 @@ #include #include -#include "test.h" - #define N 10000 - static int is_mem_on_socket(int32_t socket); @@ -47,8 +47,8 @@ addr_to_socket(void *addr); static int is_memory_overlap(void *p1, size_t len1, void *p2, size_t len2) { - unsigned long ptr1 = (unsigned long)p1; - unsigned long ptr2 = (unsigned long)p2; + uintptr_t ptr1 = (uintptr_t)p1; + uintptr_t ptr2 = (uintptr_t)p2; if (ptr2 >= ptr1 && (ptr2 - ptr1) < len1) return 1; @@ -60,7 +60,7 @@ is_memory_overlap(void *p1, size_t len1, void *p2, size_t len2) static int is_aligned(void *p, int align) { - unsigned long addr = (unsigned long)p; + uintptr_t addr = (uintptr_t)p; unsigned mask = align - 1; if (addr & mask) @@ -373,6 +373,13 @@ test_multi_alloc_statistics(void) return 0; } +#ifdef RTE_EXEC_ENV_WINDOWS +static int +test_realloc(void) +{ + return TEST_SKIPPED; +} +#else static int test_realloc_socket(int socket) { @@ -670,6 +677,7 @@ test_realloc(void) end: return ret; } +#endif /*ifdef RTE_EXEC_ENV_WINDOWS*/ static int test_random_alloc_free(void *_ __rte_unused) diff --git a/app/test/test_mbuf.c b/app/test/test_mbuf.c index f54d1d7c00..662b988480 100644 --- a/app/test/test_mbuf.c +++ b/app/test/test_mbuf.c @@ -1,6 +1,7 @@ /* SPDX-License-Identifier: BSD-3-Clause * Copyright(c) 2010-2014 Intel Corporation */ +#include "test.h" #include #include @@ -33,8 +34,6 @@ #include #include -#include "test.h" - #define MEMPOOL_CACHE_SIZE 32 #define MBUF_DATA_SIZE 2048 #define NB_MBUF 128 @@ -1172,6 +1171,16 @@ test_refcnt_mbuf(void) #endif } +#ifdef RTE_EXEC_ENV_WINDOWS + +static int +test_failing_mbuf_sanity_check(struct rte_mempool *pktmbuf_pool) +{ + RTE_SET_USED(pktmbuf_pool); + return TEST_SKIPPED; +} +#else + #include #include #include @@ -1267,6 +1276,8 @@ test_failing_mbuf_sanity_check(struct rte_mempool *pktmbuf_pool) return 0; } +#endif /*!defined RTE_EXEC_ENV_WINDOWS*/ + static int test_mbuf_linearize(struct rte_mempool *pktmbuf_pool, int pkt_len, int nb_segs) diff --git a/app/test/test_member.c b/app/test/test_member.c index 40aa4c8627..85f3a126b9 100644 --- a/app/test/test_member.c +++ b/app/test/test_member.c @@ -3,17 +3,27 @@ */ /* This test is for membership library's simple feature test */ +#include "test.h" #include #include + +#ifdef RTE_EXEC_ENV_WINDOWS +static int +test_member(void) +{ + printf("member not supported on Windows, skipping test\n"); + return TEST_SKIPPED; +} + +#else + #include #include #include #include #include -#include "test.h" - struct rte_member_setsum *setsum_ht; struct rte_member_setsum *setsum_cache; struct rte_member_setsum *setsum_vbf; @@ -712,4 +722,6 @@ test_member(void) return 0; } +#endif /*ifdef RTE_EXEC_ENV_WINDOWS*/ + REGISTER_TEST_COMMAND(member_autotest, test_member); diff --git a/app/test/test_member_perf.c b/app/test/test_member_perf.c index e2840f12d3..1cc9c3e4d8 100644 --- a/app/test/test_member_perf.c +++ b/app/test/test_member_perf.c @@ -1,6 +1,7 @@ /* SPDX-License-Identifier: BSD-3-Clause * Copyright(c) 2017 Intel Corporation */ +#include "test.h" #include #include @@ -11,9 +12,18 @@ #include #include #include -#include -#include "test.h" +#ifdef RTE_EXEC_ENV_WINDOWS +static int +test_member_perf(void) +{ + printf("member_perf not supported on Windows, skipping test\n"); + return TEST_SKIPPED; +} + +#else + +#include #define NUM_KEYSIZES 10 #define NUM_SHUFFLES 10 @@ -622,4 +632,6 @@ test_member_perf(void) return 0; } +#endif /*ifdef RTE_EXEC_ENV_WINDOWS*/ + REGISTER_TEST_COMMAND(member_perf_autotest, test_member_perf); diff --git a/app/test/test_memcpy_perf.c b/app/test/test_memcpy_perf.c index 3727c160e6..9147c0aec6 100644 --- a/app/test/test_memcpy_perf.c +++ b/app/test/test_memcpy_perf.c @@ -13,7 +13,6 @@ #include #include #include - #include #include "test.h" diff --git a/app/test/test_mp_secondary.c b/app/test/test_mp_secondary.c index 021ca0547f..54b0f72645 100644 --- a/app/test/test_mp_secondary.c +++ b/app/test/test_mp_secondary.c @@ -14,6 +14,16 @@ #include #include #include + +#ifdef RTE_EXEC_ENV_WINDOWS +int +test_mp_secondary(void) +{ + printf("mp_secondary not supported on Windows, skipping test\n"); + return TEST_SKIPPED; +} + +#else #include #include #include @@ -211,4 +221,6 @@ test_mp_secondary(void) return run_object_creation_tests(); } +#endif /*ifdef RTE_EXEC_ENV_WINDOWS*/ + REGISTER_TEST_COMMAND(multiprocess_autotest, test_mp_secondary); diff --git a/app/test/test_pie.c b/app/test/test_pie.c index 632d4b014d..edd1aa3d86 100644 --- a/app/test/test_pie.c +++ b/app/test/test_pie.c @@ -2,6 +2,32 @@ * Copyright(c) 2010-2014 Intel Corporation */ +#include "test.h" + +#ifdef RTE_EXEC_ENV_WINDOWS +static int +test_pie(void) +{ + printf("pie not supported on Windows, skipping test\n"); + return TEST_SKIPPED; +} + +static int +test_pie_perf(void) +{ + printf("pie_perf not supported on Windows, skipping test\n"); + return TEST_SKIPPED; +} + +static int +test_pie_all(void) +{ + printf("pie_all not supported on Windows, skipping test\n"); + return TEST_SKIPPED; +} + +#else + #include #include #include @@ -12,8 +38,6 @@ #include #include -#include "test.h" - #include #ifdef __INTEL_COMPILER @@ -1060,6 +1084,8 @@ test_pie_all(void) return tell_the_result(num_tests, num_pass); } +#endif /*ifdef RTE_EXEC_ENV_WINDOWS*/ + REGISTER_TEST_COMMAND(pie_autotest, test_pie); REGISTER_TEST_COMMAND(pie_perf, test_pie_perf); REGISTER_TEST_COMMAND(pie_all, test_pie_all); diff --git a/app/test/test_rawdev.c b/app/test/test_rawdev.c index 081fab969b..561b0e0300 100644 --- a/app/test/test_rawdev.c +++ b/app/test/test_rawdev.c @@ -1,16 +1,27 @@ /* SPDX-License-Identifier: BSD-3-Clause * Copyright 2017 NXP */ +#include "test.h" + #include #include #include #include #include + +#ifdef RTE_EXEC_ENV_WINDOWS +static int +test_rawdev_selftests(void) +{ + printf("rawdev not supported on Windows, skipping test\n"); + return TEST_SKIPPED; +} + +#else + #include #include -#include "test.h" - static int test_rawdev_selftest_impl(const char *pmd, const char *opts) { @@ -54,4 +65,6 @@ test_rawdev_selftests(void) return ret; } +#endif /*ifdef RTE_EXEC_ENV_WINDOWS*/ + REGISTER_TEST_COMMAND(rawdev_autotest, test_rawdev_selftests); diff --git a/app/test/test_rcu_qsbr_perf.c b/app/test/test_rcu_qsbr_perf.c index cf7b158d22..9209fb2658 100644 --- a/app/test/test_rcu_qsbr_perf.c +++ b/app/test/test_rcu_qsbr_perf.c @@ -15,6 +15,16 @@ #include "test.h" +#ifdef RTE_EXEC_ENV_WINDOWS +static int +test_rcu_qsbr_main(void) +{ + printf("rcu_qsbr_main not supported on Windows, skipping test\n"); + return TEST_SKIPPED; +} + +#else + /* Check condition and return an error if true. */ static uint16_t enabled_core_ids[RTE_MAX_LCORE]; static unsigned int num_cores; @@ -687,4 +697,6 @@ test_rcu_qsbr_main(void) return -1; } +#endif /*ifdef RTE_EXEC_ENV_WINDOWS*/ + REGISTER_TEST_COMMAND(rcu_qsbr_perf_autotest, test_rcu_qsbr_main); diff --git a/app/test/test_red.c b/app/test/test_red.c index 05936cfee8..524f9c9b6d 100644 --- a/app/test/test_red.c +++ b/app/test/test_red.c @@ -1,6 +1,7 @@ /* SPDX-License-Identifier: BSD-3-Clause * Copyright(c) 2010-2014 Intel Corporation */ +#include "test.h" #include #include @@ -8,12 +9,34 @@ #include #include #include + +#ifdef RTE_EXEC_ENV_WINDOWS +static int +test_red(void) +{ + printf("red not supported on Windows, skipping test\n"); + return TEST_SKIPPED; +} + +static int +test_red_perf(void) +{ + printf("red_perf not supported on Windows, skipping test\n"); + return TEST_SKIPPED; +} + +static int +test_red_all(void) +{ + printf("red_all not supported on Windows, skipping test\n"); + return TEST_SKIPPED; +} +#else + #include #include #include -#include "test.h" - #include #ifdef __INTEL_COMPILER @@ -1851,6 +1874,8 @@ test_red_all(void) return tell_the_result(num_tests, num_pass); } +#endif /*ifdef RTE_EXEC_ENV_WINDOWS*/ + REGISTER_TEST_COMMAND(red_autotest, test_red); REGISTER_TEST_COMMAND(red_perf, test_red_perf); REGISTER_TEST_COMMAND(red_all, test_red_all); diff --git a/app/test/test_reorder.c b/app/test/test_reorder.c index 1c4226da65..c73cbdefe6 100644 --- a/app/test/test_reorder.c +++ b/app/test/test_reorder.c @@ -1,6 +1,7 @@ /* SPDX-License-Identifier: BSD-3-Clause * Copyright(c) 2010-2014 Intel Corporation */ +#include "test.h" #include #include @@ -9,12 +10,20 @@ #include #include #include + +#ifdef RTE_EXEC_ENV_WINDOWS +static int +test_reorder(void) +{ + printf("reorder not supported on Windows, skipping test\n"); + return TEST_SKIPPED; +} +#else + #include #include #include -#include "test.h" - #define BURST 32 #define REORDER_BUFFER_SIZE 16384 #define NUM_MBUFS (2*REORDER_BUFFER_SIZE) @@ -390,4 +399,6 @@ test_reorder(void) return unit_test_suite_runner(&reorder_test_suite); } +#endif /*ifdef RTE_EXEC_ENV_WINDOWS*/ + REGISTER_TEST_COMMAND(reorder_autotest, test_reorder); diff --git a/app/test/test_rib.c b/app/test/test_rib.c index 3dc48fe1f2..ad7c79ca78 100644 --- a/app/test/test_rib.c +++ b/app/test/test_rib.c @@ -2,15 +2,31 @@ * Copyright(c) 2018 Vladimir Medvedkin * Copyright(c) 2019 Intel Corporation */ +#include "test.h" #include #include #include #include -#include -#include "test.h" +#ifdef RTE_EXEC_ENV_WINDOWS +static int +test_rib(void) +{ + printf("rib not supported on Windows, skipping test\n"); + return TEST_SKIPPED; +} + +static int +test_slow_rib(void) +{ + printf("slow_rib not supported on Windows, skipping test\n"); + return TEST_SKIPPED; +} +#else + +#include typedef int32_t (*rte_rib_test)(void); @@ -363,5 +379,7 @@ test_slow_rib(void) return unit_test_suite_runner(&rib_slow_tests); } +#endif /*ifdef RTE_EXEC_ENV_WINDOWS*/ + REGISTER_TEST_COMMAND(rib_autotest, test_rib); REGISTER_TEST_COMMAND(rib_slow_autotest, test_slow_rib); diff --git a/app/test/test_rib6.c b/app/test/test_rib6.c index c77df11298..9d0e3cb55e 100644 --- a/app/test/test_rib6.c +++ b/app/test/test_rib6.c @@ -3,14 +3,31 @@ * Copyright(c) 2019 Intel Corporation */ +#include "test.h" + #include #include #include #include -#include -#include "test.h" +#ifdef RTE_EXEC_ENV_WINDOWS +static int +test_rib6(void) +{ + printf("rib6 not supported on Windows, skipping test\n"); + return TEST_SKIPPED; +} + +static int +test_slow_rib6(void) +{ + printf("slow_rib6 not supported on Windows, skipping test\n"); + return TEST_SKIPPED; +} +#else + +#include typedef int32_t (*rte_rib6_test)(void); @@ -368,5 +385,6 @@ test_slow_rib6(void) return unit_test_suite_runner(&rib6_slow_tests); } +#endif /*ifdef RTE_EXEC_ENV_WINDOWS*/ REGISTER_TEST_COMMAND(rib6_autotest, test_rib6); REGISTER_TEST_COMMAND(rib6_slow_autotest, test_slow_rib6); diff --git a/app/test/test_sched.c b/app/test/test_sched.c index 958b631144..ad3e978ea6 100644 --- a/app/test/test_sched.c +++ b/app/test/test_sched.c @@ -14,8 +14,18 @@ #include #include #include -#include +#ifdef RTE_EXEC_ENV_WINDOWS +static int +test_sched(void) +{ + printf("sched not supported on Windows, skipping test\n"); + return TEST_SKIPPED; +} + +#else + +#include #define SUBPORT 0 #define PIPE 1 @@ -204,4 +214,6 @@ test_sched(void) return 0; } +#endif /*ifdef RTE_EXEC_ENV_WINDOWS*/ + REGISTER_TEST_COMMAND(sched_autotest, test_sched); diff --git a/app/test/test_security.c b/app/test/test_security.c index 060cf1ffa8..6c1d8602d2 100644 --- a/app/test/test_security.c +++ b/app/test/test_security.c @@ -1,12 +1,14 @@ /* SPDX-License-Identifier: BSD-3-Clause * Copyright (c) 2020 Samsung Electronics Co., Ltd All Rights Reserved */ +#include "test.h" #include #include #include #include #include + #include #include @@ -20,7 +22,7 @@ #endif #include -#include "test.h" + /** * Security diff --git a/app/test/test_table.c b/app/test/test_table.c index 95034148cb..2e18e49ba4 100644 --- a/app/test/test_table.c +++ b/app/test/test_table.c @@ -7,6 +7,17 @@ #include #include #include "test.h" + +#ifdef RTE_EXEC_ENV_WINDOWS +static int +test_table(void) +{ + printf("table not supported on Windows, skipping test\n"); + return TEST_SKIPPED; +} + +#else + #include "test_table.h" #include "test_table_pipeline.h" #include "test_table_ports.h" @@ -194,4 +205,6 @@ test_table(void) return ret; } +#endif /*ifdef RTE_EXEC_ENV_WINDOWS*/ + REGISTER_TEST_COMMAND(table_autotest, test_table); diff --git a/app/test/test_table_acl.c b/app/test/test_table_acl.c index 0bdf76ab70..83bef0ea57 100644 --- a/app/test/test_table_acl.c +++ b/app/test/test_table_acl.c @@ -2,6 +2,7 @@ * Copyright(c) 2010-2014 Intel Corporation */ +#ifndef RTE_EXEC_ENV_WINDOWS #include #include #include @@ -728,3 +729,5 @@ test_table_acl(void) return 0; } + +#endif /*ifndef RTE_EXEC_ENV_WINDOWS*/ diff --git a/app/test/test_table_combined.c b/app/test/test_table_combined.c index f72b634bff..0abc5e45c5 100644 --- a/app/test/test_table_combined.c +++ b/app/test/test_table_combined.c @@ -2,6 +2,8 @@ * Copyright(c) 2010-2016 Intel Corporation */ +#ifndef RTE_EXEC_ENV_WINDOWS + #include #include "test_table_combined.h" #include "test_table.h" @@ -840,3 +842,5 @@ test_table_hash_cuckoo_combined(void) return 0; } + +#endif /*ifndef RTE_EXEC_ENV_WINDOWS*/ diff --git a/app/test/test_table_pipeline.c b/app/test/test_table_pipeline.c index aabf4375db..45dc7682d8 100644 --- a/app/test/test_table_pipeline.c +++ b/app/test/test_table_pipeline.c @@ -2,6 +2,8 @@ * Copyright(c) 2010-2014 Intel Corporation */ +#ifndef RTE_EXEC_ENV_WINDOWS + #include #include #include @@ -569,3 +571,5 @@ test_table_pipeline(void) return 0; } + +#endif /*ifndef RTE_EXEC_ENV_WINDOWS*/ diff --git a/app/test/test_table_ports.c b/app/test/test_table_ports.c index d921b2e207..f3b5693609 100644 --- a/app/test/test_table_ports.c +++ b/app/test/test_table_ports.c @@ -2,6 +2,8 @@ * Copyright(c) 2010-2014 Intel Corporation */ +#ifndef RTE_EXEC_ENV_WINDOWS + #include "test_table_ports.h" #include "test_table.h" @@ -189,3 +191,5 @@ test_port_ring_writer(void) return 0; } + +#endif /*ifndef RTE_EXEC_ENV_WINDOWS*/ diff --git a/app/test/test_table_tables.c b/app/test/test_table_tables.c index 4ff6ab16aa..2901490e61 100644 --- a/app/test/test_table_tables.c +++ b/app/test/test_table_tables.c @@ -2,6 +2,8 @@ * Copyright(c) 2010-2016 Intel Corporation */ +#ifndef RTE_EXEC_ENV_WINDOWS + #include #include #include @@ -1052,3 +1054,5 @@ test_table_hash_cuckoo(void) return 0; } + +#endif /*ifndef RTE_EXEC_ENV_WINDOWS*/ diff --git a/app/test/test_timer_secondary.c b/app/test/test_timer_secondary.c index 5795c97f07..234a7ec425 100644 --- a/app/test/test_timer_secondary.c +++ b/app/test/test_timer_secondary.c @@ -15,6 +15,17 @@ #include #include "test.h" + +#ifdef RTE_EXEC_ENV_WINDOWS +int +test_timer_secondary(void) +{ + printf("timer_secondary not supported on Windows, skipping test\n"); + return TEST_SKIPPED; +} + +#else + #include "process.h" #define NUM_TIMERS (1 << 20) /* ~1M timers */ @@ -212,4 +223,6 @@ test_timer_secondary(void) return TEST_FAILED; } +#endif /*ifdef RTE_EXEC_ENV_WINDOWS*/ + REGISTER_TEST_COMMAND(timer_secondary_autotest, test_timer_secondary); diff --git a/app/test/test_trace.c b/app/test/test_trace.c index 0f9df83c40..e62f9ca10e 100644 --- a/app/test/test_trace.c +++ b/app/test/test_trace.c @@ -9,6 +9,30 @@ #include "test.h" #include "test_trace.h" +#ifdef RTE_EXEC_ENV_WINDOWS +static int +test_trace(void) +{ + printf("trace not supported on Windows, skipping test\n"); + return TEST_SKIPPED; +} + +static int +test_trace_dump(void) +{ + printf("trace_dump not supported on Windows, skipping test\n"); + return TEST_SKIPPED; +} + +static int +test_trace_metadata_dump(void) +{ + printf("trace_metadata_dump not supported on Windows, skipping test\n"); + return TEST_SKIPPED; +} + +#else + static int32_t test_trace_point_globbing(void) { @@ -194,8 +218,6 @@ test_trace(void) return unit_test_suite_runner(&trace_tests); } -REGISTER_TEST_COMMAND(trace_autotest, test_trace); - static int test_trace_dump(void) { @@ -203,12 +225,14 @@ test_trace_dump(void) return 0; } -REGISTER_TEST_COMMAND(trace_dump, test_trace_dump); - static int test_trace_metadata_dump(void) { return rte_trace_metadata_dump(stdout); } +#endif /*ifdef RTE_EXEC_ENV_WINDOWS*/ + +REGISTER_TEST_COMMAND(trace_autotest, test_trace); +REGISTER_TEST_COMMAND(trace_dump, test_trace_dump); REGISTER_TEST_COMMAND(trace_metadata_dump, test_trace_metadata_dump); From patchwork Wed Dec 8 18:59:59 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jie Zhou X-Patchwork-Id: 105033 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 416EDA00C2; Wed, 8 Dec 2021 20:00:45 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A3FE342709; Wed, 8 Dec 2021 20:00:15 +0100 (CET) Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by mails.dpdk.org (Postfix) with ESMTP id 7AD764114A for ; Wed, 8 Dec 2021 20:00:07 +0100 (CET) Received: from linuxonhyperv3.guj3yctzbm1etfxqx2vob5hsef.xx.internal.cloudapp.net (linux.microsoft.com [13.77.154.182]) by linux.microsoft.com (Postfix) with ESMTPSA id 9E16E20B718D; Wed, 8 Dec 2021 11:00:06 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 9E16E20B718D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1638990006; bh=gCEG3uOHtm3FbHM2XPviihXOfnKs1apgXfh71WkwU5Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=M+wgmKTTOPolVVE0B5Hxv+a3tW0FnIvvKM8poQO+CgkdRZgy9J95AD/oINKBtSo3F BbgrIhg3QCWI8RI3r9rxf6GMjNVS9LwF2addyfa2uDiG2Ak0tgvjXTOSR8EyBpc1Gg FWHVyvyoJuI0YBPKFd4vPGQOuY9XMJPl2Nz5FgPk= From: Jie Zhou To: dev@dpdk.org Cc: dmitry.kozliuk@gmail.com, bruce.richardson@intel.com, roretzla@microsoft.com, navasile@linux.microsoft.com, dmitrym@microsoft.com, pallavi.kadam@intel.com, talshn@nvidia.com, thomas@monjalon.net, aconole@redhat.com Subject: [PATCH v14 10/11] app/test: replace .sh script with .py script Date: Wed, 8 Dec 2021 10:59:59 -0800 Message-Id: <1638990000-3228-11-git-send-email-jizh@linux.microsoft.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1638990000-3228-1-git-send-email-jizh@linux.microsoft.com> References: <1638928262-13177-1-git-send-email-jizh@linux.microsoft.com> <1638990000-3228-1-git-send-email-jizh@linux.microsoft.com> X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org - Add python script to check if system supports hugepages - Remove corresponding .sh script - Replace calling of .sh with corresponding .py in meson.build Signed-off-by: Jie Zhou Acked-by: Dmitry Kozlyuk --- app/test/has-hugepage.sh | 11 ----------- app/test/has_hugepage.py | 26 ++++++++++++++++++++++++++ app/test/meson.build | 2 +- 3 files changed, 27 insertions(+), 12 deletions(-) delete mode 100755 app/test/has-hugepage.sh create mode 100644 app/test/has_hugepage.py diff --git a/app/test/has-hugepage.sh b/app/test/has-hugepage.sh deleted file mode 100755 index d600fad319..0000000000 --- a/app/test/has-hugepage.sh +++ /dev/null @@ -1,11 +0,0 @@ -#! /bin/sh -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2020 Mellanox Technologies, Ltd - -if [ "$(uname)" = "Linux" ] ; then - cat /proc/sys/vm/nr_hugepages || echo 0 -elif [ "$(uname)" = "FreeBSD" ] ; then - echo 1 # assume FreeBSD always has hugepages -else - echo 0 -fi diff --git a/app/test/has_hugepage.py b/app/test/has_hugepage.py new file mode 100644 index 0000000000..f8e7087d1c --- /dev/null +++ b/app/test/has_hugepage.py @@ -0,0 +1,26 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright (c) 2021 Microsoft Corporation +"""This script checks if the system supports huge pages""" + +import platform +import ctypes + +os_name = platform.system() +if os_name == "Linux": + try: + with open("/proc/sys/vm/nr_hugepages") as file_o: + content = file_o.read() + print(content) + except: + print("0") + +elif os_name == "FreeBSD": + # Assume FreeBSD always has hugepages enabled + print("1") +elif os_name == "Windows": + if ctypes.windll.kernel32.GetLargePageMinimum() > 0: + print("1") + else: + print("0") +else: + print("0") diff --git a/app/test/meson.build b/app/test/meson.build index 2b480adfba..97ee83029e 100644 --- a/app/test/meson.build +++ b/app/test/meson.build @@ -492,7 +492,7 @@ dpdk_test = executable('dpdk-test', driver_install_path), install: true) -has_hugepage = run_command('has-hugepage.sh').stdout().strip() != '0' +has_hugepage = run_command(py3, 'has_hugepage.py').stdout().strip() != '0' message('hugepage availability: @0@'.format(has_hugepage)) # some perf tests (eg: memcpy perf autotest)take very long From patchwork Wed Dec 8 19:00:00 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jie Zhou X-Patchwork-Id: 105037 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 4E975A00C2; Wed, 8 Dec 2021 20:01:09 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id ACD604273E; Wed, 8 Dec 2021 20:00:19 +0100 (CET) Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by mails.dpdk.org (Postfix) with ESMTP id 93F494115C for ; Wed, 8 Dec 2021 20:00:07 +0100 (CET) Received: from linuxonhyperv3.guj3yctzbm1etfxqx2vob5hsef.xx.internal.cloudapp.net (linux.microsoft.com [13.77.154.182]) by linux.microsoft.com (Postfix) with ESMTPSA id B3D8620B7193; Wed, 8 Dec 2021 11:00:06 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com B3D8620B7193 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1638990006; bh=Zqj3lPPs7loTrSB6z2muULoJrpLsmrber3xGK4Hybg4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=lanB2n3646edaxPkIA3Fkzd/g4d2+ZqOWvVhi/apxZJ5/R6PDa3t61Zxsn5GLM+T4 9NZMpjBUSAsChrkeFOlmjiHyT9MFLB9L6bBX8v0HWtbs0okj4UGCrT82n7Onbydirl ZCyJ11E/s8dBTcKWVgYqTL7fe2GjNhjevgRkVHO0= From: Jie Zhou To: dev@dpdk.org Cc: dmitry.kozliuk@gmail.com, bruce.richardson@intel.com, roretzla@microsoft.com, navasile@linux.microsoft.com, dmitrym@microsoft.com, pallavi.kadam@intel.com, talshn@nvidia.com, thomas@monjalon.net, aconole@redhat.com Subject: [PATCH v14 11/11] app/test: enable unit test on Windows Date: Wed, 8 Dec 2021 11:00:00 -0800 Message-Id: <1638990000-3228-12-git-send-email-jizh@linux.microsoft.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1638990000-3228-1-git-send-email-jizh@linux.microsoft.com> References: <1638928262-13177-1-git-send-email-jizh@linux.microsoft.com> <1638990000-3228-1-git-send-email-jizh@linux.microsoft.com> X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Enable a subset of unit tests for Windows CI - For driver tests, driver owners should enable corresponding tests when enabling driver for Windows. For example, the cryptodev tests will be enabled by "patch-18949: app/test: enable crypto unit tests on Windows" (which depends on this patchset to be merged). - For dump tests, currently the tests hang on Windows which require further investigation. - For telemetry tests, it has POSIX socket specific codes which require replacement for Windows. Will investigate and work on a separate patch. Signed-off-by: Jie Zhou Acked-by: Bruce Richardson --- app/test/meson.build | 111 ++++++++++++++++++++++--------------------- 1 file changed, 58 insertions(+), 53 deletions(-) diff --git a/app/test/meson.build b/app/test/meson.build index 97ee83029e..fcf38729e7 100644 --- a/app/test/meson.build +++ b/app/test/meson.build @@ -1,12 +1,6 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2017 Intel Corporation -if is_windows - build = false - reason = 'not supported on Windows' - subdir_done() -endif - if not get_option('tests') subdir_done() endif @@ -158,32 +152,14 @@ test_sources = files( ) test_deps = [ - 'acl', 'bus_pci', 'bus_vdev', - 'bpf', 'cfgfile', 'cmdline', - 'cryptodev', - 'distributor', 'dmadev', - 'efd', 'ethdev', - 'eventdev', - 'fib', - 'flow_classify', - 'graph', 'hash', - 'ipsec', - 'lpm', - 'member', - 'node', - 'pipeline', - 'port', - 'rawdev', 'rcu', - 'reorder', - 'rib', 'ring', 'security', 'stack', @@ -334,39 +310,68 @@ perf_test_names = [ ] driver_test_names = [ - 'cryptodev_aesni_mb_autotest', - 'cryptodev_aesni_gcm_autotest', - 'cryptodev_cn9k_autotest', - 'cryptodev_cn10k_autotest', - 'cryptodev_dpaa_sec_autotest', - 'cryptodev_dpaa2_sec_autotest', - 'cryptodev_null_autotest', - 'cryptodev_octeontx2_autotest', - 'cryptodev_openssl_autotest', - 'cryptodev_openssl_asym_autotest', - 'cryptodev_qat_autotest', - 'cryptodev_sw_armv8_autotest', - 'cryptodev_sw_kasumi_autotest', - 'cryptodev_sw_mvsam_autotest', - 'cryptodev_sw_snow3g_autotest', - 'cryptodev_sw_zuc_autotest', - 'dmadev_autotest', - 'eventdev_selftest_octeontx', - 'eventdev_selftest_sw', - 'rawdev_autotest', ] dump_test_names = [ - 'dump_struct_sizes', - 'dump_mempool', - 'dump_malloc_stats', - 'dump_devargs', - 'dump_log_types', - 'dump_ring', - 'dump_physmem', - 'dump_memzone', ] +if not is_windows + test_deps += [ + 'acl', + 'bpf', + 'cryptodev', + 'distributor', + 'efd', + 'eventdev', + 'fib', + 'flow_classify', + 'graph', + 'ipsec', + 'lpm', + 'member', + 'node', + 'pipeline', + 'port', + 'rawdev', + 'reorder', + 'rib', + ] + + driver_test_names += [ + 'cryptodev_aesni_mb_autotest', + 'cryptodev_aesni_gcm_autotest', + 'cryptodev_cn9k_autotest', + 'cryptodev_cn10k_autotest', + 'cryptodev_dpaa_sec_autotest', + 'cryptodev_dpaa2_sec_autotest', + 'cryptodev_null_autotest', + 'cryptodev_octeontx2_autotest', + 'cryptodev_openssl_autotest', + 'cryptodev_openssl_asym_autotest', + 'cryptodev_qat_autotest', + 'cryptodev_sw_armv8_autotest', + 'cryptodev_sw_kasumi_autotest', + 'cryptodev_sw_mvsam_autotest', + 'cryptodev_sw_snow3g_autotest', + 'cryptodev_sw_zuc_autotest', + 'dmadev_autotest', + 'eventdev_selftest_octeontx', + 'eventdev_selftest_sw', + 'rawdev_autotest', + ] + + dump_test_names += [ + 'dump_struct_sizes', + 'dump_mempool', + 'dump_malloc_stats', + 'dump_devargs', + 'dump_log_types', + 'dump_ring', + 'dump_physmem', + 'dump_memzone', + ] +endif + # The following linkages are an exception to allow running the # unit tests without requiring that the developer install the # DPDK libraries. Explicit linkage of drivers (plugin libraries) @@ -385,7 +390,7 @@ if dpdk_conf.has('RTE_LIB_METRICS') test_sources += ['test_metrics.c'] fast_tests += [['metrics_autotest', true]] endif -if dpdk_conf.has('RTE_LIB_TELEMETRY') +if not is_windows and dpdk_conf.has('RTE_LIB_TELEMETRY') test_sources += ['test_telemetry_json.c', 'test_telemetry_data.c'] fast_tests += [['telemetry_json_autotest', true], ['telemetry_data_autotest', true]] endif