Commit graph

3,495 commits

Message SHA1
Add option to skip map/prog based on build type
This feature allows skipping a program or map based on the type of the
build. This allows things like userdebug-only programs.

Bug: 246985031
Test: added test program and watched it skipped on userdebug
Change-Id: I5cd9725ad8f133c98c86e6ba620a266313055157

Ryan Zuklie   commited 2022-12-19 14:08:53 -08:00
8531cfe5dd
Merge "Add skeleton BPF ring buffer integration test"
Treehugger Robot   authored and   Gerrit Code Review   commited 2022-12-14 21:04:18 +00:00
22d2158452
Merge "Use TargetSetupError for ConnectivityCheck"
Treehugger Robot   authored and   Gerrit Code Review   commited 2022-12-14 07:27:28 +00:00
26388b06ef
Merge "Address comments left from aosp/2324894."
Xiao Ma   authored and   Gerrit Code Review   commited 2022-12-13 07:09:27 +00:00
089c4c750e
Use TargetSetupError for ConnectivityCheck
If the preparer throws AssertionError, tests will still
be retried without re-running the preparer. It needs
to throw TargetSetupError to indicate that setup failed.

Change-Id: Id01845536a216e1a3ca1c671c97f7bcd992c354e
Fixes: 254542801
Test: atest

Remi NGUYEN VAN   commited 2022-12-13 14:58:40 +09:00
449c01f6f6
Add skeleton BPF ring buffer integration test
This adds a BPF program with a ring buffer and an associated test that
ensures the program and ring buffer can be loaded by the bpf loader. In
the following changes, this foundation will be used to test the user
space ring buffer wrapper class.

Unlike BpfMap, userspace can't (easily) write to the ring buffer so the
most accurate way to test a userspace ring buffer implementation is to
write to it from a BPF program.

Note: the BPF program in this change is never actually attached to a
cgroup, it is only loaded. The program will be executed manually using
BPF_PROG_RUN which is "side-effect free" (it can have side effects on
BPF maps, but not on Kernel state, e.g. dropping packets).

Bug: 246985031
Test: atest libbpf_android_test
Change-Id: Ib9c591218188f5f358a755c8854bc6f87d26af12

Ryan Zuklie   commited 2022-12-12 10:02:18 -08:00
ccd5eb9359
Address comments left from aosp/2324894.
- address flags preferrence, support u32 flags
    - assert IP address should not be null
    - add unit tests for the update.

Bug: 260934173
Test: atest NetworkStaticLibTests
Change-Id: I18b3a717a9602748617cad279f65c0fefd5dec48

Xiao Ma   commited 2022-12-12 18:40:30 +09:00
d03464df21
Merge "Add IPV4_FLAG_{DF,MF} constants."
Treehugger Robot   authored and   Gerrit Code Review   commited 2022-12-12 05:01:41 +00:00
0a9506978a
Merge "Add NetlinkUtils"
Chiachang Wang   authored and   Gerrit Code Review   commited 2022-12-12 01:02:38 +00:00
6c6a58639c
Merge "updated TODO's for bpf_shared.h -> netd.h rename"
Maciej Żenczykowski   authored and   Gerrit Code Review   commited 2022-12-10 10:26:54 +00:00
39f2501c50
Merge "Rename DEFINE_BPF_RINGBUF to DEFINE_BPF_RINGBUF_EXT"
Treehugger Robot   authored and   Gerrit Code Review   commited 2022-12-10 02:27:05 +00:00
521ed5b92d
Merge "Add the name of the expected callback"
Treehugger Robot   authored and   Gerrit Code Review   commited 2022-12-09 21:15:45 +00:00
e027ddf90d
Add a method helper to create RTM_NEWADDR message in user space. am: 1b8898fe5a
Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/net/+/2324894

