June 2019 - Linux-kselftest-mirror

[PATCH net-next v3 0/3] UDP GSO audit tests

by Fred Klassen

Updates to UDP GSO selftests ot optionally stress test CMSG subsytem, and report the reliability and performance of both TX Timestamping and ZEROCOPY messages. Fred Klassen (3): net/udpgso_bench_tx: options to exercise TX CMSG net/udpgso_bench.sh add UDP GSO audit tests net/udpgso_bench.sh test fails on error tools/testing/selftests/net/udpgso_bench.sh | 52 ++++- tools/testing/selftests/net/udpgso_bench_tx.c | 291 ++++++++++++++++++++++++-- 2 files changed, 327 insertions(+), 16 deletions(-) -- 2.11.0

5 years, 6 months

3
5
0 0

stable-rc: ptrace: peeksiginfo failed on 4.19, 4.14, 4.9 and 4.4

by Naresh Kamboju

selftests: ptrace: peeksiginfo failed on x86_64, i386, arm64 and arm. FAILED on stable rc branches 4.19, 4.14, 4.9 and 4.4. PASS on mainline, next and 5.1 stable rc branch. Test output: ------------------ cd /opt/kselftests/mainline/ptrace ./peeksiginfo Error (peeksiginfo.c:143): Only 0 signals were read The git bisect show that below commit caused this test to fail. git bisect bad 5b6b0eac235ef1f915f24eda6d501a754022cbf0 is the first bad commit commit 5b6b0eac235ef1f915f24eda6d501a754022cbf0 Author: Eric W. Biederman <ebiederm(a)xmission.com> Date: Tue May 28 18:46:37 2019 -0500 signal/ptrace: Don't leak unitialized kernel memory with PTRACE_PEEK_SIGINFO commit f6e2aa91a46d2bc79fce9b93a988dbe7655c90c0 upstream. Recently syzbot in conjunction with KMSAN reported that ptrace_peek_siginfo can copy an uninitialized siginfo to userspace. Inspecting ptrace_peek_siginfo confirms this. The problem is that off when initialized from args.off can be initialized to a negaive value. At which point the "if (off >= 0)" test to see if off became negative fails because off started off negative. Prevent the core problem by adding a variable found that is only true if a siginfo is found and copied to a temporary in preparation for being copied to userspace. Prevent args.off from being truncated when being assigned to off by testing that off is <= the maximum possible value of off. Convert off to an unsigned long so that we should not have to truncate args.off, we have well defined overflow behavior so if we add another check we won't risk fighting undefined compiler behavior, and so that we have a type whose maximum value is easy to test for. Cc: Andrei Vagin <avagin(a)gmail.com> Cc: stable(a)vger.kernel.org Reported-by: syzbot+0d602a1b0d8c95bdf299(a)syzkaller.appspotmail.com Fixes: 84c751bd4aeb ("ptrace: add ability to retrieve signals without removing from a queue (v4)") Signed-off-by: "Eric W. Biederman" <ebiederm(a)xmission.com> Signed-off-by: Greg Kroah-Hartman <gregkh(a)linuxfoundation.org> :040000 040000 ff9f3109f210274d0b87851d226c35e7305ce44a b36de2c855fe2a0b332f145f0966dc1a0304d4bd M kernel Test case link, https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/too… Test output log link, https://lkft.validation.linaro.org/scheduler/job/777223#L1084 Test results comparison on different branches, https://qa-reports.linaro.org/_/comparetest/?project=22&project=6&project=5… Best regards Naresh Kamboju

5 years, 6 months

4
3
0 0

BUG: kernel NULL pointer dereference, address: 00000000

by Naresh Kamboju

