Commit Graph

9856 Commits

Author SHA1 Message Date
Maciej Żenczykowski
aedd2eacd8 ebpf offload - rename PUNT/DROP to TC_PUNT/TC_DROP am: e982f091e1 am: 4248054e08
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1591369

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie259ca96bd3e0e693cda96c89825675f0a2879b0
2021-02-18 10:24:50 +00:00
Maciej Żenczykowski
4248054e08 ebpf offload - rename PUNT/DROP to TC_PUNT/TC_DROP am: e982f091e1
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1591369

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8c5f65f0603b131382f66510c8e1f7ed113312fe
2021-02-18 10:10:49 +00:00
Maciej Żenczykowski
2ef44d9cef ebpf offload - add support for tethering of ipv4 udp am: e4a726a5c6 am: 1f6bed0155
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1591368

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib22a34dd4c0f1c072ccb2120eaeda51da79a44a3
2021-02-18 10:10:05 +00:00
Maciej Żenczykowski
1f6bed0155 ebpf offload - add support for tethering of ipv4 udp am: e4a726a5c6
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1591368

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1d12eca24c0041a3916ca8110f7ac54f9474560b
2021-02-18 09:24:53 +00:00
Maciej Żenczykowski
63a3a118b9 Merge "ebpf offload - do L4 header present check earlier" am: 2c0edb112f am: 9b833afa0a
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1591367

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ida5efa2217eb8f25eb4a7a7b73b783aa56469e60
2021-02-18 07:52:08 +00:00
Maciej Żenczykowski
9b833afa0a Merge "ebpf offload - do L4 header present check earlier" am: 2c0edb112f
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1591367

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I154915d8db2f7efe6f12ce311d456d0cce59c0c1
2021-02-18 07:20:12 +00:00
Maciej Żenczykowski
e982f091e1 ebpf offload - rename PUNT/DROP to TC_PUNT/TC_DROP
because it is not appropriate for use in XDP programs

Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: Ibd5dac9676bae7aa5f10fbcfd777291f72bec819
2021-02-18 06:40:33 +00:00
Maciej Żenczykowski
e4a726a5c6 ebpf offload - add support for tethering of ipv4 udp
Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I6229e33cb219e9acd14f5b880cfa2ea0a34442f4
2021-02-18 06:38:36 +00:00
Maciej Żenczykowski
2c0edb112f Merge "ebpf offload - do L4 header present check earlier" 2021-02-18 06:24:39 +00:00
Maciej Żenczykowski
82ee26be75 ebpf offload - do L4 header present check earlier
and more importantly unconditionally.  This requires less effort
on the part of the in-kernel bpf verifier.

Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: Ibaa94bf096fc81c4d984dfabf515131b1c81ef09
2021-02-18 06:23:32 +00:00
Remi NGUYEN VAN
c9877f1959 Merge "Skip NetworkAgentTest via its runner on R-" am: 561c31906e am: 22bcc4a1cb
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1553861

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I014792c6132eedd5d0785c46608da76752b3cac3
2021-02-18 02:17:22 +00:00
Remi NGUYEN VAN
22bcc4a1cb Merge "Skip NetworkAgentTest via its runner on R-" am: 561c31906e
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1553861

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8e6b9705d60c173503812e07cc19b1ec64d12731
2021-02-18 01:50:28 +00:00
Remi NGUYEN VAN
561c31906e Merge "Skip NetworkAgentTest via its runner on R-" 2021-02-18 01:30:58 +00:00
Maciej Żenczykowski
6224c0e30e offload ebpf - introduce 4.14+ ipv4 forwarding programs am: 36867351ec am: f335d68cb8
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1588019

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie736bc216988be768dad0f7229fbc51f4d7cc40e
2021-02-16 08:20:04 +00:00
Maciej Żenczykowski
f335d68cb8 offload ebpf - introduce 4.14+ ipv4 forwarding programs am: 36867351ec
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1588019

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I79681916c7fa60d76a1721d52a08a7f2b8e22a46
2021-02-16 07:42:14 +00:00
Maciej Żenczykowski
36867351ec offload ebpf - introduce 4.14+ ipv4 forwarding programs
We've backported the necessary support to all 4.14+ ACK kernels,
but we can't actually enforce that these changes will be picked
up by all devices.  Thus we can only make the full featured
implementations optional on [4.14..5.8) kernels, with a tcp-only
version for those 4.14+ devices where the full featured version
fails to load.

Note: there's still a fair bit of implementation work left
in the do_forward4() function itself.  This is really just
the skeleton.

Test: atest, TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: If78123e00d55a77f2ecd7da1547581797e23f9b2
2021-02-16 05:48:55 +00:00
Maciej Żenczykowski
be444669e3 Merge "offload ebpf - do_forward4() - introduce updatetime argument" am: d74918c6d2 am: 623479f329
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1588018

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I696c7f791dc805b71b13c64cc442675f45803ce9
2021-02-15 13:33:32 +00:00
Maciej Żenczykowski
623479f329 Merge "offload ebpf - do_forward4() - introduce updatetime argument" am: d74918c6d2
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1588018

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I35508aa4baa1bdce95bdc2543d60f14eb784e4e4
2021-02-15 13:02:44 +00:00
Maciej Żenczykowski
d74918c6d2 Merge "offload ebpf - do_forward4() - introduce updatetime argument" 2021-02-15 12:35:16 +00:00
Maciej Żenczykowski
aefa0950b5 offload ebpf - do_forward4() - introduce updatetime argument
This will facilitate providing a tcp-only version of the programs
which due to TCP's very long timeouts will not need to use the
Linux 5.8+ bpf_ktime_get_boot_ns() helpers.

