Commit Graph

11059 Commits

Author SHA1 Message Date
Maciej Żenczykowski
90bb5cd0cf Merge changes from topic "v6_tether" am: 73dc23c4ea am: 18414d85d0 am: fbf8c09a0f
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1554638

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2815814e18eed823915418c65a8d6e1b1a877353
2021-01-21 03:07:42 +00:00
Maciej Żenczykowski
fbf8c09a0f Merge changes from topic "v6_tether" am: 73dc23c4ea am: 18414d85d0
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1554638

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I68b0ee054e4ea54644bd1ebc67a26a9a20f046a6
2021-01-21 02:10:29 +00:00
Maciej Żenczykowski
18414d85d0 Merge changes from topic "v6_tether" am: 73dc23c4ea
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1554638

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I33fa64e3241b3c99e0f98d3580ee3df61c2b0810
2021-01-21 01:48:21 +00:00
Maciej Żenczykowski
73dc23c4ea Merge changes from topic "v6_tether"
* changes:
  switch bpf programs to group network_stack
  Add tethering programs for upstream.
2021-01-21 00:50:47 +00:00
Maciej Żenczykowski
5b00fbd618 switch bpf programs to group network_stack
Test: atest, TreeHugger, the programs load
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I3ab4383978acb2681a0fd5aee2700d12c62c2769
2021-01-20 18:09:32 +00:00
Maciej Żenczykowski
bca0c85822 Add tethering programs for upstream.
Test: atest, TreeHugger, the programs load
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I26bc60c1066ed7317bda48ec3fa701c36e0b46dd
2021-01-20 18:05:52 +00:00
Maciej Żenczykowski
0006c9febf refactor: continued am: a0e2c0445d am: 009cd35124 am: 0c931c6c54
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1553320

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I308465d41d3c43203583f0324bfb08b85f5ddfd8
2021-01-20 16:39:54 +00:00
Maciej Żenczykowski
0c931c6c54 refactor: continued am: a0e2c0445d am: 009cd35124
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1553320

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I36014e42844a2ca7608354742adc4a0e05001205
2021-01-20 16:20:35 +00:00
Maciej Żenczykowski
009cd35124 refactor: continued am: a0e2c0445d
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1553320

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I35f19f1b378271907788b41631e864886bdf4e8a
2021-01-20 15:42:54 +00:00
Maciej Żenczykowski
79b7996f1a refactor: TetherIngress becomes TetherDownstream6 (and friends) am: 770e0a7a8f am: 14583198a0 am: 7a38a7d727
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1554238

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3aaf8738cd9e7c9bce8dcf9a82baafd9ca056ae9
2021-01-20 12:52:25 +00:00
Maciej Żenczykowski
7a38a7d727 refactor: TetherIngress becomes TetherDownstream6 (and friends) am: 770e0a7a8f am: 14583198a0
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1554238

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I377e4c9f63f28f5b4918da29a36719f566359e2a
2021-01-20 11:54:03 +00:00
Maciej Żenczykowski
a0e2c0445d refactor: continued
Test: builds, atest, TreeHugger
  git grep 'makeIngressKey|makeIngressValue|BpfIngressMap|TETHER_INGRESS_FS_PATH'
  no longer finds anything
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I27200d33cbc4ea2094b18e05bf93ab54c564da0b
2021-01-20 11:34:48 +00:00
Maciej Żenczykowski
14583198a0 refactor: TetherIngress becomes TetherDownstream6 (and friends) am: 770e0a7a8f
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1554238

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I70ec2e2e05ce4b2d10c62409fae2f98776c2d75e
2021-01-20 11:25:20 +00:00
Maciej Żenczykowski
8265a60a09 Merge "BpfMapTest - adjust paths for bpfloader change" am: 3bf519f279 am: 36b406bbfc am: 78f0d11054
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1554235

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9f822b32319f164b1b0624186331d710393b5ae2
2021-01-20 08:15:29 +00:00
Treehugger Robot
812fcb9237 Merge "add a test xdp program that drops all IPv4/UDP packets" am: d4bcf54678 am: 7c0b1b6149 am: 590d3026d9
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1554236

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5b5b9ef992be20fa56d497929bf387f14be44f93
2021-01-20 08:15:21 +00:00
Maciej Żenczykowski
0feccef671 switch from SEC() to DEFINE_BPF_PROG() am: 6b7829f2c1 am: 6258dc0071 am: fc3c4b4dd0
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1554237

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I661fdb8f85f6986107931e130aaec711a66c36f2
2021-01-20 08:15:11 +00:00
Maciej Żenczykowski
78f0d11054 Merge "BpfMapTest - adjust paths for bpfloader change" am: 3bf519f279 am: 36b406bbfc
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1554235

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7eca325098b8132d34e904e08ce3a9a95bee4689
2021-01-20 07:55:00 +00:00
Treehugger Robot
590d3026d9 Merge "add a test xdp program that drops all IPv4/UDP packets" am: d4bcf54678 am: 7c0b1b6149
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1554236

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ife1f1f45cd3a871e0227e627964c772251a0788b
2021-01-20 07:54:54 +00:00
Maciej Żenczykowski
fc3c4b4dd0 switch from SEC() to DEFINE_BPF_PROG() am: 6b7829f2c1 am: 6258dc0071
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1554237

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0cd270087fc86f39d6c59eb3c3f0a7246c490017
2021-01-20 07:54:49 +00:00
Maciej Żenczykowski
36b406bbfc Merge "BpfMapTest - adjust paths for bpfloader change" am: 3bf519f279
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1554235

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I28dc39e671e01194c49f19056ad13027386afd07
2021-01-20 07:28:46 +00:00
Treehugger Robot
7c0b1b6149 Merge "add a test xdp program that drops all IPv4/UDP packets" am: d4bcf54678
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1554236

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I06212ffe6ba8c8e95fe880d2ba48d42109836ac1
2021-01-20 07:28:35 +00:00
Maciej Żenczykowski
6258dc0071 switch from SEC() to DEFINE_BPF_PROG() am: 6b7829f2c1
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1554237

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id9c69c152617c4e9cdc96b7ce0bb21a5832f6aa9
2021-01-20 07:28:30 +00:00
Maciej Żenczykowski
770e0a7a8f refactor: TetherIngress becomes TetherDownstream6 (and friends)
Generated via:
  #!/bin/bash

  do_replace() {
    pushd "$1" >/dev/null
    shift
    git grep "$1" | cut -d: -f1 | sort -u | while read f; do
      sed -i -r "s@$1@$2@g" "${f}"
      git add "${f}"
    done
    popd >/dev/null
  }

  replace() {
    do_replace packages/modules/Connectivity/Tethering "$@"
    do_replace system/netd "$@"
  }

  do_reset() {
    pushd "$1" >/dev/null
    git rhh
    popd >/dev/null
  }

  main() {
    do_reset packages/modules/Connectivity/Tethering
    do_reset system/netd

    replace TetherIngressKey TetherDownstream6Key
    replace TetherIngressValue TetherDownstream6Value

    pushd packages/modules/Connectivity/Tethering/src/com/android/networkstack/tethering >/dev/null
    git mv TetherIngressKey.java TetherDownstream6Key.java
    git mv TetherIngressValue.java TetherDownstream6Value.java
    popd >/dev/null

    replace TETHER_INGRESS_PROG TETHER_DOWNSTREAM6_TC_PROG
    replace ingress_tether tether_downstream6
    replace ingress/tether_ tether_downstream6_
    replace TETHER_INGRESS_MAP TETHER_DOWNSTREAM6_MAP
    replace tether_ingress_map tether_downstream6_map

    replace getTetherIngressMapFd getTetherDownstream6MapFd
    replace getTetherIngressProgFd getTetherDownstream6TcProgFd

    replace mBpfIngressMap mBpfDownstream6Map
    replace bpfIngressMap bpfDownstream6Map
    replace printIngressMap printDownstream6Map
    replace 'BPF ingress map' 'BPF downstream ipv6 map'
  }

  main "$@"; exit

