- Linux-kselftest-mirror - lists.linaro.org

[PATCH 1/1] tools: testing: ftrace: trigger: fix spelling mistake

by Flavio Suligoi

Fix typo: "tigger" --> "trigger" Signed-off-by: Flavio Suligoi <f.suligoi(a)asem.it> --- tools/testing/selftests/ftrace/test.d/trigger/trigger-hist.tc | 2 +- .../selftests/ftrace/test.d/trigger/trigger-stacktrace.tc | 2 +- .../ftrace/test.d/trigger/trigger-trace-marker-hist.tc | 2 +- .../ftrace/test.d/trigger/trigger-trace-marker-snapshot.tc | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/testing/selftests/ftrace/test.d/trigger/trigger-hist.tc b/tools/testing/selftests/ftrace/test.d/trigger/trigger-hist.tc index 177e8d4c4744..bf6374e1f6ae 100644 --- a/tools/testing/selftests/ftrace/test.d/trigger/trigger-hist.tc +++ b/tools/testing/selftests/ftrace/test.d/trigger/trigger-hist.tc @@ -23,7 +23,7 @@ if [ ! -f events/sched/sched_process_fork/hist ]; then exit_unsupported fi -echo "Test histogram basic tigger" +echo "Test histogram basic trigger" echo 'hist:keys=parent_pid:vals=child_pid' > events/sched/sched_process_fork/trigger for i in `seq 1 10` ; do ( echo "forked" > /dev/null); done diff --git a/tools/testing/selftests/ftrace/test.d/trigger/trigger-stacktrace.tc b/tools/testing/selftests/ftrace/test.d/trigger/trigger-stacktrace.tc index 398c05c4d2a7..6248e6b40704 100644 --- a/tools/testing/selftests/ftrace/test.d/trigger/trigger-stacktrace.tc +++ b/tools/testing/selftests/ftrace/test.d/trigger/trigger-stacktrace.tc @@ -23,7 +23,7 @@ if [ -z "$FEATURE" ]; then exit_unsupported fi -echo "Test stacktrace tigger" +echo "Test stacktrace trigger" echo 0 > trace echo 0 > options/stacktrace echo 'stacktrace' > events/sched/sched_process_fork/trigger diff --git a/tools/testing/selftests/ftrace/test.d/trigger/trigger-trace-marker-hist.tc b/tools/testing/selftests/ftrace/test.d/trigger/trigger-trace-marker-hist.tc index ab6bedb25736..01fdfd50b4be 100644 --- a/tools/testing/selftests/ftrace/test.d/trigger/trigger-trace-marker-hist.tc +++ b/tools/testing/selftests/ftrace/test.d/trigger/trigger-trace-marker-hist.tc @@ -28,7 +28,7 @@ if [ ! -f events/ftrace/print/hist ]; then exit_unsupported fi -echo "Test histogram trace_marker tigger" +echo "Test histogram trace_marker trigger" echo 'hist:keys=common_pid' > events/ftrace/print/trigger for i in `seq 1 10` ; do echo "hello" > trace_marker; done diff --git a/tools/testing/selftests/ftrace/test.d/trigger/trigger-trace-marker-snapshot.tc b/tools/testing/selftests/ftrace/test.d/trigger/trigger-trace-marker-snapshot.tc index df246e505af7..a7fef298e476 100644 --- a/tools/testing/selftests/ftrace/test.d/trigger/trigger-trace-marker-snapshot.tc +++ b/tools/testing/selftests/ftrace/test.d/trigger/trigger-trace-marker-snapshot.tc @@ -46,7 +46,7 @@ test_trace() { done } -echo "Test snapshot trace_marker tigger" +echo "Test snapshot trace_marker trigger" echo 'snapshot' > events/ftrace/print/trigger -- 2.17.1

5 years

3
2
0 0

[PATCH bpf] bpf: cgroup: allow multi-attach program to replace itself

by Lorenz Bauer

