Commit graph

1786 commits

Author SHA1 Message Date
Maciej Żenczykowski
b3dcc14182 Make sure that BPFLOADER_VERSION >= COMPILE_FOR_BPFLOADER_VERSION
Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I3612460f81a210df0293c0a0f589c2d5a29f615b
2022-07-24 22:43:06 +00:00
Paul Lawrence
7fb8b546e3 Add fuse prog types to allowed prog types from system
Until fuse-bpf is upstreamed, the value BPF_PROG_TYPE_FUSE is
dynamically defined, so use BPF_PROG_TYPE_UNSPEC as a placeholder and read
the actual value from sys/fs/fuse

Bug: 202785178
Test: fuse bpf can be enabled successfully
Change-Id: I67d3ff45768b581a6b239e235edaa6e46a2f6fe0
2022-07-22 12:35:36 -07:00
Treehugger Robot
56d4d8f676 Merge "BpfLoader v0.28 - if (map.zero != 0) abort()" am: 15f1bf8928 am: 17080ca9da am: 91048037ac am: 38aa72f299
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2163056

Change-Id: I3ded5dd86555c1ee0d081f29c3a8769da43eaa31
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-22 01:19:58 +00:00
Treehugger Robot
38aa72f299 Merge "BpfLoader v0.28 - if (map.zero != 0) abort()" am: 15f1bf8928 am: 17080ca9da am: 91048037ac
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2163056

Change-Id: Ic401b605ce0b87f0b515a679980aa551d3f07aea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-22 00:57:05 +00:00
Treehugger Robot
91048037ac Merge "BpfLoader v0.28 - if (map.zero != 0) abort()" am: 15f1bf8928 am: 17080ca9da
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2163056

Change-Id: I652a8253d4f5663afd4cd88f5fa93bb06128eff0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-22 00:40:14 +00:00
Treehugger Robot
17080ca9da Merge "BpfLoader v0.28 - if (map.zero != 0) abort()" am: 15f1bf8928
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2163056

Change-Id: I8d17be218d724251195779e720ac29a47931583f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-22 00:14:37 +00:00
Treehugger Robot
15f1bf8928 Merge "BpfLoader v0.28 - if (map.zero != 0) abort()" 2022-07-21 23:52:07 +00:00
Ken Chen
ce9199c072 Merge "Rename time_in_state.o to timeInState.o" am: e516c5a9bc am: 6dc356bd4c am: c56a0e8043 am: c6ecd013b9
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2146829

Change-Id: I7cfba4c1e7caaeb195ae5029e6598a178b846754
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-21 23:34:31 +00:00
Ken Chen
c6ecd013b9 Merge "Rename time_in_state.o to timeInState.o" am: e516c5a9bc am: 6dc356bd4c am: c56a0e8043
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2146829

Change-Id: I31c3a7007304e5a4882c6e449c81a774c00508c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-21 23:18:57 +00:00
Ken Chen
c56a0e8043 Merge "Rename time_in_state.o to timeInState.o" am: e516c5a9bc am: 6dc356bd4c
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2146829

Change-Id: Ia168e7d1a5b7b8c3a8354ce05f3755e56279d7b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-21 22:56:22 +00:00
Ken Chen
6dc356bd4c Merge "Rename time_in_state.o to timeInState.o" am: e516c5a9bc
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2146829

Change-Id: Ie34ce0bfda1af2aed80fcbeb61635cb69706e7ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-21 22:21:39 +00:00
Ken Chen
e516c5a9bc Merge "Rename time_in_state.o to timeInState.o" 2022-07-21 13:43:50 +00:00
Maciej Żenczykowski
2a5d016061 BpfLoader v0.28 - if (map.zero != 0) abort()
This also effectively forces the 'struct bpf_map_def'
definition to include the zero field, and thus to have
the uid field at the new offset.

Bug: 239807354
Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I44dd740bda4cce4d8fcb04895ee7eb3d4c3300e4
2022-07-21 13:36:02 +00:00
Maciej Żenczykowski
93082e5156 abort() if neither tethering flag is present am: 2ab4dbe471 am: 549dfb3e06 am: 6bbcf7c827 am: f8f950209e
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2160696

Change-Id: I4eeea038215fa449ef01572c8390abd73c85ca4f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-21 08:02:08 +00:00
Maciej Żenczykowski
f8f950209e abort() if neither tethering flag is present am: 2ab4dbe471 am: 549dfb3e06 am: 6bbcf7c827
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2160696

