summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-09-23[automerger skipped] Merge "Use blocking sockets with timeout for ↵android-mainline-11.0.0_r44android-mainline-11.0.0_r23android-mainline-11.0.0_r15android11-mainline-os-statsd-releaseandroid11-mainline-extservices-releaseTreehugger Robot
xfrm_tunnel_test" into pie-vts-dev am: 092e8067d4 am: 05ad5dcbce -s ours am: 9334bb1f2e -s ours am: b742e21dc4 -s ours am: 2bfdc7d34f -s ours am skip reason: Change-Id I92a39f8890244ebe918f48bcf0971e85795b2a1e with SHA-1 a563236b85 is in history Original change: https://android-review.googlesource.com/c/kernel/tests/+/1258077 Change-Id: I1bcf714236fd5f44f946a4bf0b4602f2acb310f3
2020-09-23[automerger skipped] Merge "Use blocking sockets with timeout for ↵Treehugger Robot
xfrm_tunnel_test" into pie-vts-dev am: 092e8067d4 am: 05ad5dcbce -s ours am: 9334bb1f2e -s ours am: b742e21dc4 -s ours am skip reason: Change-Id I92a39f8890244ebe918f48bcf0971e85795b2a1e with SHA-1 a563236b85 is in history Original change: https://android-review.googlesource.com/c/kernel/tests/+/1258077 Change-Id: I0841b8a6c0125a7976adb1b2eb89ff7776907503
2020-09-23[automerger skipped] Merge "Use blocking sockets with timeout for ↵Treehugger Robot
xfrm_tunnel_test" into pie-vts-dev am: 092e8067d4 am: 05ad5dcbce -s ours am: 9334bb1f2e -s ours am skip reason: Change-Id I92a39f8890244ebe918f48bcf0971e85795b2a1e with SHA-1 a563236b85 is in history Original change: https://android-review.googlesource.com/c/kernel/tests/+/1258077 Change-Id: I05bfa0ff95d1c8c8ce7814cdef2745d2997fded6
2020-09-23[automerger skipped] Merge "Use blocking sockets with timeout for ↵Treehugger Robot
xfrm_tunnel_test" into pie-vts-dev am: 092e8067d4 am: 05ad5dcbce -s ours am skip reason: Change-Id I92a39f8890244ebe918f48bcf0971e85795b2a1e with SHA-1 a563236b85 is in history Original change: https://android-review.googlesource.com/c/kernel/tests/+/1258077 Change-Id: If14bb6877f66ab89b75ddfba123eeb929a89924c
2020-09-23Merge "Use blocking sockets with timeout for xfrm_tunnel_test" into ↵Treehugger Robot
pie-vts-dev am: 092e8067d4 Original change: https://android-review.googlesource.com/c/kernel/tests/+/1258077 Change-Id: I0b990e432964a9ddcb783eb47fb2cc33abc4081a
2020-09-23Merge "Use blocking sockets with timeout for xfrm_tunnel_test" into pie-vts-devpie-vts-devTreehugger Robot
2020-09-23Use blocking sockets with timeout for xfrm_tunnel_testBenedict Wong
Using non-blocking sockets appears to be causing flakiness due to the tests racing against the kernel's crypto/networking infrastructure. This commit allows these sockets to block for up to 500ms to allow time for the crypto and routing to complete before throwing errors. Bug: 118753529 Test: Run 20x locally, via QEMU; passing. Change-Id: I92a39f8890244ebe918f48bcf0971e85795b2a1e Merged-In: I92a39f8890244ebe918f48bcf0971e85795b2a1e
2020-08-13[automerger skipped] Fix ↵android-mainline-11.0.0_r35Elvis Chien
VtsKernelNetTest#VtsKernelNetTest#testKernelNetworking am: b3880b372f am: 19e285a4a8 am: e00eb472ec am: 54da35a63c -s ours am: 8cf79723c9 -s ours am skip reason: Change-Id I2fd94487db3412669ab8bb938010b00cbb54766d with SHA-1 afb2c04a5c is in history Original change: https://android-review.googlesource.com/c/kernel/tests/+/1387197 Change-Id: I6f197d84c2418c77cec18c7612f8dca0d2c56810
2020-08-13[automerger skipped] Fix ↵Elvis Chien
VtsKernelNetTest#VtsKernelNetTest#testKernelNetworking am: b3880b372f am: 19e285a4a8 am: e00eb472ec am: 54da35a63c -s ours am skip reason: Change-Id I2fd94487db3412669ab8bb938010b00cbb54766d with SHA-1 afb2c04a5c is in history Original change: https://android-review.googlesource.com/c/kernel/tests/+/1387197 Change-Id: I150d03a9e5ad3801e1fdfa1a1ec9922836c7f53d
2020-08-13Fix VtsKernelNetTest#VtsKernelNetTest#testKernelNetworking am: b3880b372f ↵Elvis Chien
am: 19e285a4a8 am: e00eb472ec Original change: https://android-review.googlesource.com/c/kernel/tests/+/1387197 Change-Id: I8746869038f71d30963d62af5226ad62caef55aa
2020-08-13Fix VtsKernelNetTest#VtsKernelNetTest#testKernelNetworking am: b3880b372f ↵Elvis Chien
am: 19e285a4a8 Original change: https://android-review.googlesource.com/c/kernel/tests/+/1387197 Change-Id: I876797d7b9a4b68becaa1735e3f14d023ad3f0c9
2020-08-13Fix VtsKernelNetTest#VtsKernelNetTest#testKernelNetworking am: b3880b372fElvis Chien
Original change: https://android-review.googlesource.com/c/kernel/tests/+/1387197 Change-Id: Ibc58ef660a7cf1a193fbce5c36e3e0192502576a
2020-08-04Fix VtsKernelNetTest#VtsKernelNetTest#testKernelNetworkingElvis Chien
Bug: 140366925 Change-Id: I2fd94487db3412669ab8bb938010b00cbb54766d Merged-In: I2fd94487db3412669ab8bb938010b00cbb54766d (cherry picked from commit d8385e2e7f732a73e9fe9130d3a974d1254681d1)
2020-05-27net-test: attempt to use namespaces on devices with ADB/TCP am: a1197aaeadMaciej Żenczykowski
Change-Id: I4c2eaae8cfd3f33bcd364a9b45371453ba3741cf
2020-05-27net-test: prefix %x with 0x am: 4ce0aed14cMaciej Żenczykowski
Change-Id: If6e146f078edae51473358f1f72499cbd370c7e5
2020-05-27net-test: attempt to use namespaces on devices with ADB/TCPandroid-cts-11.0_r2Maciej Żenczykowski
I'm not really sure if a test for tcp/5555 being occupied is a good test or not as a means of detecting ADB over TCP... (because what guarantees it's port 5555...) 4.14-based RVC phone (via USB): $ adb shell lsof | egrep ^adbd | egrep IP adbd 1372 root 8u IPv6 0t0 37835 TCP []:5037->[]:0 (LISTEN) 5.4 RVC cuttlefish device (via vsock:4:5555): $ adb shell lsof | egrep ^adbd | egrep IP adbd 410 root 11u IPv6 0t0 10914 TCP []:5555->[]:0 (LISTEN) Bug: 149894399 Test: a_test vts_kernel_net_tests (on rvc cuttlefish x86_64) Signed-off-by: Maciej Żenczykowski <maze@google.com> Change-Id: I76bba37498ceccc48eb724f5357ec14eed84ae48 Merged-In: I76bba37498ceccc48eb724f5357ec14eed84ae48
2020-05-27net-test: prefix %x with 0xMaciej Żenczykowski
Fix for: Creating clean namespace... failed: [Errno 22] Invalid argument while unshare(44020000) (likely: no privs or lack of kernel support). Bug: 149894399 Test: ran 'atest vts_kernel_net_tests' Signed-off-by: Maciej Żenczykowski <maze@google.com> Change-Id: I6364cbba4d210423749107b5a2edff1de43caf15 Merged-In: I6364cbba4d210423749107b5a2edff1de43caf15
2020-05-26net-test: do not allow propagation of mount flags to parent namespace am: ↵Maciej Żenczykowski
8729a90040 Change-Id: Ib524671b693dcb05f668507aba7a05c9daf3617c
2020-05-26net-test: SetHostName -> SetHostname am: 14a5302274Maciej Żenczykowski
Change-Id: Ic870fb4a09e879bf03ed77ee5585cedffa14021f
2020-05-26net-test: do not allow propagation of mount flags to parent namespaceMaciej Żenczykowski
on a cuttlefish x86_64 aosp3 device without this change: $ adbz shell cat /proc/mounts | egrep ' /(|proc|sys) ' /dev/block/dm-2 / ext4 ro,seclabel,noatime,errors=panic 0 0 proc /proc proc rw,relatime,gid=3009,hidepid=2 0 0 sysfs /sys sysfs rw,seclabel,relatime 0 0 $ atest vts_kernel_net_tests ... $ adbz shell cat /proc/mounts | egrep ' /(|proc|sys) ' /dev/block/dm-2 / ext4 ro,seclabel,noatime,errors=panic 0 0 proc /proc proc rw,nosuid,nodev,noexec,relatime,gid=3009,hidepid=2 0 0 sysfs /sys sysfs rw,seclabel,nosuid,nodev,noexec,relatime 0 0 with this change there is no longer a difference. (This explains why I saw this mount syscall while strace'ing unshare) Bug: 149894399 Test: ran 'atest vts_kernel_net_tests' Signed-off-by: Maciej Żenczykowski <maze@google.com> Change-Id: Ia64be091b58f97fdf7e0c24ca6599b1aecd3bcdf Merged-In: Ia64be091b58f97fdf7e0c24ca6599b1aecd3bcdf
2020-05-26net-test: SetHostName -> SetHostnameMaciej Żenczykowski
Bug: 149894399 Test: trivial Signed-off-by: Maciej Żenczykowski <maze@google.com> Change-Id: I4c2f7ee7e095fbbe7d135fc2af560c3e0626b309 Merged-In: I4c2f7ee7e095fbbe7d135fc2af560c3e0626b309
2020-05-16net-test: namespace support lib - use 'lazy' umount am: f3a01a9c9fMaciej Żenczykowski
Change-Id: I3da44e0447f1ccb1aa7bc434fa2451a282c68bf4
2020-05-16net-test: namespace support lib - use 'lazy' umountMaciej Żenczykowski
This makes umount succeed even if stuff is mounted below the mount point. vm:~# unshare -u -m -n -- bash -c 'umount -l /proc; mount -t proc proc /proc; umount -l /sys; mount -t sysfs sys /sys; egrep " /(proc|sys)" < /proc/mounts' proc /proc proc rw 0 0 sys /sys sysfs rw 0 0 which fails without the 2 -l's: [pid X] umount("/proc", 0) = -1 EBUSY (Device or resource busy) umount: /proc: target is busy (In some cases useful info about processes that use the device is found by lsof(8) or fuser(1).) [pid X] umount("/sys", 0) = -1 EBUSY (Device or resource busy) umount: /sys: target is busy (In some cases useful info about processes that use the device is found by lsof(8) or fuser(1).) due to (among other things): /proc/bus/usb and /sys/fs/bpf being mounted. Test: ran uml net tests against Android Common Kernel 4.14-stable ('r') Bug: 149894399 Signed-off-by: Maciej Żenczykowski <maze@google.com> Change-Id: I4957722e109cfd55c8efa55ebd8f718bd049a811 Merged-In: I4957722e109cfd55c8efa55ebd8f718bd049a811
2020-05-14net-test: namespace support library am: 7c5e486669Maciej Żenczykowski
Change-Id: Idbd80d8bd6089ce5fa95175e9d2a0e860e6d547f
2020-05-14net-test: namespace support libraryMaciej Żenczykowski
Bug: 149894399 Test: ran uml net_tests against Android Kernel Common 5.4 Signed-off-by: Maciej Żenczykowski <maze@google.com> Change-Id: Iecbe71b61138e795783a7fa9b39588473a51c048 Merged-In: Iecbe71b61138e795783a7fa9b39588473a51c048
2020-05-11net-test: truly wide open ping_group_range am: 30e280fa95Maciej Żenczykowski
Change-Id: Iff4c14107397d6c8044100790d1cc6c50a50eca5
2020-05-11net-test: all_tests.py - fix a lint warning am: 461542279eMaciej Żenczykowski
Change-Id: I9f889f19647f12d18c6c52ffda6738396b42d029
2020-05-11net-test: all_tests.py - consistent use of single quotes am: 732cf15b21Maciej Żenczykowski
Change-Id: I08a2af5e3195e5f4e19682d44e4cd8a89f334bfb
2020-05-11Add METADATA to tests: Apache2+OpenSSL=NOTICE am: ebf68291cbBob Badour
Change-Id: I09cf73b67da198bc0dbb1027a860dc3b0cf4b1c4
2020-05-11net-test: truly wide open ping_group_rangeMaciej Żenczykowski
There is simply no good reason to use 65536, since it doesn't fit in 16 bits anyway. Use the maximum supported value instead. This matches what we use on Android itself. Bug: 149894399 Test: ran uml net_tests against Android Kernel Common 5.4 Signed-off-by: Maciej Żenczykowski <maze@google.com> Change-Id: I4346304180c4dbf803241b7d1732ef4e2b576be8 Merged-In: I4346304180c4dbf803241b7d1732ef4e2b576be8
2020-05-11net-test: all_tests.py - fix a lint warningMaciej Żenczykowski
Fixes: Forcing safe mode "style". ************* File all_tests.py C6202: 17: Importing a member of a module [g-importing-member] http://go/gpylint-faq#g-importing-member Bug: 153035880 Test: ran uml net_tests against Android Kernel Common 4.19 Signed-off-by: Maciej Żenczykowski <maze@google.com> Change-Id: I924e58fd5c5c4ce380c9d40d6cabe8766491313e Merged-In: I924e58fd5c5c4ce380c9d40d6cabe8766491313e
2020-05-11net-test: all_tests.py - consistent use of single quotesMaciej Żenczykowski
(fixes an inconsistent string delimiter lint warning) Bug: 153035880 Test: ran uml net_tests against Android Kernel Common 5.4 Signed-off-by: Maciej Żenczykowski <maze@google.com> Change-Id: Iaef8c25bfd220eca0b756ea6ec28e8ddaba993e2 Merged-In: Iaef8c25bfd220eca0b756ea6ec28e8ddaba993e2
2020-05-11Add METADATA to tests: Apache2+OpenSSL=NOTICEBob Badour
Bug: 68860345 Bug: 69058154 Bug: 151953481 Test: no code changes Change-Id: I57044b5725b9b55be16ac28ff4ed249a0eda2ba1 Merged-In: I57044b5725b9b55be16ac28ff4ed249a0eda2ba1
2020-05-10Merge "Fix srcaddr_selection_test when forwarding is on." into rvc-dev am: ↵Lorenzo Colitti
1998f83dff Change-Id: Id18f300c278921cf81d89175eea7bb495178d9dd
2020-05-10Merge "Support running only one test." into rvc-dev am: 2369fc3481Lorenzo Colitti
Change-Id: Id826a65e8689d23d01e8dc204b0dbb8d118a8855
2020-05-10Fix run_net_test.sh --norun. am: 031757712cLorenzo Colitti
Change-Id: I80b490b8c85e6faec11e294edb507e83ac7b676c
2020-05-10Merge "Fix srcaddr_selection_test when forwarding is on." into rvc-devLorenzo Colitti
2020-05-10Merge "Support running only one test." into rvc-devLorenzo Colitti
2020-05-10Support running only one test.Lorenzo Colitti
This does not work via atest, but allows rapid iteration on just one test by manually constructing a one-liner such as: m kernel_net_tests && \ adb push {$ANDROID_PRODUCT_OUT,}/data/nativetest64/kernel_net_tests/kernel_net_tests && \ adb shell /data/nativetest64/kernel_net_tests/kernel_net_tests srcaddr_selection_test.DadFailureTest Bug: 156144865 Test: atest vts_kernel_net_tests passes Test: atest vts_kernel_net_tests fails when failure is introduced in test code Original-Change: https://android-review.googlesource.com/1306568 Merged-In: I2e74f6c0a7194b295628c1a53dcb0c15294c84ac Change-Id: I2e74f6c0a7194b295628c1a53dcb0c15294c84ac
2020-05-10Fix run_net_test.sh --norun.Lorenzo Colitti
This was likely broken by a change to make the script run all_tests.sh if called with no arguments. It is useful to keep this running because it is used by parallel_tests.sh which is useful to find flaky tests. Bug: 156144865 Test: treehugger Test: build and run: ../net_test/run_net_test.sh Test: build only: ../net_test/run_net_test.sh --norun Test: run only: ../net_test/run_net_test.sh --nobuild bpf_test.py Test: parallel tests: ../net_test/parallel_tests.sh 10 10 srcaddr_selection_test.py Test: neither build nor run fails: ../net_test/run_net_test.sh --nobuild --norun Original-Change: https://android-review.googlesource.com/1306567 Merged-In: I86162af99dea832d18206aae3dee1889b71c879d Change-Id: I86162af99dea832d18206aae3dee1889b71c879d
2020-05-10Fix srcaddr_selection_test when forwarding is on.Lorenzo Colitti
This test does not pass when forwarding is on (e.g., when tethering is on, or on Pixel devices when a SIM card is inserted) because Linux disables optimistic addresses when fowarding is on. Make the test disable forwarding while it's running. Bug: 156144865 Test: atest vts_kernel_net_tests Original-Change: https://android-review.googlesource.com/1306569 Merged-In: I5981441513585eb3fbfc56d0fc95ff8ff1e371f4 Change-Id: I5981441513585eb3fbfc56d0fc95ff8ff1e371f4
2020-04-23[vts] Convert VtsKernelNetTest to use ExecutableTargetTestTreehugger Robot
Bug: 146651404 Bug: 147789424 Test: atest vts_kernel_net_tests Change-Id: I6057e66238f671a7a7f7737b6605236d606a4449 Merged-In: I6057e66238f671a7a7f7737b6605236d606a4449
2020-04-22[vts] Add vts_core_kernel_net_tests to vts-core test suite.Automerger Merge Worker
It's auto_gen_config disabled. Bug: 150634877 Test: atest KernelNetTest Change-Id: I4e10db0c402bf9d4846452674d5728bb771d88b5 Merged-In: I4e10db0c402bf9d4846452674d5728bb771d88b5
2020-04-18net-test: upgrade to iptables 1.8.4-3Maciej Żenczykowski
and various other changes to make things actually build One of the more interesting aspects of things is that the root directory must be root:root 0755 or systemd fails to install. Tested: built via ./build_all_rootfs.sh net_test.rootfs.amd64.bullseye.20200417 net_test.rootfs.arm64.bullseye.20200417 net_test.rootfs.armhf.bullseye.20200417 net_test.rootfs.i386.bullseye.20200417 Haven't tested they work, but this is what is needed to even make them build. Bug: 143044679 Signed-off-by: Maciej Żenczykowski <maze@google.com> Change-Id: Ie9f6f719993a7f4bb220de9218dcb590111b1e12 Merged-In: Ie9f6f719993a7f4bb220de9218dcb590111b1e12
2020-04-18net-test: buster -> bullseyeMaciej Żenczykowski
as aosp master has upgraded to iptables 1.8.4 and buster image simply doesn't build any more... (there is no debian 1.8.4 for buster [stable], but there is for bullseye [testing]) Tested: known to not work, see followup commit find | egrep buster git grep buster (finds nothing) Bug: 143044679 Signed-off-by: Maciej Żenczykowski <maze@google.com> Change-Id: I01b973367354e12d237f53b593b768fdcb4fde54 Merged-In: I01b973367354e12d237f53b593b768fdcb4fde54
2020-04-18net-test: remove stretch supportMaciej Żenczykowski
as aosp master has upgraded to iptables 1.8.4 and stretch image simply doesn't build any more... (there is no iptables 1.8.4 for stretch [oldstable]) Tested: trivial deletion, nothing runs builds find | egrep strech git grep stretch (finds nothing) Bug: 143044679 Signed-off-by: Maciej Żenczykowski <maze@google.com> Change-Id: I3f610b131bb13e52675fa24ba7710b87f7c1586e Merged-In: I3f610b131bb13e52675fa24ba7710b87f7c1586e
2020-04-17Fix format of pref64 option.Lorenzo Colitti
The lifetime is not shifted left three bits, It's divided by 8 (so shifted right 3 bits), but it's also a 13-bit integer that occupies the beginning of a 16-bit field. So it's effectively the same as a 16-bit integer with the least significant 3 bits replaced by the plc. Bug: 153694684 Test: ROOTFS=net_test.rootfs.amd64.buster.20200129 ../net_test/run_net_test.sh Change-Id: Ibf7f5372f31439794cc196f0fd27b60b9fd176bd Merged-In: Ibf7f5372f31439794cc196f0fd27b60b9fd176bd
2020-04-01Check that the PREF64 RA option is passed through.Lorenzo Colitti
Bug: 150648313 Test: ROOTFS=net_test.rootfs.amd64.buster.20200129 ../net_test/run_net_test.sh Change-Id: I692441eeae3515f99ebf311d5b0cd778e95081f9 Merged-In: I692441eeae3515f99ebf311d5b0cd778e95081f9
2020-03-05Fix VtsKernelNetTest#VtsKernelNetTest#testKernelNetworkingAutomerger Merge Worker
Bug: 140366925 Change-Id: I2fd94487db3412669ab8bb938010b00cbb54766d Merged-In: I2fd94487db3412669ab8bb938010b00cbb54766d
2020-02-05net-test: add 'random.trust_cpu=on' to kernel command line am: 8bc63c3a6c ↵Automerger Merge Worker
am: 92474ef304 am: f1d02ef000 Change-Id: I8f24edfbddbfbe2b1dd3805825e1c26a87adaf04