When using BPF_PROG_ATTACH to attach a program to a cgroup in BPF_F_ALLOW_MULTI mode, it is not possible to replace a program with itself. This is because the check for duplicate programs doesn't take the replacement program into account. Replacing a program with itself might seem weird, but it has some uses: first, it allows resetting the associated cgroup storage. Second, it makes the API consistent with the non-ALLOW_MULTI usage, where it is possible to replace a program with itself. Third, it aligns BPF_PROG_ATTACH with bpf_link, where replacing itself is also supported. Sice this code has been refactored a few times this change will only apply to v5.7 and later. Adjustments could be made to commit 1020c1f24a94 ("bpf: Simplify __cgroup_bpf_attach") and commit d7bf2c10af05 ("bpf: allocate cgroup storage entries on attaching bpf programs") as well as commit 324bda9e6c5a ("bpf: multi program support for cgroup+bpf") Signed-off-by: Lorenz Bauer <lmb(a)cloudflare.com> Fixes: af6eea57437a ("bpf: Implement bpf_link-based cgroup BPF program attachment") --- kernel/bpf/cgroup.c | 2 +- .../testing/selftests/bpf/prog_tests/cgroup_attach_multi.c | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/kernel/bpf/cgroup.c b/kernel/bpf/cgroup.c index fdf7836750a3..4d76f16524cc 100644 --- a/kernel/bpf/cgroup.c +++ b/kernel/bpf/cgroup.c @@ -378,7 +378,7 @@ static struct bpf_prog_list *find_attach_entry(struct list_head *progs, } list_for_each_entry(pl, progs, node) { - if (prog && pl->prog == prog) + if (prog && pl->prog == prog && prog != replace_prog) /* disallow attaching the same prog twice */ return ERR_PTR(-EINVAL); if (link && pl->link == link) diff --git a/tools/testing/selftests/bpf/prog_tests/cgroup_attach_multi.c b/tools/testing/selftests/bpf/prog_tests/cgroup_attach_multi.c index 139f8e82c7c6..b549fcfacc0b 100644 --- a/tools/testing/selftests/bpf/prog_tests/cgroup_attach_multi.c +++ b/tools/testing/selftests/bpf/prog_tests/cgroup_attach_multi.c @@ -230,6 +230,13 @@ void test_cgroup_attach_multi(void) "prog_replace", "errno=%d\n", errno)) goto err; + /* replace program with itself */ + attach_opts.replace_prog_fd = allow_prog[6]; + if (CHECK(bpf_prog_attach_xattr(allow_prog[6], cg1, + BPF_CGROUP_INET_EGRESS, &attach_opts), + "prog_replace", "errno=%d\n", errno)) + goto err; + value = 0; CHECK_FAIL(bpf_map_update_elem(map_fd, &key, &value, 0)); CHECK_FAIL(system(PING_CMD)); -- 2.25.1

5 years

2
1
0 0

[GIT PULL] Kunit update for Linux 5.8-rc1

by Shuah Khan