Followed by:
  cd system/netd
  # change regexp in tests/binder_test.cpp:3374
  git add tests/binder_test.cpp

(and whitespace adjustments to prevent lines from going over 100 characters)

Afterwards we have:
  $ adbz shell ls /sys/fs/bpf/tethering
  map_offload_tether_downstream6_map
  map_offload_tether_limit_map
  map_offload_tether_stats_map
  map_test_tether_downstream6_map
  prog_offload_schedcls_tether_downstream6_ether
  prog_offload_schedcls_tether_downstream6_rawip
  prog_test_xdp_drop_ipv4_udp_ether

Test: atest, TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: Ib04dc0c6e3d034461f3f84e09f6fa93a862e1bb2
2021-01-19 23:18:46 -08:00
Maciej Żenczykowski
3bf519f279 Merge "BpfMapTest - adjust paths for bpfloader change" 2021-01-20 07:12:35 +00:00
Treehugger Robot
d4bcf54678 Merge "add a test xdp program that drops all IPv4/UDP packets" 2021-01-20 06:42:51 +00:00
Maciej Żenczykowski
49e28da04b add maze to OWNERS am: b213e84170 am: 379f93bccc am: e63465feb6
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1554765

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I960000780ea69ccd375d9ae0dacb537c7d77bf46
2021-01-20 05:44:39 +00:00
Maciej Żenczykowski
e63465feb6 add maze to OWNERS am: b213e84170 am: 379f93bccc
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1554765

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2eaa1a091ec402fad8834f75fc2a5cc1759426ad
2021-01-20 05:30:31 +00:00
Sudheer Shanka
8c62546e9b Merge "Add tests to verify that Expedited jobs have network access." 2021-01-20 05:23:02 +00:00
Lorenzo Colitti
a0ef944e66 Merge changes Id87b88f6,I67dfba75 am: fab97c22b2 am: 68a007c616 am: 73d47c1b20
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1538841

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If4ab925309508d2bbdc5f4453aa6e5e047e91919
2021-01-20 05:21:54 +00:00
Maciej Żenczykowski
8c7cd343a4 add a test xdp program that drops all IPv4/UDP packets
Test: builds, boots, program present
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: Id5be48ec172366296929875856a3d17ecc87e84b
2021-01-20 05:20:05 +00:00
Maciej Żenczykowski
6b7829f2c1 switch from SEC() to DEFINE_BPF_PROG()
I keep on failing to find this using grep because it
doesn't match how all the other programs are defined,
so change it for consistency.

