| Message ID | cover.1711464583.git.petrm@nvidia.com |
|---|---|
| Headers | show |
| Series | selftests: Fixes for kernel CI | expand |
Hello: This series was applied to netdev/net-next.git (main) by Jakub Kicinski <kuba@kernel.org>: On Tue, 26 Mar 2024 17:54:27 +0100 you wrote: > As discussed on the bi-weekly call on Jan 30, and in mailing around > kernel CI effort, some changes are desirable in the suite of forwarding > selftests the better to work with the CI tooling. Namely: > > - The forwarding selftests use a configuration file where names of > interfaces are defined and various variables can be overridden. There > is also forwarding.config.sample that users can use as a template to > refer to when creating the config file. What happens a fair bit is > that users either do not know about this at all, or simply forget, and > are confused by cryptic failures about interfaces that cannot be > created. > > [...] Here is the summary with links: - [net-next,01/14] selftests: net: libs: Change variable fallback syntax https://git.kernel.org/netdev/net-next/c/fa61e9aec97f - [net-next,02/14] selftests: forwarding.config.sample: Move overrides to lib.sh https://git.kernel.org/netdev/net-next/c/fd36fd26ae7c - [net-next,03/14] selftests: forwarding: README: Document customization https://git.kernel.org/netdev/net-next/c/0cb862871fe7 - [net-next,04/14] selftests: forwarding: ipip_lib: Do not import lib.sh https://git.kernel.org/netdev/net-next/c/0faa565bc4a7 - [net-next,05/14] selftests: forwarding: Move several selftests https://git.kernel.org/netdev/net-next/c/40d269c000bd - [net-next,06/14] selftests: forwarding: Ditch skip_on_veth() https://git.kernel.org/netdev/net-next/c/0c499a351777 - [net-next,07/14] selftests: forwarding: Change inappropriate log_test_skip() calls https://git.kernel.org/netdev/net-next/c/677f394956e8 - [net-next,08/14] selftests: lib: Define more kselftest exit codes https://git.kernel.org/netdev/net-next/c/51ccf267beb2 - [net-next,09/14] selftests: forwarding: Have RET track kselftest framework constants https://git.kernel.org/netdev/net-next/c/596c8819cb78 - [net-next,10/14] selftests: forwarding: Convert log_test() to recognize RET values https://git.kernel.org/netdev/net-next/c/a923af1ceee7 - [net-next,11/14] selftests: forwarding: Support for performance sensitive tests https://git.kernel.org/netdev/net-next/c/e16a8d209c33 - [net-next,12/14] selftests: forwarding: Mark performance-sensitive tests https://git.kernel.org/netdev/net-next/c/e10391092aca - [net-next,13/14] selftests: forwarding: router_mpath_nh_lib: Don't skip, xfail on veth https://git.kernel.org/netdev/net-next/c/6db870bbf788 - [net-next,14/14] selftests: forwarding: Add a test for testing lib.sh functionality https://git.kernel.org/netdev/net-next/c/8ff2d7abfb6f You are awesome, thank you!
As discussed on the bi-weekly call on Jan 30, and in mailing around kernel CI effort, some changes are desirable in the suite of forwarding selftests the better to work with the CI tooling. Namely: - The forwarding selftests use a configuration file where names of interfaces are defined and various variables can be overridden. There is also forwarding.config.sample that users can use as a template to refer to when creating the config file. What happens a fair bit is that users either do not know about this at all, or simply forget, and are confused by cryptic failures about interfaces that cannot be created. In patches #1 - #3 have lib.sh just be the single source of truth with regards to which variables exist. That includes the topology variables which were previously only in the sample file, and any "tweak variables", such as what tools to use, sleep times, etc. forwarding.config.sample then becomes just a placeholder with a couple examples. Unless specific HW should be exercised, or specific tools used, the defaults are usually just fine. - Several net/forwarding/ selftests (and one net/ one) cannot be run on veth pairs, they need an actual HW interface to run on. They are generic in the sense that any capable HW should pass them, which is why they have been put to net/forwarding/ as opposed to drivers/net/, but they do not generalize to veth. The fact that these tests are in net/forwarding/, but still complaining when run, is confusing. In patches #4 - #6 move these tests to a new directory drivers/net/hw. - The following patches extend the codebase to handle well test results other than pass and fail. Patch #7 is preparatory. It converts several log_test_skip to XFAIL, so that tests do not spuriously end up returning non-0 when they are not supposed to. In patches #8 - #10, introduce some missing ksft constants, then support having those constants in RET, and then finally in EXIT_STATUS. - The traffic scheduler tests generate a large amount of network traffic to test the behavior of the scheduler. This demands a relatively high-performance computer. On slow machines, such as with a debugging kernel, the test would spuriously fail. It can still be useful to "go through the motions" though, to possibly catch bugs in setup of the scheduler graph and passing packets around. Thus we still want to run the tests, just with lowered demands. To that end, in patches #11 - #12, introduce an environment variable KSFT_MACHINE_SLOW, with obvious meaning. Tests can then make checks more lenient, such as mark failures as XFAIL. A helper, xfail_on_slow, is provided to mark performance-sensitive parts of the selftest. - In patch #13, use a similar mechanism to mark a NH group stats selftest to XFAIL HW stats tests when run on VETH pairs. - All these changes complicate the hitherto straightforward logging and checking logic, so in patch #14, add a selftest that checks this functionality in lib.sh. v1 (vs. an RFC circulated through linux-kselftest): - Patch #9: - Clarify intended usage by s/set_ret/ret_set_ksft_status/, s/nret/ksft_status/ Petr Machata (14): selftests: net: libs: Change variable fallback syntax selftests: forwarding.config.sample: Move overrides to lib.sh selftests: forwarding: README: Document customization selftests: forwarding: ipip_lib: Do not import lib.sh selftests: forwarding: Move several selftests selftests: forwarding: Ditch skip_on_veth() selftests: forwarding: Change inappropriate log_test_skip() calls selftests: lib: Define more kselftest exit codes selftests: forwarding: Have RET track kselftest framework constants selftests: forwarding: Convert log_test() to recognize RET values selftests: forwarding: Support for performance sensitive tests selftests: forwarding: Mark performance-sensitive tests selftests: forwarding: router_mpath_nh_lib: Don't skip, xfail on veth selftests: forwarding: Add a test for testing lib.sh functionality .../testing/selftests/drivers/net/hw/Makefile | 25 ++ .../net/hw}/devlink_port_split.py | 0 .../forwarding => drivers/net/hw}/ethtool.sh | 5 +- .../net/hw}/ethtool_extended_state.sh | 5 +- .../net/hw}/ethtool_lib.sh | 0 .../net/hw}/ethtool_mm.sh | 3 +- .../net/hw}/ethtool_rmon.sh | 7 +- .../net/hw}/hw_stats_l3.sh | 19 +- .../net/hw}/hw_stats_l3_gre.sh | 7 +- .../forwarding => drivers/net/hw}/loopback.sh | 5 +- .../testing/selftests/drivers/net/hw/settings | 1 + .../selftests/drivers/net/mlxsw/mlxsw_lib.sh | 2 +- .../net/mlxsw/spectrum-2/resource_scale.sh | 1 - .../net/mlxsw/spectrum/resource_scale.sh | 1 - tools/testing/selftests/net/Makefile | 1 - .../testing/selftests/net/forwarding/Makefile | 9 +- tools/testing/selftests/net/forwarding/README | 33 +++ .../net/forwarding/forwarding.config.sample | 53 ++-- .../selftests/net/forwarding/ipip_lib.sh | 1 - tools/testing/selftests/net/forwarding/lib.sh | 255 +++++++++++++----- .../selftests/net/forwarding/lib_sh_test.sh | 208 ++++++++++++++ .../net/forwarding/router_mpath_nh_lib.sh | 12 +- .../selftests/net/forwarding/sch_ets_tests.sh | 19 +- .../selftests/net/forwarding/sch_red.sh | 10 +- .../selftests/net/forwarding/sch_tbf_core.sh | 2 +- .../selftests/net/forwarding/tc_common.sh | 2 +- .../selftests/net/forwarding/tc_tunnel_key.sh | 2 - tools/testing/selftests/net/lib.sh | 48 +++- 28 files changed, 565 insertions(+), 171 deletions(-) create mode 100644 tools/testing/selftests/drivers/net/hw/Makefile rename tools/testing/selftests/{net => drivers/net/hw}/devlink_port_split.py (100%) rename tools/testing/selftests/{net/forwarding => drivers/net/hw}/ethtool.sh (98%) rename tools/testing/selftests/{net/forwarding => drivers/net/hw}/ethtool_extended_state.sh (96%) rename tools/testing/selftests/{net/forwarding => drivers/net/hw}/ethtool_lib.sh (100%) rename tools/testing/selftests/{net/forwarding => drivers/net/hw}/ethtool_mm.sh (99%) rename tools/testing/selftests/{net/forwarding => drivers/net/hw}/ethtool_rmon.sh (92%) rename tools/testing/selftests/{net/forwarding => drivers/net/hw}/hw_stats_l3.sh (96%) rename tools/testing/selftests/{net/forwarding => drivers/net/hw}/hw_stats_l3_gre.sh (92%) rename tools/testing/selftests/{net/forwarding => drivers/net/hw}/loopback.sh (92%) create mode 100644 tools/testing/selftests/drivers/net/hw/settings create mode 100755 tools/testing/selftests/net/forwarding/lib_sh_test.sh