Hi Linus, Please pull the Kunit update for Linux 5.8-rc1. This Kunit update for Linux 5.8-rc1 consists of: - Several config fragment fixes from Anders Roxell to improve test coverage. - Improvements to kunit run script to use defconfig as default and restructure the code for config/build/exec/parse from Vitor Massaru Iha and David Gow. - Miscellaneous documentation warn fix. diff is attached. thanks, -- Shuah ---------------------------------------------------------------- The following changes since commit 2ef96a5bb12be62ef75b5828c0aab838ebb29cb8: Linux 5.7-rc5 (2020-05-10 15:16:58 -0700) are available in the Git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest tags/linux-kselftest-kunit-5.8-rc1 for you to fetch changes up to 6d6861d45e38d42a7df9db244c871ee3856acf57: security: apparmor: default KUNIT_* fragments to KUNIT_ALL_TESTS (2020-06-01 14:25:15 -0600) ---------------------------------------------------------------- linux-kselftest-kunit-5.8-rc1 This Kunit update for Linux 5.8-rc1 consists of: - Several config fragment fixes from Anders Roxell to improve test coverage. - Improvements to kunit run script to use defconfig as default and restructure the code for config/build/exec/parse from Vitor Massaru Iha and David Gow. - Miscellaneous documentation warn fix. ---------------------------------------------------------------- Anders Roxell (6): kunit: Kconfig: enable a KUNIT_ALL_TESTS fragment kunit: default KUNIT_* fragments to KUNIT_ALL_TESTS lib: Kconfig.debug: default KUNIT_* fragments to KUNIT_ALL_TESTS drivers: base: default KUNIT_* fragments to KUNIT_ALL_TESTS fs: ext4: default KUNIT_* fragments to KUNIT_ALL_TESTS security: apparmor: default KUNIT_* fragments to KUNIT_ALL_TESTS David Gow (1): kunit: kunit_tool: Separate out config/build/exec/parse Lothar Rubusch (1): Documentation: test.h - fix warnings Vitor Massaru Iha (3): kunit: use --build_dir=.kunit as default kunit: use KUnit defconfig by default kunit: Fix TabError, remove defconfig code and handle when there is no kunitconfig Documentation/dev-tools/kunit/start.rst | 13 +- Documentation/dev-tools/kunit/usage.rst | 4 +- drivers/base/Kconfig | 3 +- drivers/base/test/Kconfig | 3 +- fs/ext4/Kconfig | 3 +- include/kunit/test.h | 12 +- lib/Kconfig.debug | 6 +- lib/kunit/Kconfig | 23 ++- security/apparmor/Kconfig | 3 +- tools/testing/kunit/kunit.py | 307 +++++++++++++++++++++++++------- tools/testing/kunit/kunit_tool_test.py | 63 ++++++- 11 files changed, 351 insertions(+), 89 deletions(-) ----------------------------------------------------------------

5 years

2
1
0 0

[GIT PULL] Kselftest update for Linux 5.8-rc1

by Shuah Khan

