Commit graph

56,846 commits

Message SHA1
Merge "Mark EthernetManagerTest as @ConnectivityModuleTest" am: c2cbabf590
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2127855

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

Treehugger Robot   authored and   Automerger Merge Worker   commited 2022-06-20 11:55:04 +00:00
bdb8dbaefe
Merge "Mark EthernetManagerTest as @ConnectivityModuleTest"
Treehugger Robot   authored and   Gerrit Code Review   commited 2022-06-20 11:38:00 +00:00
c2cbabf590
Merge "Fix validation URL flakes with DeviceConfigRule" am: 39e121cc88
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2110144

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

Remi NGUYEN VAN   authored and   Automerger Merge Worker   commited 2022-06-20 08:57:37 +00:00
156ddb01a4
Merge "Fix validation URL flakes with DeviceConfigRule"
Remi NGUYEN VAN   authored and   Gerrit Code Review   commited 2022-06-20 08:29:10 +00:00
39e121cc88
Mark EthernetManagerTest as @ConnectivityModuleTest
The test will fail on T without an updated connectivity module, as it
uses new behavior implemented by a newer module version, such as
TestNetworkManager#createTapInterface(boolean, boolean).

Bug: 236558929
Change-Id: Ia74a31c8f7aabb4aae8eead5bba9f31cb7f2dd8d
Test: atest EthernetManagerTest

Remi NGUYEN VAN   commited 2022-06-20 06:55:56 +00:00
63ce27dd8d
adjust for newly added bpf map/prog definition fields in T+ am: b95db28080
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2128740

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

Maciej Żenczykowski   authored and   Automerger Merge Worker   commited 2022-06-20 04:48:04 +00:00
29287c5b75
netd bpf program - use finer grained selinux privs, part 1 am: cae181d777
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2130014

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

Maciej Żenczykowski   authored and   Automerger Merge Worker   commited 2022-06-19 16:21:59 +00:00
0ad82ccf15
Revert "switch netd.o to BpfLoader v0.18 file format" am: b0adaec487
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2130613

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

Maciej Żenczykowski   authored and   Automerger Merge Worker   commited 2022-06-19 10:38:01 +00:00
bcce8d5f57
switch netd.o to BpfLoader v0.18 file format am: 1c52aa12e8
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2130013

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

Maciej Żenczykowski   authored and   Automerger Merge Worker   commited 2022-06-19 02:00:39 +00:00
c3a4e0eaa9
adjust for newly added bpf map/prog definition fields in T+
This is needed due to BpfLoader v0.18 supporting more
functionality and thus bpf code compilation by default using
larger structs than it did during S.

Bug: 218408035
Test: booted on cuttlefish, atest CtsNativeNetTestCases
OBSigned-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I0a37e59760fb0b55e6d6a6d12d5fd40106accd55

Maciej Żenczykowski   commited 2022-06-18 19:00:19 -07:00
b95db28080
netd bpf program - use finer grained selinux privs, part 1
Make use of new BpfLoader functionality: per-map/program selinux context
to further restrict access to mainline module shipped bpf maps and programs.

Bug: 218408035
Test: booted on cuttlefish, TreeHugger
Change-Id: Iaa33754aaca8bfafef6539abfbdd30b4cdfc4727

Maciej Żenczykowski   commited 2022-06-18 18:59:12 -07:00
cae181d777
Revert "switch netd.o to BpfLoader v0.18 file format"
This reverts the previous commit.

This is no longer required as v0.18 is now the default.

Test: Treehugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I9331f27cf20e7932f6ef0e3829c27b6684dece59

Maciej Żenczykowski   commited 2022-06-17 16:13:56 -07:00
b0adaec487
switch netd.o to BpfLoader v0.18 file format
This is a temporary thing for testing with framework/libs/net patch
that adds checks for V18 define.

This is very short term and will be reverted in the next topic,
that will make v0.18 the default.