Test: builds, atest, TreeHugger
Signed-off-by: Maciej Żenczykowski<maze@google.com>
Change-Id: Ib61b375bef84d2b489080866b2411c84880e4ef2
2021-01-20 05:18:50 +00:00
Maciej Żenczykowski
7928fde758 BpfMapTest - adjust paths for bpfloader change
that puts tethering mainline module maps and programs
under /sys/fs/bpf/tethering

Test: builds, boots, atest, TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: If57e737168cefe9fe0fe180114c1d61918d20d21
2021-01-20 05:13:08 +00:00
Maciej Żenczykowski
379f93bccc add maze to OWNERS am: b213e84170
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1554765

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I26ff477217616a56db5747a00d6fa71b85e91b1b
2021-01-20 04:51:15 +00:00
Lorenzo Colitti
73d47c1b20 Merge changes Id87b88f6,I67dfba75 am: fab97c22b2 am: 68a007c616
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1538841

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id99e7f262ceef003a2aff69ccaa0881ae1ca7918
2021-01-20 04:06:03 +00:00
Lorenzo Colitti
68a007c616 Merge changes Id87b88f6,I67dfba75 am: fab97c22b2
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1538841

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I607c967a38d2400369d42ca5703edcacff61e351
2021-01-20 03:38:15 +00:00
Maciej Żenczykowski
b213e84170 add maze to OWNERS
since there's now bpf code in tethering portion of the codebase.