Hi Linus, Please pull the following Kselftest update for Linux 5.8-rc1. This Kselftest update for Linux 5.8-rc1 consists of: - Several fixes from Masami Hiramatsu to improve coverage for lib and sysctl tests. - Clean up to vdso test and a new test for getcpu() from Mark Brown. - Add new gen_tar selftests Makefile target generate selftest package running "make gen_tar" in selftests directory from Veronika Kabatova. - Other miscellaneous fixes to timens, exec, tpm2 tests. diff is attached. Please note that there is a conflict in tools/testing/selftests/sysctl/sysctl.sh between commit: eee470e0739a ("selftests/sysctl: Fix to load test_sysctl module") from the kselftest tree and patch: "tools/testing/selftests/sysctl/sysctl.sh: support CONFIG_TEST_SYSCTL=y" Stephen fixed this up in linux-next. Masami double checked the fix. Please let me know if you see any problems and would like me to address them. thanks, -- Shuah ---------------------------------------------------------------- The following changes since commit 2ef96a5bb12be62ef75b5828c0aab838ebb29cb8: Linux 5.7-rc5 (2020-05-10 15:16:58 -0700) are available in the Git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest tags/linux-kselftest-5.8-rc1 for you to fetch changes up to 382561a0f11c4995d48ab82670412f8d6c418430: selftests/sysctl: Make sysctl test driver as a module (2020-06-02 10:27:02 -0600) ---------------------------------------------------------------- linux-kselftest-5.8-rc1 This Kselftest update for Linux 5.8-rc1 consists of: - Several fixes from Masami Hiramatsu to improve coverage for lib and sysctl tests. - Clean up to vdso test and a new test for getcpu() from Mark Brown. - Add new gen_tar selftests Makefile target generate selftest package running "make gen_tar" in selftests directory from Veronika Kabatova. - Other miscellaneous fixes to timens, exec, tpm2 tests. ---------------------------------------------------------------- Andrei Vagin (1): selftests/timens: handle a case when alarm clocks are not supported Kees Cook (1): selftests/exec: Verify execve of non-regular files fail Mark Brown (3): selftests: vdso: Rename vdso_test to vdso_test_gettimeofday selftests: vdso: Use a header file to prototype parse_vdso API selftests: vdso: Add a selftest for vDSO getcpu() Masami Hiramatsu (6): selftests/ftrace: Use printf for backslash included command selftests/ftrace: Return unsupported if no error_log file lib: Make prime number generator independently selectable lib: Make test_sysctl initialized as module selftests/sysctl: Fix to load test_sysctl module selftests/sysctl: Make sysctl test driver as a module Nikita Sobolev (1): Kernel selftests: Add check if TPM devices are supported Veronika Kabatova (1): selftests: introduce gen_tar Makefile target Documentation/dev-tools/kselftest.rst | 23 +++++++++ lib/math/Kconfig | 7 ++- lib/test_sysctl.c | 2 +- tools/testing/selftests/Makefile | 9 +++- tools/testing/selftests/exec/.gitignore | 1 + tools/testing/selftests/exec/Makefile | 2 +- tools/testing/selftests/exec/execveat.c | 8 ++++ .../ftrace/test.d/ftrace/tracing-error-log.tc | 2 + tools/testing/selftests/ftrace/test.d/functions | 8 ++-- .../ftrace/test.d/kprobe/kprobe_syntax_errors.tc | 4 +- tools/testing/selftests/gen_kselftest_tar.sh | 5 ++ tools/testing/selftests/sysctl/config | 2 +- tools/testing/selftests/sysctl/sysctl.sh | 13 +----- tools/testing/selftests/timens/clock_nanosleep.c | 2 +- tools/testing/selftests/timens/timens.c | 2 +- tools/testing/selftests/timens/timens.h | 13 +++++- tools/testing/selftests/timens/timer.c | 5 ++ tools/testing/selftests/timens/timerfd.c | 5 ++ tools/testing/selftests/tpm2/test_smoke.sh | 5 ++ tools/testing/selftests/tpm2/test_space.sh | 5 ++ tools/testing/selftests/vDSO/.gitignore | 2 + tools/testing/selftests/vDSO/Makefile | 5 +- tools/testing/selftests/vDSO/parse_vdso.c | 24 +--------- tools/testing/selftests/vDSO/parse_vdso.h | 31 +++++++++++++ .../selftests/vDSO/vdso_standalone_test_x86.c | 4 +- tools/testing/selftests/vDSO/vdso_test_getcpu.c | 54 ++++++++++++++++++++++ .../vDSO/{vdso_test.c => vdso_test_gettimeofday.c} | 10 ++-- 27 files changed, 196 insertions(+), 57 deletions(-) create mode 100644 tools/testing/selftests/vDSO/parse_vdso.h create mode 100644 tools/testing/selftests/vDSO/vdso_test_getcpu.c rename tools/testing/selftests/vDSO/{vdso_test.c => vdso_test_gettimeofday.c} (84%) ----------------------------------------------------------------

5 years

2
1
0 0

[PATCH 0/1] selftests for drivers/fpga

by trix＠redhat.com

From: Tom Rix <trix(a)redhat.com> repo : linux-next tag : next-20200608 Start applying selftests to drivers/fpga. While testing out this upcoming change on linux-fpga 'Add interrupt support to FPGA DFL drivers' I did not see any existing fpga tests. So I added one. Tom Rix (1): selftests: fpga: dfl: A test for afu interrupt support tools/testing/selftests/Makefile | 1 + tools/testing/selftests/drivers/fpga/Makefile | 9 +++++ .../testing/selftests/drivers/fpga/afu_intr.c | 38 +++++++++++++++++++ tools/testing/selftests/drivers/fpga/config | 1 + 4 files changed, 49 insertions(+) create mode 100644 tools/testing/selftests/drivers/fpga/Makefile create mode 100644 tools/testing/selftests/drivers/fpga/afu_intr.c create mode 100644 tools/testing/selftests/drivers/fpga/config -- 2.18.1

5 years

4
4
0 0

[RFC PATCH net-next 00/10] Add extended state

by Amit Cohen