Bug: 218408035
Test: booted on cuttlefish
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I22c414ebc64201db60eb872e0da0fea6c65eaede

Maciej Żenczykowski   commited 2022-06-17 16:13:56 -07:00
1c52aa12e8
Merge "Add unit tests for IKEv2 VPN setup and MOBIKE" am: 554eb0699c
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2124749

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

Yan Yan   authored and   Automerger Merge Worker   commited 2022-06-17 20:15:13 +00:00
6e762ca922
Merge "Send callback if ip provisioning is interrupted" am: 7d5aae1a55
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2123881

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

James Mattis   authored and   Automerger Merge Worker   commited 2022-06-17 20:13:18 +00:00
6775e2eaea
Merge "Don't make an interface default if it has defined capabilities." am: 81f162992e
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2123900

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

Lorenzo Colitti   authored and   Automerger Merge Worker   commited 2022-06-17 20:13:08 +00:00
2318461b6b
Merge "Remove unused functions in TrafficController" am: ea95231d63
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2128997

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

Motomu Utsumi   authored and   Automerger Merge Worker   commited 2022-06-17 20:12:59 +00:00
1fffc1d842
Merge "Use 'cmd package list packages' to get the app uid." am: d7054da22b
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2128505

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

Sudheer Shanka   authored and   Automerger Merge Worker   commited 2022-06-17 20:12:49 +00:00
19fb698c8d
Merge changes I70384830,Ie97c2611,I7064edda,I290136b4,Ide697f65, ... am: bbae90476d
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2120118

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

Patrick Rohr   authored and   Automerger Merge Worker   commited 2022-06-17 20:12:20 +00:00
00482b7687
Merge "Add jarjar rules generator" am: 49d6b5d80b
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2103112

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

Remi NGUYEN VAN   authored and   Automerger Merge Worker   commited 2022-06-17 20:11:59 +00:00
3b141d767d
Merge "switch netd_configuration_map from hash map to array" am: a899aa253a
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2128739

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

Maciej Żenczykowski   authored and   Automerger Merge Worker   commited 2022-06-17 20:10:36 +00:00
f1375d8902
Merge "verify CLAT_MARK matches aidl constant." am: 3b4612b15a
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2128508

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

Treehugger Robot   authored and   Automerger Merge Worker   commited 2022-06-17 19:20:43 +00:00
2cbff5df20
Merge "Add unit tests for IKEv2 VPN setup and MOBIKE"
Yan Yan   authored and   Gerrit Code Review   commited 2022-06-17 17:53:59 +00:00
554eb0699c
Merge "Send callback if ip provisioning is interrupted"
James Mattis   authored and   Gerrit Code Review   commited 2022-06-17 15:20:26 +00:00
7d5aae1a55
Merge "Don't make an interface default if it has defined capabilities."
Lorenzo Colitti   authored and   Gerrit Code Review   commited 2022-06-17 06:34:34 +00:00
81f162992e
Merge "Remove unused functions in TrafficController"
Motomu Utsumi   authored and   Gerrit Code Review   commited 2022-06-17 02:38:57 +00:00
ea95231d63
Merge "Use 'cmd package list packages' to get the app uid."
Sudheer Shanka   authored and   Gerrit Code Review   commited 2022-06-17 02:12:01 +00:00
d7054da22b
Use 'cmd package list packages' to get the app uid.
Bug: 236278861
Test: atest ./tests/cts/hostside/src/com/android/cts/net/HostsideRestrictBackgroundNetworkTests.java#testDataSaverMode_reinstall
Change-Id: Ie68a3a26a5b3e67d4c8224ca53b3b28de6b317e8
Merged-In: Ie68a3a26a5b3e67d4c8224ca53b3b28de6b317e8