Test: atest, TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I1e49b6758d3754782ac6f8820e0c15aa20e4c61d
2021-02-15 12:33:01 +00:00
Remi NGUYEN VAN
002dd263d7 Merge changes from topic "revert-1579872-vcn07-WIQQMUVMTJ" am: edc9b873d3 am: e051a098ab
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1585571

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifc013a17bb6750c613250d992a0d3d64bed5ff21
2021-02-15 12:20:34 +00:00
Remi NGUYEN VAN
e4ebb44543 Revert "Address comments on aosp/1550755" am: f77bed6d95 am: 01218f193f
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1585570

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2882284d1a6c65da2e5e0ce0ef30c469b36229ec
2021-02-15 12:20:32 +00:00
Maciej Żenczykowski
5d6f744551 tethering offload ebpf - lower requirement from 5.9 to 5.8 am: b0ac41f0cd am: c456856971
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1588017

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2a6be5ac4bbc887ef11b4fc8110115e11e947fa3
2021-02-15 12:20:22 +00:00
Remi NGUYEN VAN
e051a098ab Merge changes from topic "revert-1579872-vcn07-WIQQMUVMTJ" am: edc9b873d3
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1585571

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I099f467447b6773aca92c10699ba845438976fb7
2021-02-15 11:52:00 +00:00
Remi NGUYEN VAN
01218f193f Revert "Address comments on aosp/1550755" am: f77bed6d95
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1585570

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4fc7b281dc3fa7be8c4a5979b1571d2652c29870
2021-02-15 11:51:59 +00:00
Maciej Żenczykowski
c456856971 tethering offload ebpf - lower requirement from 5.9 to 5.8 am: b0ac41f0cd
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1588017

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8d8fecaab82002ff4e6eee14adff9d50ea585ea9
2021-02-15 11:51:41 +00:00
Remi NGUYEN VAN
edc9b873d3 Merge changes from topic "revert-1579872-vcn07-WIQQMUVMTJ"
* changes:
  Revert "[VCN07.1] Add test for bypassing VCN for non-internet re..."
  Revert "Address comments on aosp/1550755"
2021-02-15 11:39:25 +00:00
Maciej Żenczykowski
b0ac41f0cd tethering offload ebpf - lower requirement from 5.9 to 5.8
As this is the actual version that is required,
ie. the version that supports bpf_ktime_get_boot_ns() helper.

Test: atest, TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I2ea4830597a0bed53950a5d0c483a47208959f35
2021-02-14 22:24:34 -08:00
Remi NGUYEN VAN
075da46909 Revert "[VCN07.1] Add test for bypassing VCN for non-internet re..."
Revert "[VCN07] Bypass VCN for non-internet app accessible cellu..."

Revert submission 1579872-vcn07

Reason for revert: Possible culprit for b/179768816, broken ConnectivityControllerTest
Reverted Changes:
Id09b19c13:Address comments on aosp/1550755
I245bd69e0:[VCN07.1] Add test for bypassing VCN for non-inter...
I9936894b9:[VCN07] Bypass VCN for non-internet app accessible...

Change-Id: I7902a221c8597427e48d3e32fa5668b9c1a47420
2021-02-12 06:28:17 +00:00
Remi NGUYEN VAN
f77bed6d95 Revert "Address comments on aosp/1550755"
Revert "[VCN07] Bypass VCN for non-internet app accessible cellu..."

Revert submission 1579872-vcn07

Reason for revert: Possible culprit for b/179768816, broken ConnectivityControllerTest
Reverted Changes:
Id09b19c13:Address comments on aosp/1550755
I245bd69e0:[VCN07.1] Add test for bypassing VCN for non-inter...
I9936894b9:[VCN07] Bypass VCN for non-internet app accessible...