Change-Id: Ia1d1d49bf8befc1befabeb1ab4700637e87000cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Xiao Ma   authored and   Automerger Merge Worker   commited 2022-12-09 01:19:58 +00:00
27fc6320d1
Rename DEFINE_BPF_RINGBUF to DEFINE_BPF_RINGBUF_EXT
_EXT suffix is used for the all-args versions of these, such as the one
here.

Bug: 246985031
Test: build and flash on 4.19 and 5.10
Change-Id: Ibd76cbdc38f4d1f9df4f440147e5f18d9a2ea026

Ryan Zuklie   commited 2022-12-08 17:18:54 -08:00
5a8738e7de
updated TODO's for bpf_shared.h -> netd.h rename
Test: TreeHugger
Signed-off: Maciej Żenczykowski <maze@google.com>
Change-Id: I44bb430f176161cafd6dfbd5e26e61dbe2a0183a

Maciej Żenczykowski   commited 2022-12-08 16:40:28 +00:00
41abe75ba7
Add NetlinkUtils
Add NetlinkUtils to support common netlink related utilities.
Also add method to support usage for construct an
inet_diag_req_v2 message for querying alive TCP sockets from
kernel.

Bug: 259000745
Test: atest NetworkStackTests
Change-Id: I542a115128fe663dd1c478942091452fb9352111

chiachangwang   commited 2022-12-08 05:34:02 +00:00
c7801476ea
Add IPV4_FLAG_{DF,MF} constants.
Bug: 258093642
Test: see other CL in topic
Change-Id: I04b954a7adb0a0e8bc4032a2cbfc899fe958b3b1

Lorenzo Colitti   commited 2022-12-07 23:44:25 +00:00
741ae9ff5d
Add a method helper to create RTM_NEWADDR message in user space.
Bug: 260934173
Test: atest NetworkStaticLibTests
Change-Id: I39a53a3d8b0cd10437aeed502657dd34d8b7775d

Xiao Ma   commited 2022-12-07 12:53:55 +09:00
0937911c41
Merge "Add withCleanCallingIdentity with Supplier to module utils" am: d7bcdba4a9
Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/net/+/2319733

Change-Id: I93fa1be241dd0699723204d9bef8483bd5393877
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Chiachang Wang   authored and   Automerger Merge Worker   commited 2022-12-05 01:23:38 +00:00
bbaa80b686
Merge "Add withCleanCallingIdentity with Supplier to module utils"
Chiachang Wang   authored and   Gerrit Code Review   commited 2022-12-05 00:48:25 +00:00
7e04d1678d
Add withCleanCallingIdentity with Supplier to module utils
Binder#withCleanCallingIdentity with Supplier is a very useful
utility but it's not public.  Thus, make one in the connectivity
module utils.

Bug: 255231779
Test: m ; adb shell dumpsys connectivity
Change-Id: I029a34a96b1107111a605b91a54c8fdb071e9fc0

chiachangwang   commited 2022-12-01 08:10:07 +00:00
b2a6964fc2
Merge "Add macro to create BPF ring buffers." am: 6e700972bf
Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/net/+/2311141

Change-Id: I4e63d4b30e854a71d6bb22207acb08cb1dcfed86
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Maciej Żenczykowski   authored and   Automerger Merge Worker   commited 2022-11-29 14:28:47 +00:00
ef9c0b7790
Merge "Add macro to create BPF ring buffers."
Maciej Żenczykowski   authored and   Gerrit Code Review   commited 2022-11-29 13:58:51 +00:00
8b541aa6ae
Add macro to create BPF ring buffers.
BPF ring buffers are defined like maps, but cannot specify a key or
value size (attempting to do so is a verifier error). This change also
adds the type-safe methods for interacting with the map (output, reserve
and submit).

Bug: 246985031
Test: local run of Network Tracing w/ ring buffers
Change-Id: Ie8a47d987be6cb219fe7d73f2c61a56e3a3ab21a