Currently, drivers can only tell whether the link is up/down, but no additional information is given. This patch set provides an infrastructure that allows drivers to expose to the user more information in addition to the link state. This information can save users time which will not be wasted trying to understand why the link is not up for example. Expand the existing LINKSTATE_GET command with attributes for extended state. >From userspace, user can see the extended state like: $ ethtool ethX ... Link detected: no (No cable) In addition, when drivers have another information about the general extended state, it can be passed also using substate field. >From userspace: $ ethtool ethX ... Link detected: no (Autoneg failure, No partner detected) In the future the infrastructure can be used for example by PHY drivers to report whether a downshift to a lower speed occurred, something like: $ ethtool ethX ... Link detected: yes (downshifted) Patches #1-#3 Move mlxsw ethtool code to separate file Patches #4-#5 Add infrastructure in ethtool Patches #6-#7 Add support of extended state in mlxsw driver Patches #8-#10 Add tests cases Amit Cohen (10): mlxsw: spectrum_dcb: Rename mlxsw_sp_port_headroom_set() mlxsw: Move ethtool_ops to spectrum_ethtool.c mlxsw: spectrum_ethtool: Move mlxsw_sp_port_type_speed_ops structs ethtool: Add link extended state Documentation: networking: ethtool-netlink: Add link extended state mlxsw: reg: Port Diagnostics Database Register mlxsw: spectrum_ethtool: Add link extended state selftests: forwarding: ethtool: Move different_speeds_get() to ethtool_lib selftests: forwarding: forwarding.config.sample: Add port with no cable connected selftests: forwarding: Add tests for ethtool extended state Documentation/networking/ethtool-netlink.rst | 56 +- drivers/net/ethernet/mellanox/mlxsw/Makefile | 3 +- drivers/net/ethernet/mellanox/mlxsw/reg.h | 51 + .../net/ethernet/mellanox/mlxsw/spectrum.c | 1540 +--------------- .../net/ethernet/mellanox/mlxsw/spectrum.h | 45 + .../ethernet/mellanox/mlxsw/spectrum_dcb.c | 6 +- .../mellanox/mlxsw/spectrum_ethtool.c | 1641 +++++++++++++++++ include/linux/ethtool.h | 22 + include/uapi/linux/ethtool.h | 70 + include/uapi/linux/ethtool_netlink.h | 2 + net/ethtool/linkstate.c | 40 + .../selftests/net/forwarding/ethtool.sh | 17 - .../net/forwarding/ethtool_extended_state.sh | 103 ++ .../selftests/net/forwarding/ethtool_lib.sh | 17 + .../net/forwarding/forwarding.config.sample | 3 + 15 files changed, 2057 insertions(+), 1559 deletions(-) create mode 100644 drivers/net/ethernet/mellanox/mlxsw/spectrum_ethtool.c create mode 100755 tools/testing/selftests/net/forwarding/ethtool_extended_state.sh -- 2.20.1

5 years

3
30
0 0

[PATCH AUTOSEL 4.19 044/106] selftests/bpf: Fix memory leak in extract_build_id()

by Sasha Levin

From: Andrii Nakryiko <andriin(a)fb.com> [ Upstream commit 9f56bb531a809ecaa7f0ddca61d2cf3adc1cb81a ] getline() allocates string, which has to be freed. Fixes: 81f77fd0deeb ("bpf: add selftest for stackmap with BPF_F_STACK_BUILD_ID") Signed-off-by: Andrii Nakryiko <andriin(a)fb.com> Signed-off-by: Alexei Starovoitov <ast(a)kernel.org> Cc: Song Liu <songliubraving(a)fb.com> Link: https://lore.kernel.org/bpf/20200429012111.277390-7-andriin@fb.com Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- tools/testing/selftests/bpf/test_progs.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/testing/selftests/bpf/test_progs.c b/tools/testing/selftests/bpf/test_progs.c index 89f8b0dae7ef..bad3505d66e0 100644 --- a/tools/testing/selftests/bpf/test_progs.c +++ b/tools/testing/selftests/bpf/test_progs.c @@ -1118,6 +1118,7 @@ static int extract_build_id(char *build_id, size_t size) len = size; memcpy(build_id, line, len); build_id[len] = '\0'; + free(line); return 0; err: fclose(fp); -- 2.25.1

5 years

1
0
0 0