While running selftest bpf: test_sockmap the kernel BUG found on i386 and arm kernel running on Linux version 5.2.0-rc5-next-20190617 steps to reproduce, cd /opt/kselftests/default-in-kernel/bpf ./test_sockmap [ 33.666964] BUG: kernel NULL pointer dereference, address: 00000000 [ 33.673246] #PF: supervisor read access in kernel mode [ 33.678392] #PF: error_code(0x0000) - not-present page [ 33.683539] *pde = 00000000 [ 33.686435] Oops: 0000 [#1] SMP [ 33.689593] CPU: 1 PID: 619 Comm: test_sockmap Not tainted 5.2.0-rc5-next-20190617 #1 [ 33.697431] Hardware name: Supermicro SYS-5019S-ML/X11SSH-F, BIOS 2.0b 07/27/2017 [ 33.704914] EIP: memcpy+0x1d/0x30 [ 33.708240] Code: 59 58 eb 85 90 90 90 90 90 90 90 90 90 3e 8d 74 26 00 55 89 e5 57 56 89 c7 53 89 d6 89 cb c1 e9 02 f3 a5 89 d9 83 e1 03 74 02 <f3> a4 5b 5e 5f 5d c3 8d b6 00 00 00 00 8d bf 00 00 00 00 3e 8d 74 [ 33.726985] EAX: f1faf000 EBX: 00000001 ECX: 00000001 EDX: 00000000 [ 33.733249] ESI: 00000000 EDI: f1faf000 EBP: f2e6d99c ESP: f2e6d990 [ 33.739505] DS: 007b ES: 007b FS: 00d8 GS: 00e0 SS: 0068 EFLAGS: 00010202 [ 33.746283] CR0: 80050033 CR2: 00000000 CR3: 31fae000 CR4: 003406d0 [ 33.752542] DR0: 00000000 DR1: 00000000 DR2: 00000000 DR3: 00000000 [ 33.758807] DR6: fffe0ff0 DR7: 00000400 [ 33.762638] Call Trace: [ 33.765084] bpf_msg_push_data+0x635/0x660 [ 33.769183] ? _raw_spin_unlock_irqrestore+0x2f/0x50 [ 33.774150] ? lockdep_hardirqs_on+0xec/0x1a0 [ 33.778512] ___bpf_prog_run+0xa0d/0x15a0 [ 33.782523] ? __lock_acquire+0x1fe/0x1ec0 [ 33.786621] __bpf_prog_run32+0x4b/0x70 [ 33.790462] ? sk_psock_msg_verdict+0x5/0x290 [ 33.794819] sk_psock_msg_verdict+0xad/0x290 [ 33.799091] ? sk_psock_msg_verdict+0xad/0x290 [ 33.803537] ? lockdep_hardirqs_on+0xec/0x1a0 [ 33.807887] ? __local_bh_enable_ip+0x78/0xf0 [ 33.812238] tcp_bpf_send_verdict+0x29c/0x3b0 [ 33.816590] tcp_bpf_sendpage+0x233/0x3d0 [ 33.820603] ? __lock_acquire+0x1fe/0x1ec0 [ 33.824703] ? __lock_acquire+0x1fe/0x1ec0 [ 33.828801] ? find_held_lock+0x27/0xa0 [ 33.832640] ? lock_release+0x92/0x290 [ 33.836392] ? find_get_entry+0x136/0x300 [ 33.840397] ? touch_atime+0x34/0xd0 [ 33.843978] ? copy_page_to_iter+0x245/0x400 [ 33.848248] ? lockdep_hardirqs_on+0xec/0x1a0 [ 33.852600] ? tcp_bpf_send_verdict+0x3b0/0x3b0 [ 33.857132] inet_sendpage+0x53/0x1f0 [ 33.860789] ? inet_recvmsg+0x1e0/0x1e0 [ 33.864620] ? kernel_sendpage+0x40/0x40 [ 33.868536] kernel_sendpage+0x1e/0x40 [ 33.872282] sock_sendpage+0x24/0x30 [ 33.875861] pipe_to_sendpage+0x59/0xa0 [ 33.879692] ? direct_splice_actor+0x40/0x40 [ 33.883962] __splice_from_pipe+0xde/0x1c0 [ 33.888055] ? direct_splice_actor+0x40/0x40 [ 33.892342] ? direct_splice_actor+0x40/0x40 [ 33.896635] splice_from_pipe+0x59/0x80 [ 33.900466] ? splice_from_pipe+0x80/0x80 [ 33.904469] ? generic_splice_sendpage+0x20/0x20 [ 33.909080] generic_splice_sendpage+0x18/0x20 [ 33.913516] ? direct_splice_actor+0x40/0x40 [ 33.917782] direct_splice_actor+0x2d/0x40 [ 33.921880] splice_direct_to_actor+0x127/0x240 [ 33.926403] ? generic_pipe_buf_nosteal+0x10/0x10 [ 33.931105] do_splice_direct+0x7e/0xc0 [ 33.934944] do_sendfile+0x20d/0x3e0 [ 33.938522] sys_sendfile+0xac/0xd0 [ 33.942015] do_fast_syscall_32+0x8e/0x320 [ 33.946114] entry_SYSENTER_32+0x70/0xc8 [ 33.950039] EIP: 0xb7fa67a1 [ 33.952830] Code: 8b 98 60 cd ff ff 85 d2 89 c8 74 02 89 0a 5b 5d c3 8b 04 24 c3 8b 14 24 c3 8b 1c 24 c3 8b 3c 24 c3 51 52 55 89 e5 0f 34 cd 80 <5d> 5a 59 c3 90 90 90 90 8d 76 00 58 b8 77 00 00 00 cd 80 90 8d 76 [ 33.971567] EAX: ffffffda EBX: 00000018 ECX: 0000001c EDX: 00000000 [ 33.977823] ESI: 00000001 EDI: 00000018 EBP: 00000001 ESP: bfcaa6d4 [ 33.984083] DS: 007b ES: 007b FS: 0000 GS: 0033 SS: 007b EFLAGS: 00000206 [ 33.990869] Modules linked in: x86_pkg_temp_thermal fuse [ 33.996181] CR2: 0000000000000000 [ 33.999500] ---[ end trace 0ef7a1496c65bde8 ]--- - Naresh