Ryan Zuklie   commited 2022-11-28 11:06:30 -08:00
79ce874e8f
Add the name of the expected callback
Before :
  java.lang.AssertionError: Did not receive callback after 5000
After :
  java.lang.AssertionError: Did not receive Available after 5000ms

Test: manual
Change-Id: If46d52cb0db8ea3d418169ea330d915d835e4373

Chalard Jean   commited 2022-11-25 15:52:03 +09:00
c79a231a16
Add ConfigInfrastructure lib to Android.bp am: e35db937f5
Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/net/+/2306202

Change-Id: Ic2ebed75273b1d834145a0d165c416a9aa64d404
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Hassan Ali   authored and   Automerger Merge Worker   commited 2022-11-22 17:47:13 +00:00
4f20bfb67c
Add ConfigInfrastructure lib to Android.bp
As part of moving DeviceConfig.java to
packages/modules/ConfigInfrastructure, We need to add
ConfigInfrastructure lib dependency to Android.bp.

Test: m
bug: 253019048
Change-Id: Id35bec32e9b46ef6589034d442a767ce1a4aaac8

Hassan Ali   commited 2022-11-17 16:34:31 +00:00
47d424e49d
Merge "Revert "[ST03] Add test dns server for integration tests"" am: 7f5948f358
Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/net/+/2301562

Change-Id: I88c5a1e9cf6790a03d110e40d8a08d5e633eebb1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Treehugger Robot   authored and   Automerger Merge Worker   commited 2022-11-16 05:34:08 +00:00
efed980a97
Merge "Revert "[ST03] Add test dns server for integration tests""
Treehugger Robot   authored and   Gerrit Code Review   commited 2022-11-16 05:13:03 +00:00
8228246ad0
Merge "Add useful utils to CollectionUtils" am: ab74813ee5
Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/net/+/2301638

Change-Id: I06c590ff133e419bf3c1a57f38e0532eab28e3e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Jean Chalard   authored and   Automerger Merge Worker   commited 2022-11-15 09:28:51 +00:00
660e6fb843
Merge "Add useful utils to CollectionUtils"
Jean Chalard   authored and   Gerrit Code Review   commited 2022-11-15 08:50:19 +00:00
55de7e4c84
Revert "[ST03] Add test dns server for integration tests"
Revert "[ST03.1] Add DnsAnswerProviderTest"

Revert submission 1390056-st03

Reason for revert: test failed in presubmit, still under checking.
Reverted Changes:
Ia5039a47f:[ST03] Add test dns server for integration tests
I9157e030c:[ST03.1] Add DnsAnswerProviderTest

Change-Id: I1ff291ca62e2209343ed5c5e4aa3bf3e93229f47

Junyu Lai   authored and   Gerrit Code Review   commited 2022-11-15 05:55:27 +00:00
88c48e18e4
Merge "[ST03] Add test dns server for integration tests" am: cddfc04b31
Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/net/+/1390056

Change-Id: I76488aeb6919eaf51727fa4033df32467b36ec3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Treehugger Robot   authored and   Automerger Merge Worker   commited 2022-11-14 14:21:11 +00:00
d9ad1753ca
Merge "[ST03] Add test dns server for integration tests"
Treehugger Robot   authored and   Gerrit Code Review   commited 2022-11-14 14:01:12 +00:00
40b76e8bac
Add useful utils to CollectionUtils
Test: new tests in this patch
Change-Id: I9cca999f9235d4d6508533230afcd8ee0c1c54c1

Chalard Jean   commited 2022-11-14 20:47:59 +09:00
43bb172e82
Merge "Move DeviceConfigRule to libs/net" am: 715f4b1c69
Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/net/+/2291735