Test: N/A
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I679b7ba6d5fff49bad4fb2fe7d251875e4cb94b5
2021-01-19 18:31:52 -08:00
Lorenzo Colitti
fab97c22b2 Merge changes Id87b88f6,I67dfba75
* changes:
  [NFCT.TETHER.6] Migrate tetherOffloadGetAndClearStats from netd to mainline
  [NFCT.TETHER.5] Migrate tetherOffloadSetInterfaceQuota from netd to mainline
2021-01-20 02:19:14 +00:00
Sudheer Shanka
51691d6ab7 Add tests to verify that Expedited jobs have network access.
Bug: 177641226
Test: atest CtsHostsideNetworkTests:HostsideRestrictBackgroundNetworkTest
Ignore-AOSP-First: Expedited jobs are not available in AOSP yet
Change-Id: Idc0762093667d49f09d52050c47c29cbc55997e1
2021-01-19 12:16:14 -08:00
Nucca Chen
ab07e59707 Merge changes I969d6182,Ie73f7b4d am: 2668d4a0e2 am: d3e7c33b2e am: 33ee638bae
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1537801

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0d62905c33af794213ce419d309d953bafda94d9
2021-01-19 12:40:32 +00:00
Maciej Żenczykowski
4597b2e52e Merge "move bpf test map into a separate file" am: ab44322f9c am: e15c4e0281 am: 866a65d07c
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1554234

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2dce9aedb87226fffe2805968ba4f0e08545f896
2021-01-19 12:39:59 +00:00
Junyu Lai
1c8c29d048 Merge "Revert "[VCN06.1] Add CTS for request background network"" am: f555f4bca7 am: ca80fa4a1e am: 8503663e52
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1553865

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I30e50fbb696531098f6715025a41bcb0208c06fa
2021-01-19 12:39:27 +00:00
Nucca Chen
33ee638bae Merge changes I969d6182,Ie73f7b4d am: 2668d4a0e2 am: d3e7c33b2e
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1537801

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I586aa838949f55780d7cd80384d6f1c90a392c5e
2021-01-19 12:00:12 +00:00
Maciej Żenczykowski
866a65d07c Merge "move bpf test map into a separate file" am: ab44322f9c am: e15c4e0281
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1554234

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I92792b09a33e78a86ecaa96a70654a3bca181335
2021-01-19 12:00:00 +00:00
Junyu Lai
8503663e52 Merge "Revert "[VCN06.1] Add CTS for request background network"" am: f555f4bca7 am: ca80fa4a1e
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1553865

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I37e01d79431275c91b4eb51f62e701a9bcb64af1
2021-01-19 11:59:37 +00:00
Nucca Chen
d3e7c33b2e Merge changes I969d6182,Ie73f7b4d am: 2668d4a0e2
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1537801

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie425332418fd3cff8e58de9f553703ba67d87641
2021-01-19 11:38:32 +00:00
Maciej Żenczykowski
e15c4e0281 Merge "move bpf test map into a separate file" am: ab44322f9c
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1554234

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic714fbc7a1f61b29d4967b85415c00c2700df51b
2021-01-19 11:38:24 +00:00
Junyu Lai
ca80fa4a1e Merge "Revert "[VCN06.1] Add CTS for request background network"" am: f555f4bca7
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1553865

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iacfe73e36cc6fe4068291af7391612ae725606a1
2021-01-19 11:34:18 +00:00
Nucca Chen
2668d4a0e2 Merge changes I969d6182,Ie73f7b4d
* changes:
  [NFCT.TETHER.4] Migrate tetherOffloadRuleRemove from netd to mainline
  [NFCT.TETHER.3] Migrate tetherOffloadGetStats from netd to mainline
2021-01-19 11:29:22 +00:00
Maciej Żenczykowski
ab44322f9c Merge "move bpf test map into a separate file" 2021-01-19 11:25:13 +00:00
Junyu Lai
f555f4bca7 Merge "Revert "[VCN06.1] Add CTS for request background network"" 2021-01-19 10:24:47 +00:00