[PATCH AUTOSEL 5.4 172/175] selftests/bpf, flow_dissector: Close TAP device FD after the test

by Sasha Levin

From: Jakub Sitnicki <jakub(a)cloudflare.com> [ Upstream commit b8215dce7dfd817ca38807f55165bf502146cd68 ] test_flow_dissector leaves a TAP device after it's finished, potentially interfering with other tests that will run after it. Fix it by closing the TAP descriptor on cleanup. Fixes: 0905beec9f52 ("selftests/bpf: run flow dissector tests in skb-less mode") Signed-off-by: Jakub Sitnicki <jakub(a)cloudflare.com> Signed-off-by: Alexei Starovoitov <ast(a)kernel.org> Link: https://lore.kernel.org/bpf/20200531082846.2117903-11-jakub@cloudflare.com Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- tools/testing/selftests/bpf/prog_tests/flow_dissector.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/testing/selftests/bpf/prog_tests/flow_dissector.c b/tools/testing/selftests/bpf/prog_tests/flow_dissector.c index 92563898867c..9f3634c9971d 100644 --- a/tools/testing/selftests/bpf/prog_tests/flow_dissector.c +++ b/tools/testing/selftests/bpf/prog_tests/flow_dissector.c @@ -523,6 +523,7 @@ void test_flow_dissector(void) CHECK_ATTR(err, tests[i].name, "bpf_map_delete_elem %d\n", err); } + close(tap_fd); bpf_prog_detach(prog_fd, BPF_FLOW_DISSECTOR); bpf_object__close(obj); } -- 2.25.1

5 years

1
0
0 0

[PATCH AUTOSEL 5.4 140/175] selftests/bpf: CONFIG_IPV6_SEG6_BPF required for test_seg6_loop.o

by Sasha Levin

From: Alan Maguire <alan.maguire(a)oracle.com> [ Upstream commit 3c8e8cf4b18b3a7034fab4c4504fc4b54e4b6195 ] test_seg6_loop.o uses the helper bpf_lwt_seg6_adjust_srh(); it will not be present if CONFIG_IPV6_SEG6_BPF is not specified. Fixes: b061017f8b4d ("selftests/bpf: add realistic loop tests") Signed-off-by: Alan Maguire <alan.maguire(a)oracle.com> Signed-off-by: Daniel Borkmann <daniel(a)iogearbox.net> Link: https://lore.kernel.org/bpf/1590147389-26482-2-git-send-email-alan.maguire@… Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- tools/testing/selftests/bpf/config | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/testing/selftests/bpf/config b/tools/testing/selftests/bpf/config index 5dc109f4c097..b9601f13cf03 100644 --- a/tools/testing/selftests/bpf/config +++ b/tools/testing/selftests/bpf/config @@ -25,6 +25,7 @@ CONFIG_XDP_SOCKETS=y CONFIG_FTRACE_SYSCALLS=y CONFIG_IPV6_TUNNEL=y CONFIG_IPV6_GRE=y +CONFIG_IPV6_SEG6_BPF=y CONFIG_NET_FOU=m CONFIG_NET_FOU_IP_TUNNELS=y CONFIG_IPV6_FOU=m -- 2.25.1

5 years

1
0
0 0

[PATCH AUTOSEL 5.4 125/175] selftests: fix flower parent qdisc

by Sasha Levin