5 years, 6 months

1
0
0 0

[PATCH v4 00/18] kunit: introduce KUnit, the Linux kernel unit testing framework

by Brendan Higgins

## TLDR A quick follow up to yesterday's revision. I got some feedback that I wanted to incorporate before anyone else read the update. For this reason, I will leave a TLDR of the biggest changes since v2. Biggest things to look out for (since v2): - KUnit core now outputs results in TAP14. - Heavily reworked tools/testing/kunit/kunit.py - Changed how parsing works. - Added testing. - Greg, Logan, you might want to re-review this. - Added documentation on how to use KUnit on non-UML kernels. You can see the docs rendered here[1]. There is still some discussion going on on the [PATCH v2 00/17] thread, but I wanted to get some of these updates out before they got too stale (and too difficult for me to keep track of). I hope no one minds. ## Background This patch set proposes KUnit, a lightweight unit testing and mocking framework for the Linux kernel. Unlike Autotest and kselftest, KUnit is a true unit testing framework; it does not require installing the kernel on a test machine or in a VM (however, KUnit still allows you to run tests on test machines or in VMs if you want) and does not require tests to be written in userspace running on a host kernel. Additionally, KUnit is fast: From invocation to completion KUnit can run several dozen tests in under a second. Currently, the entire KUnit test suite for KUnit runs in under a second from the initial invocation (build time excluded). KUnit is heavily inspired by JUnit, Python's unittest.mock, and Googletest/Googlemock for C++. KUnit provides facilities for defining unit test cases, grouping related test cases into test suites, providing common infrastructure for running tests, mocking, spying, and much more. ## What's so special about unit testing? A unit test is supposed to test a single unit of code in isolation, hence the name. There should be no dependencies outside the control of the test; this means no external dependencies, which makes tests orders of magnitudes faster. Likewise, since there are no external dependencies, there are no hoops to jump through to run the tests. Additionally, this makes unit tests deterministic: a failing unit test always indicates a problem. Finally, because unit tests necessarily have finer granularity, they are able to test all code paths easily solving the classic problem of difficulty in exercising error handling code. ## Is KUnit trying to replace other testing frameworks for the kernel? No. Most existing tests for the Linux kernel are end-to-end tests, which have their place. A well tested system has lots of unit tests, a reasonable number of integration tests, and some end-to-end tests. KUnit is just trying to address the unit test space which is currently not being addressed. ## More information on KUnit There is a bunch of documentation near the end of this patch set that describes how to use KUnit and best practices for writing unit tests. For convenience I am hosting the compiled docs here[2]. Additionally for convenience, I have applied these patches to a branch[3]. The repo may be cloned with: git clone https://kunit.googlesource.com/linux This patchset is on the kunit/rfc/v5.1/v4 branch. ## Changes Since Last Version As I mentioned above, there are a significant number of updates since v2: - Converted KUnit core to print test results in TAP14 format as suggested by Greg and Frank. - Heavily reworked tools/testing/kunit/kunit.py - Changed how parsing works. - Added testing. - Added documentation on how to use KUnit on non-UML kernels. You can see the docs rendered here[1]. - Added a new set of EXPECTs and ASSERTs for pointer comparison. - Removed more function indirection as suggested by Logan. - Added a new patch that adds `kunit_try_catch_throw` to objtool's noreturn list. - Fixed a number of minorish issues pointed out by Shuah, Masahiro, and kbuild bot. Nevertheless, there are only a couple of minor updates since v3: - Added more context to the changelog on the objtool patch, as per Peter's request. - Moved all KUnit documentation under the Documentation/dev-tools/ directory as per Jonathan's suggestion. [1] https://google.github.io/kunit-docs/third_party/kernel/docs/usage.html#kuni… [2] https://google.github.io/kunit-docs/third_party/kernel/docs/ [3] https://kunit.googlesource.com/linux/+/kunit/rfc/v5.1/v4 -- 2.21.0.1020.gf2820cf01a-goog