Sudheer Shanka   commited 2022-06-17 02:11:53 +00:00
3a398f91b3
Merge changes I70384830,Ie97c2611,I7064edda,I290136b4,Ide697f65, ...
* changes:
  ethernet: add test that covers link up / down behavior
  ethernet: add updateConfiguration support to EthernetManagerTest
  ethernet: add support for enable/disableInterface in tests
  ethernet: clean up HandlerExecutor usage in test
  ethernet: address test review comments
  ethernet: get MTU size directly from TestNetworkInterface

Patrick Rohr   authored and   Gerrit Code Review   commited 2022-06-17 01:54:47 +00:00
bbae90476d
Merge "Add jarjar rules generator"
Remi NGUYEN VAN   authored and   Gerrit Code Review   commited 2022-06-17 01:09:11 +00:00
49d6b5d80b
Add unit tests for IKEv2 VPN setup and MOBIKE
Add unit tests for IKEv2 VPN setup and handling network change.

Bug: 192077544
Test: atest VpnTest (new tests)
Change-Id: Idd13a3ae57a521901c576bdd33ca0170e94be048

Yan Yan   commited 2022-06-17 00:14:32 +00:00
4b0e4b1f17
Merge "switch netd_configuration_map from hash map to array"
Maciej Żenczykowski   authored and   Gerrit Code Review   commited 2022-06-16 23:54:15 +00:00
a899aa253a
Merge "verify CLAT_MARK matches aidl constant."
Treehugger Robot   authored and   Gerrit Code Review   commited 2022-06-16 23:08:41 +00:00
3b4612b15a
switch netd_configuration_map from hash map to array
This eliminates the need for netd_updatable BpfHandler.cpp
to initialize the hash map with a zero.

On startup the map will be freshly initialized and thus zero.

On restart it might not be empty, but it doesn't matter to netd.
Furthermore the mainline component of the system server will
re-initialize it again anyway:
see service/native/TrafficController.cpp initMaps()

This does remove the ability to call deleteValue on a key,
since that would always return -EINVAL, but since we don't
currently do that, that's really a feature.

(It does suggest though that we should have a BpfMapNonNullable
 class which is writeable, but without a deleteValue() function)

Additionally BpfMap arrays are more efficient for the kernel bpf jit
compiler, as - on newer kernels - it can optimize the read/write
into a simple memory access (as opposed to a bpf helper call).

Before:
  $ adb shell ls -l /sys/fs/bpf/netd_shared/map_netd_configuration_map
  -rw-rw---- 1 root net_bw_acct 0 2022-06-11 08:20 /sys/fs/bpf/netd_shared/ map_netd_configuration_map

After:
  $ adbz shell ls -l /sys/fs/bpf/netd_shared/map_netd_configuration_map
  -r--rw---- 1 root net_bw_acct 0 2022-06-16 15:03 /sys/fs/bpf/netd_shared/map_netd_configuration_map

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

Maciej Żenczykowski   commited 2022-06-16 22:53:42 +00:00
b10e055f4b
verify CLAT_MARK matches aidl constant.
Bug: 235778483
Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: Ife3ad35b2e5451727a3795a0e78dd820293c0eae

Maciej Żenczykowski   commited 2022-06-16 21:39:32 +00:00
ce9108f01a
[automerger skipped] Merge "Merge Android 12 QPR 3" am: 4cea149d66 -s ours
am skip reason: Merged-In I8d79f3a4c2de564e193d41aae1ff72ba9b12114d with SHA-1 2418c8745f is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2125888

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

Xin Li   authored and   Automerger Merge Worker   commited 2022-06-16 19:58:16 +00:00
9e72989503
[automerger skipped] Merge Android 12 QPR 3 am: 4e0c4750a7 -s ours
am skip reason: Merged-In I8d79f3a4c2de564e193d41aae1ff72ba9b12114d with SHA-1 2418c8745f is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2125888

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

Xin Li   authored and   Automerger Merge Worker   commited 2022-06-16 19:57:04 +00:00
27e7610cc5
ethernet: add test that covers link up / down behavior
Test: atest EthernetManagerTest
Change-Id: I703848309ffbe3993bdcd9666def4a64039f905f