Change-Id: Ica62f33d41cf19eadbafb2342388ed2f0c6ff3be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-21 07:17:16 +00:00
Maciej Żenczykowski
6bbcf7c827 abort() if neither tethering flag is present am: 2ab4dbe471 am: 549dfb3e06
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2160696

Change-Id: I95c1be156c723ccbdbd7f9df278601191b7166aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-21 06:50:47 +00:00
Maciej Żenczykowski
549dfb3e06 abort() if neither tethering flag is present am: 2ab4dbe471
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2160696

Change-Id: I8bbe036cd3fc378f66f242712e813c5febc125f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-21 06:33:52 +00:00
Maciej Żenczykowski
2ab4dbe471 abort() if neither tethering flag is present
Bug: 190523685
Bug: 236925089
Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I846aa9c823760909c24db805e044866c29108b79
2022-07-20 12:31:00 +00:00
Treehugger Robot
2db3b8ea02 Merge "Make system/bpf changes trigger connectivity CTS tests in presubmit" am: 0c2cfe7e5f am: 9ef90d6e3e am: 0997472fe3 am: adac83f963
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2160416

Change-Id: I713da7cf97d4b45a905ec3a9e87933719112d7d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-20 10:13:55 +00:00
Treehugger Robot
adac83f963 Merge "Make system/bpf changes trigger connectivity CTS tests in presubmit" am: 0c2cfe7e5f am: 9ef90d6e3e am: 0997472fe3
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2160416

Change-Id: I6b4df8ef72274357cdf00e9f8436fb006629baee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-20 09:49:45 +00:00
Treehugger Robot
0997472fe3 Merge "Make system/bpf changes trigger connectivity CTS tests in presubmit" am: 0c2cfe7e5f am: 9ef90d6e3e
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2160416

Change-Id: I2064885c1d7dceae37d46b1a5e19a89895bdac6a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-20 09:26:38 +00:00
Treehugger Robot
9ef90d6e3e Merge "Make system/bpf changes trigger connectivity CTS tests in presubmit" am: 0c2cfe7e5f
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2160416

Change-Id: I7e883a674bdbcf70a0371d67a96e8d98acfb0dad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-20 09:07:49 +00:00
Treehugger Robot
0c2cfe7e5f Merge "Make system/bpf changes trigger connectivity CTS tests in presubmit" 2022-07-20 08:36:45 +00:00
Junyu Lai
9c8909de2a Make system/bpf changes trigger connectivity CTS tests in presubmit
1. The TEST_MAPPING file should be inside bpf folder to be
   triggered on any system/bpf change.
2. It should include Connectivity module to run connectivity CTS
   tests on any change.

Test: TH
Fix: 235927729
Change-Id: I00149bf8a278853efdd2fcda4bcfb56398a73687
2022-07-20 11:23:08 +08:00
Maciej Żenczykowski
6cdcef1f4d BpfLoader v0.27 - support InProcessTethering am: 057ef34bb9 am: 9ea940c494 am: dabeb213f6 am: 4462ef86a9
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2154572

Change-Id: I22ee229f5d480631891bb7e8d1e97c9c6bdc7814
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-19 08:47:41 +00:00
Maciej Żenczykowski
4462ef86a9 BpfLoader v0.27 - support InProcessTethering am: 057ef34bb9 am: 9ea940c494 am: dabeb213f6
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2154572

Change-Id: I35c0c208cb02aaa088c56328c9bf6edaae3bb2ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-19 08:22:57 +00:00
Maciej Żenczykowski
dabeb213f6 BpfLoader v0.27 - support InProcessTethering am: 057ef34bb9 am: 9ea940c494
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2154572

Change-Id: I49d940797ac742b1f189a1d83a0e35049d2dd878
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-19 07:54:54 +00:00
Maciej Żenczykowski
9ea940c494 BpfLoader v0.27 - support InProcessTethering am: 057ef34bb9
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2154572

Change-Id: I9947c8d88d025b0bd4db98ad2dbac9cde862cb00
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-19 07:36:44 +00:00
Maciej Żenczykowski
057ef34bb9 BpfLoader v0.27 - support InProcessTethering
detect InProcessTethering and adjust /sys/fs/bpf/tethering selinux context

on aosp_cf_x86_go_phone-userdebug