5 years, 6 months

3
35
0 0

[PATCH] selftests/bpf: signedness bug in enable_all_controllers()

by Dan Carpenter

The "len" variable needs to be signed for the error handling to work properly. Fixes: 596092ef8bea ("selftests/bpf: enable all available cgroup v2 controllers") Signed-off-by: Dan Carpenter <dan.carpenter(a)oracle.com> --- tools/testing/selftests/bpf/cgroup_helpers.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/testing/selftests/bpf/cgroup_helpers.c b/tools/testing/selftests/bpf/cgroup_helpers.c index 0d89f0396be4..e95c33e333a4 100644 --- a/tools/testing/selftests/bpf/cgroup_helpers.c +++ b/tools/testing/selftests/bpf/cgroup_helpers.c @@ -47,7 +47,7 @@ int enable_all_controllers(char *cgroup_path) char buf[PATH_MAX]; char *c, *c2; int fd, cfd; - size_t len; + ssize_t len; snprintf(path, sizeof(path), "%s/cgroup.controllers", cgroup_path); fd = open(path, O_RDONLY); -- 2.20.1

5 years, 6 months

3
2
0 0

[PATCH AUTOSEL 4.19 20/39] selftests: vm: install test_vmalloc.sh for run_vmtests

by Sasha Levin

From: Naresh Kamboju <naresh.kamboju(a)linaro.org> [ Upstream commit bc2cce3f2ebcae02aa4bb29e3436bf75ee674c32 ] Add test_vmalloc.sh to TEST_FILES to make sure it gets installed for run_vmtests. Fixed below error: ./run_vmtests: line 217: ./test_vmalloc.sh: No such file or directory Tested with: make TARGETS=vm install INSTALL_PATH=$PWD/x Signed-off-by: Naresh Kamboju <naresh.kamboju(a)linaro.org> Signed-off-by: Shuah Khan <skhan(a)linuxfoundation.org> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- tools/testing/selftests/vm/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/testing/selftests/vm/Makefile b/tools/testing/selftests/vm/Makefile index dc68340a6a96..2cf3dc49bd03 100644 --- a/tools/testing/selftests/vm/Makefile +++ b/tools/testing/selftests/vm/Makefile @@ -24,6 +24,8 @@ TEST_GEN_FILES += virtual_address_range TEST_PROGS := run_vmtests +TEST_FILES := test_vmalloc.sh + KSFT_KHDR_INSTALL := 1 include ../lib.mk -- 2.20.1

5 years, 6 months

1
0
0 0

[PATCH AUTOSEL 4.19 19/39] kselftest/cgroup: fix incorrect test_core skip

by Sasha Levin

From: Alex Shi <alex.shi(a)linux.alibaba.com> [ Upstream commit f97f3f8839eb9de5843066d80819884f7722c8c5 ] The test_core will skip the test_cgcore_no_internal_process_constraint_on_threads test case if the 'cpu' controller missing in root's subtree_control. In fact we need to set the 'cpu' in subtree_control, to make the testing meaningful. ./test_core ... ok 4 # skip test_cgcore_no_internal_process_constraint_on_threads ... Signed-off-by: Alex Shi <alex.shi(a)linux.alibaba.com> Cc: Shuah Khan <shuah(a)kernel.org> Cc: Tejun Heo <tj(a)kernel.org> Cc: Roman Gushchin <guro(a)fb.com> Cc: Claudio Zumbo <claudioz(a)fb.com> Cc: Claudio <claudiozumbo(a)gmail.com> Cc: linux-kselftest(a)vger.kernel.org Cc: linux-kernel(a)vger.kernel.org Reviewed-by: Roman Gushchin <guro(a)fb.com> Acked-by: Tejun Heo <tj(a)kernel.org> Signed-off-by: Shuah Khan <skhan(a)linuxfoundation.org> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- tools/testing/selftests/cgroup/test_core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/testing/selftests/cgroup/test_core.c b/tools/testing/selftests/cgroup/test_core.c index d78f1c5366d3..79053a4f4783 100644 --- a/tools/testing/selftests/cgroup/test_core.c +++ b/tools/testing/selftests/cgroup/test_core.c @@ -198,7 +198,7 @@ static int test_cgcore_no_internal_process_constraint_on_threads(const char *roo char *parent = NULL, *child = NULL; if (cg_read_strstr(root, "cgroup.controllers", "cpu") || - cg_read_strstr(root, "cgroup.subtree_control", "cpu")) { + cg_write(root, "cgroup.subtree_control", "+cpu")) { ret = KSFT_SKIP; goto cleanup; } -- 2.20.1

