no-huge unit test
v4 cover no-huge unit test
This is a respin of Ruifeng series with a patch I sent earlier today.
Changelog since v3:
- patch 1 is new,
- patch 3 is the only that has differences,
Signature · 21 lines
David Marchand David Marchand (1): test: load drivers when required Ruifeng Wang (4): test: skip subtests in no-huge mode test: allow no-huge mode for fast-tests ci: run tests even without hugepage ci: enable unit test for aarch64 .ci/linux-setup.sh | 11 +- .travis.yml | 5 +- app/test/meson.build | 233 ++++++++++++++++++--------------- app/test/test_acl.c | 22 ++-- app/test/test_hash.c | 7 +- app/test/test_table_pipeline.c | 12 +- 6 files changed, 158 insertions(+), 132 deletions(-) -- 2.23.0
PATCH v4 1/5 test: load drivers when required
Concatenating to test_args if event_eth_tx_adapter_autotest is executed makes all subsequent tests inherit from the drivers loading while this is unneeded.
--- app/test/meson.build | 30 +++++++++++++----------------- 1 file changed, 13 insertions(+), 17 deletions(-)
app/test/meson.build +13 -17
@@ -403,37 +403,33 @@ timeout_seconds_fast = 10 get_coremask = find_program('get-coremask.sh') num_cores_arg = '-l ' + run_command(get_coremask).stdout().strip() -test_args = [num_cores_arg] +default_test_args = [num_cores_arg] foreach arg : fast_test_names + test_args = default_test_args + if (get_option('default_library') == 'shared' and arg == 'event_eth_tx_adapter_autotest') foreach drv:dpdk_drivers test_args += ['-d', drv.full_path().split('.a')[0] + '.so'] endforeach endif - if host_machine.system() == 'linux' - test(arg, dpdk_test, - env : ['DPDK_TEST=' + arg], - args : test_args + - ['--file-prefix=@0@'.format(arg)], - timeout : timeout_seconds_fast, - is_parallel : false, - suite : 'fast-tests') - else - test(arg, dpdk_test, - env : ['DPDK_TEST=' + arg], - args : test_args, + if is_linux + test_args += ['--file-prefix=@0@'.format(arg)] + endif + + test(arg, dpdk_test, + env : ['DPDK_TEST=' + arg], + args : test_args, timeout : timeout_seconds_fast, is_parallel : false, suite : 'fast-tests') - endif endforeach foreach arg : perf_test_names test(arg, dpdk_test, env : ['DPDK_TEST=' + arg], - args : test_args, + args : default_test_args, timeout : timeout_seconds, is_parallel : false, suite : 'perf-tests')
@@ -442,7 +438,7 @@ endforeach foreach arg : driver_test_names test(arg, dpdk_test, env : ['DPDK_TEST=' + arg], - args : test_args, + args : default_test_args, timeout : timeout_seconds, is_parallel : false, suite : 'driver-tests')
@@ -451,7 +447,7 @@ endforeach foreach arg : dump_test_names test(arg, dpdk_test, env : ['DPDK_TEST=' + arg], - args : test_args, + args : default_test_args, timeout : timeout_seconds, is_parallel : false, suite : 'debug-tests')
Signature · 1 line
2.23.0
Re: [dpdk-dev] [PATCH v4 1/5] test: load drivers when required
Quoted 10 lines · David Marchand
Concatenating to
test_argsifevent_eth_tx_adapter_autotestis executed makes all subsequent tests inherit from the drivers loading while this is unneeded.Fixes 207b1c813f39 ("test: fix build without ring PMD")Signed-off-by David Marchand <[email protected]>Reviewed-by Ruifeng Wang <[email protected]>---
PATCH v4 2/5 test: skip subtests in no-huge mode
In reply to David MarchandFrom: Ruifeng Wang <[email protected]>
When running with '--no-huge' flag, tests failed with messages as:
ACL context creation with invalid NUMA should have failed! fbk hash creation should have failed
test_table_pipeline: Check pipeline invalid params failed.
These cases test against invalid socket ID as input parameter, and expect error return. But function calls return success because invalid sock ID is overwritten to SOCKET_ID_ANY when in no-huge mode.
The tests against invalid socket ID are skipped in no-huge mode.
--- app/test/test_acl.c | 22 ++++++++++++---------- app/test/test_hash.c | 7 +++++-- app/test/test_table_pipeline.c | 12 +++++++----- 3 files changed, 24 insertions(+), 17 deletions(-)
app/test/test_acl.c +12 -10
@@ -1397,16 +1397,18 @@ test_invalid_parameters(void) }else rte_acl_free (acx); -/* invalid NUMA node */ -memcpy (¶m, &acl_param,sizeof (param)); - param.socket_id =RTE_MAX_NUMA_NODES +1 ; - - acx =rte_acl_create (¶m); -if (acx !=NULL ) { -printf ("Line %i: ACL context creation with invalid NUMA " -"should have failed!\n" , __LINE__); -rte_acl_free (acx); -return -1 ; +if (rte_eal_has_hugepages ()) { +/* invalid NUMA node */ +memcpy (¶m, &acl_param,sizeof (param)); + param.socket_id =RTE_MAX_NUMA_NODES +1 ; + + acx =rte_acl_create (¶m); +if (acx !=NULL ) { +printf ("Line %i: ACL context creation with invalid " +"NUMA should have failed!\n" , __LINE__); +rte_acl_free (acx); +return -1 ; + } }/* NULL name */
app/test/test_hash.c +5 -2
@@ -1136,8 +1136,11 @@ fbk_hash_unit_test(void) handle =rte_fbk_hash_create (&invalid_params_7);RETURN_IF_ERROR_FBK (handle !=NULL ,"fbk hash creation should have failed" ); - handle =rte_fbk_hash_create (&invalid_params_8); -RETURN_IF_ERROR_FBK (handle !=NULL ,"fbk hash creation should have failed" ); +if (rte_eal_has_hugepages ()) { + handle =rte_fbk_hash_create (&invalid_params_8); +RETURN_IF_ERROR_FBK (handle !=NULL , +"fbk hash creation should have failed" ); + } handle =rte_fbk_hash_create (&invalid_params_same_name_1);RETURN_IF_ERROR_FBK (handle ==NULL ,"fbk hash creation should have succeeded" );
app/test/test_table_pipeline.c +7 -5
@@ -190,11 +190,13 @@ check_pipeline_invalid_params(void) goto fail; } - p =rte_pipeline_create (&pipeline_params_3); -if (p !=NULL ) { -RTE_LOG (INFO ,PIPELINE ,"%s: Configure pipeline with invalid " -"socket\n" , __func__); - goto fail; +if (rte_eal_has_hugepages ()) { + p =rte_pipeline_create (&pipeline_params_3); +if (p !=NULL ) { +RTE_LOG (INFO ,PIPELINE ,"%s: Configure pipeline with " +"invalid socket\n" , __func__); + goto fail; + } }/* Check pipeline consistency */
Signature · 1 line
2.23.0
PATCH v4 3/5 test: allow no-huge mode for fast-tests
In reply to David MarchandFrom: Ruifeng Wang <[email protected]>
In environments where hugepage are not available, such as containers, many cases in fast-tests suite should also run if no-huge EAL option is used.
Flag is appended to each case in fast-tests suite to indicate whether it lives with no-huge mode.
With the flag, fast-tests suite can be generated based on detected hugepage availability of building environment. All cases will be valid if hugepage is available, whereas only applicable cases will be added if environment has no hugepage support.
--- app/test/meson.build | 215 ++++++++++++++++++++++++------------------- 1 file changed, 119 insertions(+), 96 deletions(-)
app/test/meson.build +119 -96
@@ -154,87 +154,89 @@ test_deps = ['acl', 'timer' ] -fast_test_names = [ - 'acl_autotest', - 'alarm_autotest', - 'atomic_autotest', - 'byteorder_autotest', - 'cmdline_autotest', - 'common_autotest', - 'cpuflags_autotest', - 'cycles_autotest', - 'debug_autotest', - 'eal_flags_c_opt_autotest', - 'eal_flags_master_opt_autotest', - 'eal_flags_n_opt_autotest', - 'eal_flags_hpet_autotest', - 'eal_flags_no_huge_autotest', - 'eal_flags_w_opt_autotest', - 'eal_flags_b_opt_autotest', - 'eal_flags_vdev_opt_autotest', - 'eal_flags_r_opt_autotest', - 'eal_flags_mem_autotest', - 'eal_flags_file_prefix_autotest', - 'eal_flags_misc_autotest', - 'eal_fs_autotest', - 'errno_autotest', - 'event_ring_autotest', - 'fib_autotest', - 'fib6_autotest', - 'func_reentrancy_autotest', - 'flow_classify_autotest', - 'hash_autotest', - 'interrupt_autotest', - 'logs_autotest', - 'lpm_autotest', - 'lpm6_autotest', - 'malloc_autotest', - 'mbuf_autotest', - 'mcslock_autotest', - 'memcpy_autotest', - 'memory_autotest', - 'mempool_autotest', - 'memzone_autotest', - 'meter_autotest', - 'multiprocess_autotest', - 'per_lcore_autotest', - 'prefetch_autotest', - 'rcu_qsbr_autotest', - 'red_autotest', - 'rib_autotest', - 'rib6_autotest', - 'ring_autotest', - 'rwlock_test1_autotest', - 'rwlock_rda_autotest', - 'rwlock_rds_wrm_autotest', - 'rwlock_rde_wro_autotest', - 'sched_autotest', - 'spinlock_autotest', - 'stack_autotest', - 'stack_lf_autotest', - 'string_autotest', - 'table_autotest', - 'tailq_autotest', - 'timer_autotest', - 'user_delay_us', - 'version_autotest', - 'crc_autotest', - 'delay_us_sleep_autotest', - 'distributor_autotest', - 'eventdev_common_autotest', - 'fbarray_autotest', - 'hash_readwrite_func_autotest', - 'ipsec_autotest', - 'kni_autotest', - 'kvargs_autotest', - 'member_autotest', - 'metrics_autotest', - 'power_cpufreq_autotest', - 'power_autotest', - 'power_kvm_vm_autotest', - 'reorder_autotest', - 'service_autotest', - 'thash_autotest', +# Each test is marked with flag true/false +# to indicate whether it can run in no-huge mode. +fast_tests = [ + ['acl_autotest', true], + ['alarm_autotest', false], + ['atomic_autotest', false], + ['byteorder_autotest', true], + ['cmdline_autotest', true], + ['common_autotest', true], + ['cpuflags_autotest', true], + ['cycles_autotest', true], + ['debug_autotest', true], + ['eal_flags_c_opt_autotest', false], + ['eal_flags_master_opt_autotest', false], + ['eal_flags_n_opt_autotest', false], + ['eal_flags_hpet_autotest', false], + ['eal_flags_no_huge_autotest', false], + ['eal_flags_w_opt_autotest', false], + ['eal_flags_b_opt_autotest', false], + ['eal_flags_vdev_opt_autotest', false], + ['eal_flags_r_opt_autotest', false], + ['eal_flags_mem_autotest', false], + ['eal_flags_file_prefix_autotest', false], + ['eal_flags_misc_autotest', false], + ['eal_fs_autotest', true], + ['errno_autotest', true], + ['event_ring_autotest', true], + ['fib_autotest', true], + ['fib6_autotest', true], + ['func_reentrancy_autotest', false], + ['flow_classify_autotest', false], + ['hash_autotest', true], + ['interrupt_autotest', true], + ['logs_autotest', true], + ['lpm_autotest', true], + ['lpm6_autotest', true], + ['malloc_autotest', false], + ['mbuf_autotest', false], + ['mcslock_autotest', false], + ['memcpy_autotest', true], + ['memory_autotest', false], + ['mempool_autotest', false], + ['memzone_autotest', false], + ['meter_autotest', true], + ['multiprocess_autotest', false], + ['per_lcore_autotest', true], + ['prefetch_autotest', true], + ['rcu_qsbr_autotest', true], + ['red_autotest', true], + ['rib_autotest', true], + ['rib6_autotest', true], + ['ring_autotest', true], + ['rwlock_test1_autotest', true], + ['rwlock_rda_autotest', true], + ['rwlock_rds_wrm_autotest', true], + ['rwlock_rde_wro_autotest', true], + ['sched_autotest', true], + ['spinlock_autotest', true], + ['stack_autotest', false], + ['stack_lf_autotest', false], + ['string_autotest', true], + ['table_autotest', true], + ['tailq_autotest', true], + ['timer_autotest', false], + ['user_delay_us', true], + ['version_autotest', true], + ['crc_autotest', true], + ['delay_us_sleep_autotest', true], + ['distributor_autotest', false], + ['eventdev_common_autotest', true], + ['fbarray_autotest', true], + ['hash_readwrite_func_autotest', false], + ['ipsec_autotest', true], + ['kni_autotest', false], + ['kvargs_autotest', true], + ['member_autotest', true], + ['metrics_autotest', true], + ['power_cpufreq_autotest', false], + ['power_autotest', true], + ['power_kvm_vm_autotest', false], + ['reorder_autotest', true], + ['service_autotest', true], + ['thash_autotest', true], ] perf_test_names = [
@@ -334,13 +336,13 @@ if dpdk_conf.has('RTE_LIBRTE_RING_PMD') test_sources += 'test_link_bonding_mode4.c' test_sources += 'sample_packet_forward.c' test_sources += 'test_pdump.c' - fast_test_names += 'ring_pmd_autotest' + fast_tests += [['ring_pmd_autotest', true]] perf_test_names += 'ring_pmd_perf_autotest' - fast_test_names += 'event_eth_tx_adapter_autotest' - fast_test_names += 'bitratestats_autotest' - fast_test_names += 'latencystats_autotest' + fast_tests += [['event_eth_tx_adapter_autotest', false]] + fast_tests += [['bitratestats_autotest', true]] + fast_tests += [['latencystats_autotest', true]] driver_test_names += 'link_bonding_mode4_autotest' - fast_test_names += 'pdump_autotest' + fast_tests += [['pdump_autotest', true]] endif if dpdk_conf.has('RTE_LIBRTE_POWER')
@@ -368,7 +370,7 @@ if dpdk_conf.has('RTE_LIBRTE_COMPRESSDEV') test_dep_objs += compress_test_dep test_sources += 'test_compressdev.c' test_deps += 'compressdev' - fast_test_names += 'compressdev_autotest' + fast_tests += [['compressdev_autotest', false]] endif endif
@@ -395,6 +397,17 @@ dpdk_test = executable('dpdk-test', install_rpath: driver_install_path, install: true) +has_hugepage = true +if is_linux + check_hugepage = run_command('cat', + '/proc/sys/vm/nr_hugepages') + if (check_hugepage.returncode() != 0 or + check_hugepage.stdout().strip() == '0') + has_hugepage = false + endif +endif +message('hugepage availability: @0@'.format(has_hugepage)) + # some perf tests (eg: memcpy perf autotest)take very long # to complete, so timeout to 10 minutes timeout_seconds = 600
@@ -405,25 +418,35 @@ num_cores_arg = '-l ' + run_command(get_coremask).stdout().strip() default_test_args = [num_cores_arg] -foreach arg : fast_test_names +foreach arg : fast_tests test_args = default_test_args + run_test = true + if not has_hugepage + if arg[1] + test_args += ['--no-huge', '-m', '2048'] + else + run_test = false + endif + endif if (get_option('default_library') == 'shared' and - arg == 'event_eth_tx_adapter_autotest') + arg[0] == 'event_eth_tx_adapter_autotest') foreach drv:dpdk_drivers test_args += ['-d', drv.full_path().split('.a')[0] + '.so'] endforeach endif if is_linux - test_args += ['--file-prefix=@0@'.format(arg)] + test_args += ['--file-prefix=@0@'.format(arg[0])] endif - test(arg, dpdk_test, - env : ['DPDK_TEST=' + arg], - args : test_args, - timeout : timeout_seconds_fast, - is_parallel : false, - suite : 'fast-tests') + if run_test + test(arg[0], dpdk_test, + env : ['DPDK_TEST=' + arg[0]], + args : test_args, + timeout : timeout_seconds_fast, + is_parallel : false, + suite : 'fast-tests') + endif endforeach foreach arg : perf_test_names
Signature · 1 line
2.23.0
PATCH v4 4/5 ci: run tests even without hugepage
In reply to David MarchandFrom: Ruifeng Wang <[email protected]>
As fast-tests suite generated with only applicable cases included, hugepage is not a mandatory to run the test.
Ignore the result of hugepage set up, so that validation in environment without hugepage can proceed.
--- .ci/linux-setup.sh | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-)
.ci/linux-setup.sh +4 -7
@@ -3,10 +3,7 @@ # need to install as 'root' since some of the unit tests won't run without it sudo python3 -m pip install --upgrade 'meson==0.47.1' -# skip hugepage settings if tests will not run -if [ "$RUN_TESTS" = "1" ]; then - # setup hugepages - cat /proc/meminfo - sudo sh -c 'echo 1024 > /proc/sys/vm/nr_hugepages' - cat /proc/meminfo -fi +# setup hugepages. error ignored because having hugepage is not mandatory. +cat /proc/meminfo +sudo sh -c 'echo 1024 > /proc/sys/vm/nr_hugepages' || true +cat /proc/meminfo
Signature · 1 line
2.23.0
PATCH v4 5/5 ci: enable unit test for aarch64
In reply to David MarchandFrom: Ruifeng Wang <[email protected]>
Add Travis CI jobs to run unit tests on aarch64 platform.
--- .travis.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
.travis.yml +4 -1
@@ -105,6 +105,9 @@ jobs: - env: DEF_LIB="static" arch: arm64 compiler: gcc + - env: DEF_LIB="shared" RUN_TESTS=1 + arch: arm64 + compiler: gcc - env: DEF_LIB="shared" BUILD_DOCS=1 arch: arm64 compiler: gcc
@@ -125,6 +128,6 @@ jobs: - env: DEF_LIB="static" arch: arm64 compiler: clang - - env: DEF_LIB="shared" + - env: DEF_LIB="shared" RUN_TESTS=1 arch: arm64 compiler: clang
Signature · 1 line
2.23.0
Quoted 6 lines · David Marchand
This is a respin of Ruifeng series with a patch I sent earlier today.
Changelog since v3:
- patch 1 is new,
- patch 3 is the only that has differences,
Series applied, thanks Ruifeng.
Small note, in containers all cores from the travis arm systems are seen, so unit tests will run against more cores than in x86_64 virtual machines.
Signature · 1 line
David Marchand