Change-Id: Ic58aed74ce018f31e8ba6305468b87f811b4e96a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Treehugger Robot   authored and   Automerger Merge Worker   commited 2022-11-14 10:02:08 +00:00
eee04ab498
Merge "Move DeviceConfigRule to libs/net"
Treehugger Robot   authored and   Gerrit Code Review   commited 2022-11-14 09:34:58 +00:00
1a81ae4eb9
Merge "Add eventuallyExpect method that takes mark" am: 40b6c5de71
Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/net/+/2280754

Change-Id: I6606d056ac63d04b160515f90ce649f6abfd5122
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Junyu Lai   authored and   Automerger Merge Worker   commited 2022-11-14 06:19:44 +00:00
3e7588d4f5
Merge "Add eventuallyExpect method that takes mark"
Junyu Lai   authored and   Gerrit Code Review   commited 2022-11-14 05:55:58 +00:00
c32afc4238
Merge "[CC08] Remove expectCallback*" am: 7662aec8d6
Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/net/+/2264782

Change-Id: I48fe89958d1f4b1a0b761f353c9b59ac8691a0ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Jean Chalard   authored and   Automerger Merge Worker   commited 2022-11-11 03:56:10 +00:00
88e28d724e
Merge "[CC08] Remove expectCallback*"
Jean Chalard   authored and   Gerrit Code Review   commited 2022-11-11 03:17:42 +00:00
664e53bd88
Move DeviceConfigRule to libs/net
The utility can be useful for tests in several repositories, not just
CTS.

Test: m
Change-Id: Id4c653793e58d91d604b388a06a7c137ed020110

Remi NGUYEN VAN   commited 2022-11-10 18:10:24 +09:00
7356d356fb
Add eventuallyExpect method that takes mark
Test: atest CtsNetTestCases:android.net.cts.ConnectivityManagerTest
Fix: 254188130
Change-Id: I98ea8aef5cb21ee92ce47d97d2f9c81448b1cd9e

Junyu Lai   commited 2022-11-10 14:35:29 +08:00
53a6b7053d
Merge "Revert "add bpf_for_each_map_elem() helper definition"" am: bb1881432e
Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/net/+/2280752

Change-Id: I241bc11fe09afbf7aed77bcd48079232c821ad4f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Maciej Żenczykowski   authored and   Automerger Merge Worker   commited 2022-11-08 00:24:08 +00:00
0800d7469f
Merge "Revert "add bpf_for_each_map_elem() helper definition""
Maciej Żenczykowski   authored and   Gerrit Code Review   commited 2022-11-07 23:36:35 +00:00
91e4845301
Merge "Add option to validate DUN networks" am: 8e2290acaf
Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/net/+/2266845

Change-Id: I15b659cc9608c34d91c37adeb4e105ecb8034e8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Treehugger Robot   authored and   Automerger Merge Worker   commited 2022-11-04 11:52:31 +00:00
b1f5ff04e8
Merge "Add option to validate DUN networks"
Treehugger Robot   authored and   Gerrit Code Review   commited 2022-11-04 11:14:41 +00:00
5043f90f0f
Add option to validate DUN networks
When isDunValidationRequired is true, networks with DUN capability will
always be validated. Otherwise previous behavior will apply.

Bug: 253989196
Test: atest NetworkMonitorTests
Change-Id: I6e8bc7fcbf561f636abbf42ca69749fd0eabfd6c

Remi NGUYEN VAN   commited 2022-11-04 17:05:49 +09:00
8076110105
Revert "add bpf_for_each_map_elem() helper definition"
This reverts commit 8711ae5494a3011f48543987fa08872d775df652.

Bug: 256991746
Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I4835904f906422d5927feef82459ce1adcebc90c

Maciej Żenczykowski   commited 2022-11-02 08:39:20 +00:00
61e21fff0b
[ST03] Add test dns server for integration tests
Bug: 139774492
Test: atest DnsAnswerProviderTest TestDnsServerTest
Change-Id: Ia5039a47f4b818efb09aab8174beb9d921339c3d

Junyu Lai   commited 2022-11-02 11:18:48 +08:00
be99103196