5 years, 6 months

1
0
0 0

[PATCH AUTOSEL 4.19 18/39] kselftest/cgroup: fix unexpected testing failure on test_core

by Sasha Levin

From: Alex Shi <alex.shi(a)linux.alibaba.com> [ Upstream commit 00e38a5d753d7788852f81703db804a60a84c26e ] The cgroup testing relys on the root cgroup's subtree_control setting, If the 'memory' controller isn't set, some test cases will be failed as following: $sudo ./test_core not ok 1 test_cgcore_internal_process_constraint ok 2 test_cgcore_top_down_constraint_enable not ok 3 test_cgcore_top_down_constraint_disable ... To correct this unexpected failure, this patch write the 'memory' to subtree_control of root to get a right result. Signed-off-by: Alex Shi <alex.shi(a)linux.alibaba.com> Cc: Shuah Khan <shuah(a)kernel.org> Cc: Tejun Heo <tj(a)kernel.org> Cc: Roman Gushchin <guro(a)fb.com> Cc: Claudio Zumbo <claudioz(a)fb.com> Cc: Claudio <claudiozumbo(a)gmail.com> Cc: linux-kselftest(a)vger.kernel.org Cc: linux-kernel(a)vger.kernel.org Reviewed-by: Roman Gushchin <guro(a)fb.com> Acked-by: Tejun Heo <tj(a)kernel.org> Signed-off-by: Shuah Khan <skhan(a)linuxfoundation.org> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- tools/testing/selftests/cgroup/test_core.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tools/testing/selftests/cgroup/test_core.c b/tools/testing/selftests/cgroup/test_core.c index be59f9c34ea2..d78f1c5366d3 100644 --- a/tools/testing/selftests/cgroup/test_core.c +++ b/tools/testing/selftests/cgroup/test_core.c @@ -376,6 +376,11 @@ int main(int argc, char *argv[]) if (cg_find_unified_root(root, sizeof(root))) ksft_exit_skip("cgroup v2 isn't mounted\n"); + + if (cg_read_strstr(root, "cgroup.subtree_control", "memory")) + if (cg_write(root, "cgroup.subtree_control", "+memory")) + ksft_exit_skip("Failed to set memory controller\n"); + for (i = 0; i < ARRAY_SIZE(tests); i++) { switch (tests[i].fn(root)) { case KSFT_PASS: -- 2.20.1

5 years, 6 months

1
0
0 0

[PATCH AUTOSEL 4.19 17/39] kselftest/cgroup: fix unexpected testing failure on test_memcontrol

by Sasha Levin

From: Alex Shi <alex.shi(a)linux.alibaba.com> [ Upstream commit f6131f28057d4fd8922599339e701a2504e0f23d ] The cgroup testing relies on the root cgroup's subtree_control setting, If the 'memory' controller isn't set, all test cases will be failed as following: $ sudo ./test_memcontrol not ok 1 test_memcg_subtree_control not ok 2 test_memcg_current ok 3 # skip test_memcg_min not ok 4 test_memcg_low not ok 5 test_memcg_high not ok 6 test_memcg_max not ok 7 test_memcg_oom_events ok 8 # skip test_memcg_swap_max not ok 9 test_memcg_sock not ok 10 test_memcg_oom_group_leaf_events not ok 11 test_memcg_oom_group_parent_events not ok 12 test_memcg_oom_group_score_events To correct this unexpected failure, this patch write the 'memory' to subtree_control of root to get a right result. Signed-off-by: Alex Shi <alex.shi(a)linux.alibaba.com> Cc: Shuah Khan <shuah(a)kernel.org> Cc: Roman Gushchin <guro(a)fb.com> Cc: Tejun Heo <tj(a)kernel.org> Cc: Mike Rapoport <rppt(a)linux.vnet.ibm.com> Cc: Jay Kamat <jgkamat(a)fb.com> Cc: linux-kselftest(a)vger.kernel.org Cc: linux-kernel(a)vger.kernel.org Reviewed-by: Roman Gushchin <guro(a)fb.com> Acked-by: Tejun Heo <tj(a)kernel.org> Signed-off-by: Shuah Khan <skhan(a)linuxfoundation.org> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- tools/testing/selftests/cgroup/test_memcontrol.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tools/testing/selftests/cgroup/test_memcontrol.c b/tools/testing/selftests/cgroup/test_memcontrol.c index 6f339882a6ca..c19a97dd02d4 100644 --- a/tools/testing/selftests/cgroup/test_memcontrol.c +++ b/tools/testing/selftests/cgroup/test_memcontrol.c @@ -1205,6 +1205,10 @@ int main(int argc, char **argv) if (cg_read_strstr(root, "cgroup.controllers", "memory")) ksft_exit_skip("memory controller isn't available\n"); + if (cg_read_strstr(root, "cgroup.subtree_control", "memory")) + if (cg_write(root, "cgroup.subtree_control", "+memory")) + ksft_exit_skip("Failed to set memory controller\n"); + for (i = 0; i < ARRAY_SIZE(tests); i++) { switch (tests[i].fn(root)) { case KSFT_PASS: -- 2.20.1

5 years, 6 months

1
0
0 0

[PATCH AUTOSEL 5.1 40/59] selftests: set sysctl bc_forwarding properly in router_broadcast.sh

by Sasha Levin

From: Xin Long <lucien.xin(a)gmail.com> [ Upstream commit 67c0aaa1eaec60e9dab301012bdebe6726ae04bd ] sysctl setting bc_forwarding for $rp2 is needed when ping_test_from h2, otherwise the bc packets from $rp2 won't be forwarded. This patch is to add this setting for $rp2. Also, as ping_test_from does grep "$from" only, which could match some unexpected output, some test case doesn't really work, like: # ping_test_from $h2 198.51.200.255 198.51.200.2 PING 198.51.200.255 from 198.51.100.2 veth3: 56(84) bytes of data. 64 bytes from 198.51.100.1: icmp_seq=1 ttl=64 time=0.336 ms When doing grep $form (198.51.200.2), the output could still match. So change to grep "bytes from $from" instead. Fixes: 40f98b9af943 ("selftests: add a selftest for directed broadcast forwarding") Signed-off-by: Xin Long <lucien.xin(a)gmail.com> Signed-off-by: David S. Miller <davem(a)davemloft.net> Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- tools/testing/selftests/net/forwarding/router_broadcast.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tools/testing/selftests/net/forwarding/router_broadcast.sh b/tools/testing/selftests/net/forwarding/router_broadcast.sh index 9a678ece32b4..4eac0a06f451 100755 --- a/tools/testing/selftests/net/forwarding/router_broadcast.sh +++ b/tools/testing/selftests/net/forwarding/router_broadcast.sh @@ -145,16 +145,19 @@ bc_forwarding_disable() { sysctl_set net.ipv4.conf.all.bc_forwarding 0 sysctl_set net.ipv4.conf.$rp1.bc_forwarding 0 + sysctl_set net.ipv4.conf.$rp2.bc_forwarding 0 } bc_forwarding_enable() { sysctl_set net.ipv4.conf.all.bc_forwarding 1 sysctl_set net.ipv4.conf.$rp1.bc_forwarding 1 + sysctl_set net.ipv4.conf.$rp2.bc_forwarding 1 } bc_forwarding_restore() { + sysctl_restore net.ipv4.conf.$rp2.bc_forwarding sysctl_restore net.ipv4.conf.$rp1.bc_forwarding sysctl_restore net.ipv4.conf.all.bc_forwarding } @@ -171,7 +174,7 @@ ping_test_from() log_info "ping $dip, expected reply from $from" ip vrf exec $(master_name_get $oif) \ $PING -I $oif $dip -c 10 -i 0.1 -w $PING_TIMEOUT -b 2>&1 \ - | grep $from &> /dev/null + | grep "bytes from $from" > /dev/null check_err_fail $fail $? } -- 2.20.1

5 years, 6 months

1
0
0 0

2024

2023

2022

2021

2020

2019

2018

2017

Linux-kselftest-mirror June 2019