Change-Id: I3fded28691e05a3dbf25bb7361c72acaa61b29c7
2021-02-12 06:27:44 +00:00
Lorenzo Colitti
531fa9e0cc Merge "Load JNI in all classes that have native methods." am: af97e51c01 am: ceafffa6c0
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1581528

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I21f1af4785d1ee540ba6dea8416c2538e60a9228
2021-02-12 05:49:17 +00:00
Treehugger Robot
55e1cc23c6 Merge "fix TetheringCoverageTests" am: 6fc8229f16 am: 31ce8ad94d
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1584755

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If61cbbe8729451b53aea976540d388868cdde01a
2021-02-12 05:48:49 +00:00
Lorenzo Colitti
c2717c6242 Merge changes I71a37663,Ib2010b38 am: fd710547b2 am: c241c0f4f3
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1583023

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idfc4f1cc18e5e535c35e6738e6a4322866c03a17
2021-02-12 05:47:56 +00:00
Lorenzo Colitti
ceafffa6c0 Merge "Load JNI in all classes that have native methods." am: af97e51c01
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1581528

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia1259c72d124f0d1310c147406026775682d2a7b
2021-02-12 05:25:23 +00:00
Treehugger Robot
31ce8ad94d Merge "fix TetheringCoverageTests" am: 6fc8229f16
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1584755

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I89847f05774cb37ec76fd57938d8bcf1e3a4f397
2021-02-12 05:24:52 +00:00
Lorenzo Colitti
c241c0f4f3 Merge changes I71a37663,Ib2010b38 am: fd710547b2
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1583023

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iefd7946816067ed9279f26e48d86934db54056ce
2021-02-12 05:17:01 +00:00
Lorenzo Colitti
af97e51c01 Merge "Load JNI in all classes that have native methods." 2021-02-12 03:19:00 +00:00
Treehugger Robot
6fc8229f16 Merge "fix TetheringCoverageTests" 2021-02-12 03:17:51 +00:00
Lorenzo Colitti
fd710547b2 Merge changes I71a37663,Ib2010b38
* changes:
  Improve testing of registerSystemDefaultNetworkCallback.
  Remove buggy ConnectivityManagerTest#ensureWifiConnected.
2021-02-12 02:45:02 +00:00
Maciej Żenczykowski
c92e8ce636 fix TetheringCoverageTests
Test: atest TetheringCoverageTests now passes, TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I0d83de14784f323400a83ce282cae1a3e7b4b396
2021-02-11 16:06:46 -08:00
Daulet Zhanguzin
66d9e9aa2c Merge "Run Connectivity cts tests against unbundled version of BouncyCastle" am: e1f96f3c35 am: c9bee74abd
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1580048

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ida4fef6fdc927a2b9a7547bd1eaf509fa725b0aa
2021-02-11 15:53:23 +00:00
Daulet Zhanguzin
c9bee74abd Merge "Run Connectivity cts tests against unbundled version of BouncyCastle" am: e1f96f3c35
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1580048

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibbd2aad92bb7fe3fd09de99d82dbb1178daef43c
2021-02-11 15:05:16 +00:00
Daulet Zhanguzin
e1f96f3c35 Merge "Run Connectivity cts tests against unbundled version of BouncyCastle" 2021-02-11 14:44:06 +00:00
Sudheer Shanka
809cbfe9ff Update the way we change meteredness of cellular networks in tests. am: 37c10a2252 am: 4fbac43be8
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1582844

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3e97dc0ccf37c39df9fee74bee8d04f5d226af24
2021-02-10 17:04:26 +00:00
Sudheer Shanka
4fbac43be8 Update the way we change meteredness of cellular networks in tests. am: 37c10a2252
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1582844

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id7eb095710da17da8a6e7785051029d81a64ac7d
2021-02-10 16:42:32 +00:00
Sudheer Shanka
37c10a2252 Update the way we change meteredness of cellular networks in tests.
SubscriptionManager.setSubscriptionOverrideUnmetered() has been updated
to add NET_CAPABILITY_TEMPORARILY_NOT_METERED instead of
NET_CAPABILITY_NOT_METERED. So, we can't rely on that for changing the
meteredness.

Bug: 179664982
Test: atest tests/cts/hostside/src/com/android/cts/net/HostsideRestrictBackgroundNetworkTests.java
Test: atest tests/cts/hostside/src/com/android/cts/net/HostsideNetworkCallbackTests.java
Change-Id: I4163b2f9c6f80b4e639d9977ef7e2b444ab12e81
Merged-In: I4163b2f9c6f80b4e639d9977ef7e2b444ab12e81
2021-02-10 14:05:09 +00:00
Lorenzo Colitti
baea700554 Improve testing of registerSystemDefaultNetworkCallback.
Addresses comments on aosp/1570840.

Bug: 179774433
Test: test-only change
Change-Id: I71a376631503e5b50ada3f7bb3dca6dbae9ebc27
2021-02-10 22:41:48 +09:00
Lorenzo Colitti
f5d2df925e Merge changes from topics "vpnmove-getconnectionowneruid", "vpnmove-systemdefaultcallback", "vpnmove-vpntransportinfo" am: 43b96c711b am: 2d109b3909
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1574260

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id8822fe3e2e2e2a0c3a290a61df28cb92a63f029
2021-02-10 07:20:31 +00:00
Lorenzo Colitti
eb54554df9 Add CTS coverage for VpnTransportInfo. am: e9aeb3c1c5 am: fc5b95502b
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1570841

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I46ac659c13f40d59a304bfd2931e0306d5704c2c
2021-02-10 07:20:30 +00:00
Lorenzo Colitti
c49cba3526 Add test coverage for registerSystemDefaultNetworkCallback. am: 1e5cdd3187 am: 1f40096f3e
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1570840

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3ece3d8ce25be1d024376539ba4c9c17e9d15d7b
2021-02-10 07:20:26 +00:00