$ adbz shell dumpsys tethering | egrep 'Bpf shim:'
    Bpf shim: mBpfDownstream6Map{OK}, mBpfUpstream6Map{OK}, mBpfDownstream4Map{OK}, mBpfUpstream4Map{OK}, mBpfStatsMap{OK}, mBpfLimitMap{OK}, mBpfDevMap{OK}

unfortunately all 24 TetheringPrivilegedTests still fail,
presumably due to busted certificates or something like that.

Bug: 190523685
Bug: 236925089
Test: TreeHugger, manually on aosp_cf_x86_go_phone-userdebug
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I2a36b7bdfc2b532eac92dfe5edb6ad353960c9a8
2022-07-18 23:58:37 +00:00
Maciej Żenczykowski
513de3297a fix a potential invalid dereference am: 6f4e6ae532 am: bfd375e354 am: 19d0138e82 am: 7c44589be6
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2152895

Change-Id: Ib4900fe5f4c7afee0686897da68ac40a753ab4a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-14 10:15:45 +00:00
Maciej Żenczykowski
7c44589be6 fix a potential invalid dereference am: 6f4e6ae532 am: bfd375e354 am: 19d0138e82
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2152895

Change-Id: Id1fb0f66ec74a5cae44fe19ad1819ee3c976b70a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-14 08:56:21 +00:00
Maciej Żenczykowski
19d0138e82 fix a potential invalid dereference am: 6f4e6ae532 am: bfd375e354
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2152895

Change-Id: I194b292528b0925aec7e330f0f65a02e4c283f2e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-14 08:31:39 +00:00
Maciej Żenczykowski
bfd375e354 fix a potential invalid dereference am: 6f4e6ae532
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2152895

Change-Id: Iebfefacf1e5ca9482d8ac93ea022b10f84124937
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-14 08:11:46 +00:00
Maciej Żenczykowski
6f4e6ae532 fix a potential invalid dereference
Change-Id: I3dc9a8b868953ad3c9eb1ddfd1f76c3be94af8a6
2022-07-13 20:51:21 +00:00
TreeHugger Robot
bffa623d32 [automerger skipped] Merge "DO NOT MERGE - Merge TP1A.220624.013" into stage-aosp-master am: b06de670d8 -s ours am: 4469b6ba7b -s ours am: 418c9e6670 -s ours
am skip reason: Merged-In I553e90e0414453f8f3aaca8cf05d5decc8b911a2 with SHA-1 37b3d06333 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bpf/+/19251568

Change-Id: If7209a9ef84496d9348ffbb283be6dcb4ebe152c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-13 02:23:03 +00:00
Xin Li
1f462a5476 [automerger skipped] DO NOT MERGE - Merge TP1A.220624.013 am: 3e36c00b18 -s ours am: b28795244d -s ours am: a956e52df5 -s ours
am skip reason: Merged-In I553e90e0414453f8f3aaca8cf05d5decc8b911a2 with SHA-1 37b3d06333 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bpf/+/19251568

Change-Id: I3773c9130b8df0fe2feb8eebf72851ce74a6af62
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-13 02:22:34 +00:00
TreeHugger Robot
418c9e6670 [automerger skipped] Merge "DO NOT MERGE - Merge TP1A.220624.013" into stage-aosp-master am: b06de670d8 -s ours am: 4469b6ba7b -s ours
am skip reason: Merged-In I553e90e0414453f8f3aaca8cf05d5decc8b911a2 with SHA-1 37b3d06333 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bpf/+/19251568

Change-Id: Icf31df1ca51c5665bf97fd0972b6682b70788030
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-13 02:00:17 +00:00
Xin Li
a956e52df5 [automerger skipped] DO NOT MERGE - Merge TP1A.220624.013 am: 3e36c00b18 -s ours am: b28795244d -s ours
am skip reason: Merged-In I553e90e0414453f8f3aaca8cf05d5decc8b911a2 with SHA-1 37b3d06333 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bpf/+/19251568

Change-Id: I60af1754c6815adbd661a6cab58bf2e65cca96e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-13 01:59:47 +00:00
TreeHugger Robot
4469b6ba7b [automerger skipped] Merge "DO NOT MERGE - Merge TP1A.220624.013" into stage-aosp-master am: b06de670d8 -s ours
am skip reason: Merged-In I553e90e0414453f8f3aaca8cf05d5decc8b911a2 with SHA-1 37b3d06333 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bpf/+/19251568