Patrick Rohr   commited 2022-06-16 12:23:22 -07:00
5cfb761d6c
ethernet: add updateConfiguration support to EthernetManagerTest
Test: m -- test only change
Change-Id: Ie97c2611b45d97ca504e6b536ae957d442b314ae

Patrick Rohr   commited 2022-06-16 12:19:50 -07:00
7312d3e0d6
ethernet: add support for enable/disableInterface in tests
Adds an outcome receiver and wraps the EthernetManager#enableInterface
and EthernetManager#disableInterface APIs.

Test: m -- test only change
Change-Id: I7064edda3ebbdd91e2bf28651fdf85b9a7cf2134

Patrick Rohr   commited 2022-06-16 12:14:17 -07:00
901ff96210
ethernet: clean up HandlerExecutor usage in test
Test: atest EthernetManagerTest
Change-Id: I290136b4628e6ee7756772faa477467b04aade2e

Patrick Rohr   commited 2022-06-16 12:14:15 -07:00
7083beb088
Merge "Merge Android 12 QPR 3"
Xin Li   authored and   Gerrit Code Review   commited 2022-06-16 18:51:58 +00:00
4cea149d66
ethernet: address test review comments
Addresses open comments from aosp/2101321.

Test: atest EthernetManagerTest
Bug: 197548738
Change-Id: Ide697f65a2be977212ecdbdf753645b84b1d7634

Patrick Rohr   commited 2022-06-16 11:15:31 -07:00
8b9bea667b
ethernet: get MTU size directly from TestNetworkInterface
Test: atest EthernetManagerTest
Change-Id: Ic97e3eeb7518d869702247c77061c329eb48b637

Patrick Rohr   commited 2022-06-16 11:15:31 -07:00
a8d129b1a5
Send callback if ip provisioning is interrupted
A callback is expected to be sent on either success or failure when the
EthernetManager#updateConfiguration API is called.

Currently, if this API is called for an active interface and marked
restricted, after the IP provisioning process is started in
EthernetNetworkFactory, the interface will then processe all the
onNetworkUneeded requests for the newly restricted network. Assuming no
apps have requests for this particular network or restricted networks,
the network will be stopped once the outstanding network request count
reaches zero.

If provisioning hasn't completed yet for the original
updateConfiguration call, the original callback will be cleared out on
stop and will never notify the original caller of
EthernetManager#updateConfiguration whose call was aborted.

Bug: 235907515
Test: eth unit and cts tests
Change-Id: I91359272c07e090039049370ba9f438546fce3ad

James Mattis   commited 2022-06-16 08:10:20 -07:00
265eba982d
Remove unused functions in TrafficController
addInterface and hasUpdateDeviceStatsPermission are not used

Test: m & flush & boot
Bug: 217624062
Change-Id: I8a0f84f607a4f35512bc72e732df8f689b8ed1c9

Motomu Utsumi   commited 2022-06-16 09:13:46 +00:00
bd94efc14a
Merge "move XtBpfProgLocations.h into a new header library" am: 7f0bdd3bfe
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2127472

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

Lorenzo Colitti   authored and   Automerger Merge Worker   commited 2022-06-16 03:42:37 +00:00
e5ec885972
Merge "move XtBpfProgLocations.h into a new header library"
Lorenzo Colitti   authored and   Gerrit Code Review   commited 2022-06-16 03:18:20 +00:00
7f0bdd3bfe
Merge changes Ic6ff7a3d,Iff9b9792 am: 5d787feef0
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2110087

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

Motomu Utsumi   authored and   Automerger Merge Worker   commited 2022-06-16 01:52:09 +00:00
78df805366
Merge changes Ic6ff7a3d,Iff9b9792
* changes:
  Refactor code and improve tests for VPN filtering
  Remove LOCKDOWN from FirewallChain IntDef

Motomu Utsumi   authored and   Gerrit Code Review   commited 2022-06-16 01:32:20 +00:00
5d787feef0