From: Vlad Buslov <vladbu(a)mellanox.com> [ Upstream commit 0531b0357ba37464e5c0033e1b7c69bbf5ecd8fb ] Flower tests used to create ingress filter with specified parent qdisc "parent ffff:" but dump them on "ingress". With recent commit that fixed tcm_parent handling in dump those are not considered same parent anymore, which causes iproute2 tc to emit additional "parent ffff:" in first line of filter dump output. The change in output causes filter match in tests to fail. Prevent parent qdisc output when dumping filters in flower tests by always correctly specifying "ingress" parent both when creating and dumping filters. Fixes: a7df4870d79b ("net_sched: fix tcm_parent in tc filter dump") Signed-off-by: Vlad Buslov <vladbu(a)mellanox.com> Signed-off-by: David S. Miller <davem(a)davemloft.net> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- .../selftests/tc-testing/tc-tests/filters/tests.json | 6 +++--- tools/testing/selftests/tc-testing/tdc_batch.py | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/testing/selftests/tc-testing/tc-tests/filters/tests.json b/tools/testing/selftests/tc-testing/tc-tests/filters/tests.json index 0f89cd50a94b..152ffa45e857 100644 --- a/tools/testing/selftests/tc-testing/tc-tests/filters/tests.json +++ b/tools/testing/selftests/tc-testing/tc-tests/filters/tests.json @@ -54,7 +54,7 @@ "setup": [ "$TC qdisc add dev $DEV2 ingress" ], - "cmdUnderTest": "$TC filter add dev $DEV2 protocol ip pref 1 parent ffff: handle 0xffffffff flower action ok", + "cmdUnderTest": "$TC filter add dev $DEV2 protocol ip pref 1 ingress handle 0xffffffff flower action ok", "expExitCode": "0", "verifyCmd": "$TC filter show dev $DEV2 ingress", "matchPattern": "filter protocol ip pref 1 flower.*handle 0xffffffff", @@ -99,9 +99,9 @@ }, "setup": [ "$TC qdisc add dev $DEV2 ingress", - "$TC filter add dev $DEV2 protocol ip prio 1 parent ffff: flower dst_mac e4:11:22:11:4a:51 src_mac e4:11:22:11:4a:50 ip_proto tcp src_ip 1.1.1.1 dst_ip 2.2.2.2 action drop" + "$TC filter add dev $DEV2 protocol ip prio 1 ingress flower dst_mac e4:11:22:11:4a:51 src_mac e4:11:22:11:4a:50 ip_proto tcp src_ip 1.1.1.1 dst_ip 2.2.2.2 action drop" ], - "cmdUnderTest": "$TC filter add dev $DEV2 protocol ip prio 1 parent ffff: flower dst_mac e4:11:22:11:4a:51 src_mac e4:11:22:11:4a:50 ip_proto tcp src_ip 1.1.1.1 dst_ip 2.2.2.2 action drop", + "cmdUnderTest": "$TC filter add dev $DEV2 protocol ip prio 1 ingress flower dst_mac e4:11:22:11:4a:51 src_mac e4:11:22:11:4a:50 ip_proto tcp src_ip 1.1.1.1 dst_ip 2.2.2.2 action drop", "expExitCode": "2", "verifyCmd": "$TC -s filter show dev $DEV2 ingress", "matchPattern": "filter protocol ip pref 1 flower chain 0 handle", diff --git a/tools/testing/selftests/tc-testing/tdc_batch.py b/tools/testing/selftests/tc-testing/tdc_batch.py index 6a2bd2cf528e..995f66ce43eb 100755 --- a/tools/testing/selftests/tc-testing/tdc_batch.py +++ b/tools/testing/selftests/tc-testing/tdc_batch.py @@ -72,21 +72,21 @@ mac_prefix = args.mac_prefix def format_add_filter(device, prio, handle, skip, src_mac, dst_mac, share_action): - return ("filter add dev {} {} protocol ip parent ffff: handle {} " + return ("filter add dev {} {} protocol ip ingress handle {} " " flower {} src_mac {} dst_mac {} action drop {}".format( device, prio, handle, skip, src_mac, dst_mac, share_action)) def format_rep_filter(device, prio, handle, skip, src_mac, dst_mac, share_action): - return ("filter replace dev {} {} protocol ip parent ffff: handle {} " + return ("filter replace dev {} {} protocol ip ingress handle {} " " flower {} src_mac {} dst_mac {} action drop {}".format( device, prio, handle, skip, src_mac, dst_mac, share_action)) def format_del_filter(device, prio, handle, skip, src_mac, dst_mac, share_action): - return ("filter del dev {} {} protocol ip parent ffff: handle {} " + return ("filter del dev {} {} protocol ip ingress handle {} " "flower".format(device, prio, handle)) -- 2.25.1

5 years

1
0
0 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

Linux-kselftest-mirror