Change-Id: I0fb735285905fd9c34797cc38ff8e03cd61fbf68
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-13 01:30:37 +00:00
Xin Li
b28795244d [automerger skipped] DO NOT MERGE - Merge TP1A.220624.013 am: 3e36c00b18 -s ours
am skip reason: Merged-In I553e90e0414453f8f3aaca8cf05d5decc8b911a2 with SHA-1 37b3d06333 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bpf/+/19251568

Change-Id: I4f23c67fb60a5ca15e6853b3b31cb9ee028ce29d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-13 01:30:07 +00:00
TreeHugger Robot
b06de670d8 Merge "DO NOT MERGE - Merge TP1A.220624.013" into stage-aosp-master 2022-07-13 01:07:47 +00:00
Ken Chen
898537a0c6 Rename bpf_load_tp_prog.o and bpf_load_tp_prog_btf.o am: 8693c789d3 am: 23fb1a6884 am: b11c90ffce am: 0cf06c23d7
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2146828

Change-Id: Ic15602e2c451355d66960847da460d7b01652c36
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-12 14:15:51 +00:00
Ken Chen
0cf06c23d7 Rename bpf_load_tp_prog.o and bpf_load_tp_prog_btf.o am: 8693c789d3 am: 23fb1a6884 am: b11c90ffce
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2146828

Change-Id: I7f1682b366baa8df6445fc89bb34fd5ed4b8bc18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-12 13:59:22 +00:00
Ken Chen
b11c90ffce Rename bpf_load_tp_prog.o and bpf_load_tp_prog_btf.o am: 8693c789d3 am: 23fb1a6884
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2146828

Change-Id: I23e354c3bb373e6f3edda45363e2ecc826203148
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-12 13:37:37 +00:00
Ken Chen
23fb1a6884 Rename bpf_load_tp_prog.o and bpf_load_tp_prog_btf.o am: 8693c789d3
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2146828

Change-Id: I2dfd985fed650213d9ecc002bfa6385c8f2f7cd0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-12 13:19:57 +00:00
Xin Li
3e36c00b18 DO NOT MERGE - Merge TP1A.220624.013
Merged-In: I553e90e0414453f8f3aaca8cf05d5decc8b911a2
Change-Id: I86969f4b387004f64713035423692fd2c9df3aaf
2022-07-11 21:47:46 -07:00
Ken Chen
498d20b706 Rename time_in_state.o to timeInState.o
Underscore character may cause bpf prog/map naming collision. For
example, x.o with map y_z and x_y.o with map z both result in x_y_z
prog/map name, which should be prevented during compile-time.

aosp/2147825 will prohibit underscore character in bpf source name
(source name derives the obj name). Existing bpf modules with underscore
characters in source name need to be updated accordingly.

Bug: 236706995
Test: adb root; adb shell ls -l /sys/fs/bpf/ | grep timeInState
Change-Id: Ia4eefd8b7debed2c81e194052488e15df72cab69
2022-07-10 19:10:36 +08:00
Ken Chen
8693c789d3 Rename bpf_load_tp_prog.o and bpf_load_tp_prog_btf.o
Underscore character may cause bpf prog/map naming collision. For
example, x.o with map y_z and x_y.o with map z both result in x_y_z
prog/map name, which should be prevented during compile-time.

aosp/2147825 will prohibit underscore character in bpf source name
(source name derives the obj name). Existing bpf modules with underscore
characters in source name need to be updated accordingly.

Bug: 236706995
Test: atest libbpf_load_test
Change-Id: I037ccfedc4d2e48688ee47f575c73998ce1c2c4b
2022-07-10 18:31:18 +08:00
Treehugger Robot
93fd05d4bb Merge "BpfLoader v0.25 - add support for obj@ver.o" am: d6c6835f27 am: 032c305dd8 am: c8f29c0862 am: d932842d60
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2147468

Change-Id: I8db2b240f1b7dc0c24523ffefd97fe0393f12eac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-07 20:47:20 +00:00
Treehugger Robot
d932842d60 Merge "BpfLoader v0.25 - add support for obj@ver.o" am: d6c6835f27 am: 032c305dd8 am: c8f29c0862
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2147468

Change-Id: I71ea130b80957490e4ceb23aa5f80a6b9976d88f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-07 20:25:07 +00:00