Commit graph

2040 commits

Author SHA1 Message Date
Maciej Żenczykowski
4038b8f63e bpfRingbufProg: use named values not raw true/false values.
Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: Idd8055d823d98d8d0e2b3fe26246edc0c457e16b
2023-10-06 14:42:52 -07:00
Maciej Żenczykowski
f8c974e7f4 bpfloader: require 64-bit userspace on 6.2+ kernels am: ce66750cb6
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2750990

Change-Id: I426cf4ccf9f08a7c316f1fc59c7109939fccc54b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-14 14:18:32 +00:00
Maciej Żenczykowski
ce66750cb6 bpfloader: require 64-bit userspace on 6.2+ kernels
This is safe as there are no LTS 6.2+ kernels yet.

Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I2766ee9eb54017451a301b4d7dcf81368fb41723
2023-09-14 09:53:01 +00:00
Maciej Żenczykowski
6d37008f7f bpfloader: 4.19+ required error message "Android V" -> "Android U QPR2" am: 0156d6e2ba
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2751705

Change-Id: Ie73b94753d9e628a1f731c20259851fdd33f94ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-13 23:50:31 +00:00
Maciej Żenczykowski
0156d6e2ba bpfloader: 4.19+ required error message "Android V" -> "Android U QPR2"
This fixes up yesterday's commit that added
the error message in the first place.

Android U hopefully launches ~Sep/Oct 2023

Android U QPR1 should be approx. a quarter after that,
so ~Dec 2023 or ~Jan 2024.

Android U QPR2 presumably releases another quarter later,
ie. around March/April 2024.

Per: https://www.kernel.org/category/releases.html
The 4.14 LTS kernel series projected EOL is Jan, 2024

This means that U QPR1 is the last one that 'should'
still support 4.14.

We are free to drop support in U QPR2+ as those will
be released after 4.14 goes EOL.

aosp/main only merges into branches *after* the current
udc-qpr-dev and thus will not end up in U QPR1.

Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I3ad6cada3d40c8d2bb0ee07ff52b4e36e1689bde
2023-09-13 21:44:41 +00:00
Maciej Żenczykowski
5216425124 bpfloader: remove btf support am: b44e287ed0
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2624709

Change-Id: I8b6e3d8c8afdd6482cfee99af1756d15bccce27a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-13 06:18:07 +00:00
Maciej Żenczykowski
b44e287ed0 bpfloader: remove btf support
due to a regression in boot speed, caused by the extra fork-exec of btfloader

(Loosely based on https://android-review.git.corp.google.com/c/platform/system/bpf/+/1909155 )

Test: TreeHugger
Bug: 286369326
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I258a9437aedb10d1fa7e91e1a7f22fd8cb99a4a2
2023-09-12 21:11:38 -07:00
Treehugger Robot
fd80e33468 Merge "bpfloader: Android V requires kernel 4.19+" into main am: 61b8ba3611
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2749573

Change-Id: I74df2440e11f30dd584342a44af0b2431addf36e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-13 01:20:44 +00:00
Treehugger Robot
61b8ba3611 Merge "bpfloader: Android V requires kernel 4.19+" into main 2023-09-13 00:25:19 +00:00
Maciej Żenczykowski
aeb79f42dc bpfloader: Android V requires kernel 4.19+
(This is a reland of
https://android-review.git.corp.google.com/c/platform/system/bpf/+/2657155
sunfish is EOL)

This reverts commit 2733d97683.

Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: If309ad60883031d07af91a3e96aff51a701bedf7
2023-09-12 22:16:41 +00:00
Sam Saccone
2b217d2aa3 Move OWNER reference master=>main. am: 9704325ab1
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2662417

Change-Id: I7ed7c13b201af4b8c3075a077bc3fe733635a47e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-18 18:42:06 +00:00
Sam Saccone
9704325ab1 Move OWNER reference master=>main.
BUG=b/291759353

Change-Id: I98a997ca6af68ad66d30d49e6998483840f88408
2023-07-18 17:09:29 +00:00
TreeHugger Robot
e38f435bd1 Merge "Empty Merge Android U (ab/10368041)" into aosp-main-future 2023-07-15 02:03:56 +00:00
Xin Li
104b041577 Empty Merge Android U (ab/10368041)
Bug: 291102124
Merged-In: I199fcd4d8b2db4b26a93294e155edcc7a5696633
Change-Id: Id50579ba1bc25c23de63ba90421d3d21e09ef3f7
2023-07-14 16:53:40 -07:00
Sebastian Pickl
69c27a5cd1 Revert "bpfloader: Android V requires kernel 4.19+" am: 2733d97683
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2658975

Change-Id: I0ddf5d559ca2cd79fcc41861862a0a0256645d1e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-14 23:02:10 +00:00
Sebastian Pickl
2733d97683 Revert "bpfloader: Android V requires kernel 4.19+"
This reverts commit 6002cbedb1.

Reason for revert: culprit for b/291299507 verified with go/abtd:
https://android-build.googleplex.com/builds/abtd/run/L80200000961962770

Change-Id: I6de87b59ad1d90fd7449ea78a8beafe48ac8d738
2023-07-14 21:40:59 +00:00
Maciej Żenczykowski
abc8303ffe bpfloader: Android V requires kernel 4.19+ am: 6002cbedb1
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2657155

Change-Id: I08ab8fd9601ddeff20a4651b101f67f17ede15be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-14 16:55:50 +00:00
Maciej Żenczykowski
6002cbedb1 bpfloader: Android V requires kernel 4.19+
Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: Ibd9ad9bc322388f0f5eda75f9e838590f713007c
2023-07-13 18:45:16 +00:00
Maciej Żenczykowski
e5a0a70b78 add a comment about page size vs bpf ring buffer sizing am: 28f01bb027 am: cd4022ef2a am: 9045516e4a
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2631549

Change-Id: I199fcd4d8b2db4b26a93294e155edcc7a5696633
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 09:08:28 +00:00
Maciej Żenczykowski
9045516e4a add a comment about page size vs bpf ring buffer sizing am: 28f01bb027 am: cd4022ef2a
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2631549

Change-Id: Iaf03968f3f930e6e1dc372468b77e82162ba5483
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 08:19:31 +00:00
Maciej Żenczykowski
cd4022ef2a add a comment about page size vs bpf ring buffer sizing am: 28f01bb027
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2631549

Change-Id: Icd169c9f37692b2acfadd895e0b01ea4315cf830
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 07:37:27 +00:00
Maciej Żenczykowski
a284f6434e bpfLoader: automatically bump ringbuffer size up to page size am: 8a117a374b am: 1cba4021bf am: f9ff12af51
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2628969

Change-Id: If461fcd3618862d696d38dd7b048bb5ed7fddadc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-20 21:56:44 +00:00
Maciej Żenczykowski
f9ff12af51 bpfLoader: automatically bump ringbuffer size up to page size am: 8a117a374b am: 1cba4021bf
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2628969

Change-Id: I399a67cb7cb058b5b690839adbcddfa7420d4da1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-20 21:09:52 +00:00
Maciej Żenczykowski
1cba4021bf bpfLoader: automatically bump ringbuffer size up to page size am: 8a117a374b
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2628969

Change-Id: I235578e8c2f6a715e6857d1d713dc362371d0c86
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-20 20:26:33 +00:00
Maciej Żenczykowski
28f01bb027 add a comment about page size vs bpf ring buffer sizing
As requested by Patrick on:
https://android-review.git.corp.google.com/c/platform/system/bpf/+/2628969
bpfLoader: automatically bump ringbuffer size up to page size

Test: N/A, comment only
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: Ibbce6a72e5e25bf18bb89bca2f00d332ef824f73
2023-06-20 19:40:57 +00:00
Maciej Żenczykowski
8a117a374b bpfLoader: automatically bump ringbuffer size up to page size
A 4kB BPF_MAP_TYPE_RINGBUF does not work on 16kB page size kernel,
as an eBPF ring buffer size *must* be a multiple of the page size.

However, it is inefficient to force a 16kB RINGBUF on kernels
with only a 4kB page size.

It wastes 12kB of mlock'ed memory per ring buffer,
which isn't much, but - as we add more ringbuffers - it'll add up...

The userspace ring buffer code doesn't actually mind the
automatic increase in size, as it retrieves the actual
size from the map fd (ie. from the kernel) during init
and thus adjusts automatically.

Test: TreeHugger
Bug: 279819914
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I9fcb1f9dc2e86038a7f1a486f4efbc28dba38ca0
2023-06-17 11:15:56 +00:00
Maciej Żenczykowski
f7dba12a41 Merge "BpfLoader - allow disabling BTF loading on user builds only" am: c93af9eec8 am: b2d58eaf96 am: 266e04dca3
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2619252

Change-Id: Ife08c641b83866b419c83eef0253c0942872da09
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-15 11:01:49 +00:00
Maciej Żenczykowski
266e04dca3 Merge "BpfLoader - allow disabling BTF loading on user builds only" am: c93af9eec8 am: b2d58eaf96
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2619252

Change-Id: I8166321dd11446102bac04121f4da8b3a8381528
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-15 10:11:05 +00:00
Maciej Żenczykowski
b2d58eaf96 Merge "BpfLoader - allow disabling BTF loading on user builds only" am: c93af9eec8
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2619252

Change-Id: I7d77dc444f276b0c676844c0a57c84750bd0dda6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-15 09:06:00 +00:00
Maciej Żenczykowski
c93af9eec8 Merge "BpfLoader - allow disabling BTF loading on user builds only" 2023-06-15 08:16:49 +00:00
Evgenii Stepanov
deb813c18b [NFC] Move MTE mode settings to a product variable. am: d26716e148 am: da6d9177a3 am: 1e882deded
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2622818

Change-Id: I68d1d8d204b31c591abefb9b0a4689c5772b995d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-15 02:27:44 +00:00
Evgenii Stepanov
1e882deded [NFC] Move MTE mode settings to a product variable. am: d26716e148 am: da6d9177a3
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2622818

Change-Id: I17eaf29fb5203ed67ac9f8b6a67838d609541567
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-15 01:40:36 +00:00
Evgenii Stepanov
da6d9177a3 [NFC] Move MTE mode settings to a product variable. am: d26716e148
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2622818

Change-Id: I20cc37a38ad12f95192a86d6619de77702a652ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-15 00:31:39 +00:00
Evgenii Stepanov
d26716e148 [NFC] Move MTE mode settings to a product variable.
The default list of memtag targets found in
  build/make/target/product/memtag-common.mk

Bug: 280343521
Test: no functional change
Change-Id: I7b2713fa0065f8c0317cc7634eedf6143f7fefec
2023-06-12 16:58:02 -07:00
Maciej Żenczykowski
411e3f07f7 BpfLoader - allow disabling BTF loading on user builds only
In some programs BTF information may be useful only for debugging.

Bug: 286369326
Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: Iebe8897520d0e37196e33ee3c65691708050508d
2023-06-09 05:58:47 +00:00
Maciej Żenczykowski
7f08952a4b [automerger skipped] bpfloader: ignore_on_arch support am: 53ed03bc3b -s ours
am skip reason: Merged-In I572fd18b2c778fa67073a5410dcb2410e5c24ff5 with SHA-1 8d2e7d9ae3 is already in history

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

Change-Id: Iefacbd23dc042fa4b11a461375e1c36b94b61565
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-25 09:18:24 +00:00
Maciej Żenczykowski
53ed03bc3b bpfloader: ignore_on_arch support
Test: TreeHugger
Bug: 283523051
Signed-off-by: Maciej Żenczykowski <maze@google.com>
(cherry picked from https://android-review.googlesource.com/q/commit:8d2e7d9ae3ebc34f8ab5f54ad0e3008c4a80b76d)
Merged-In: I572fd18b2c778fa67073a5410dcb2410e5c24ff5
Change-Id: I572fd18b2c778fa67073a5410dcb2410e5c24ff5
Bug: 283523051
2023-05-23 16:14:49 +00:00
Maciej Żenczykowski
a68c249564 bpfloader: ignore_on_arch support am: 8d2e7d9ae3 am: 0edf3d92a9 am: de2ff678a2
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2598009

Change-Id: I316d792259ce1f7abe757624cd0411e97b7fdb8e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-20 18:16:33 +00:00
Maciej Żenczykowski
de2ff678a2 bpfloader: ignore_on_arch support am: 8d2e7d9ae3 am: 0edf3d92a9
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2598009

Change-Id: I0b5ea92ad2e8618ba748e8f6feadef853f6c7c10
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-20 17:22:54 +00:00
Maciej Żenczykowski
0edf3d92a9 bpfloader: ignore_on_arch support am: 8d2e7d9ae3
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2598009

Change-Id: Ie93f545aa4b9fd30048806490c46e6585c99a24b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-20 16:30:39 +00:00
Maciej Żenczykowski
8d2e7d9ae3 bpfloader: ignore_on_arch support
Test: TreeHugger
Bug: 283523051
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I572fd18b2c778fa67073a5410dcb2410e5c24ff5
2023-05-20 02:07:17 +00:00
Maciej Żenczykowski
4650ef2248 [automerger skipped] remove inprocess tethering am: e15e91ea0d am: 72bc068da9 am: 2a6a6f7b5b -s ours
am skip reason: Merged-In If7c3ca47891d53f478f7b784580efb2a0014c617 with SHA-1 48cd823681 is already in history

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

Change-Id: Ic238f889161c525d9e73a55512194d6f2ab76aad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-15 19:42:20 +00:00
Maciej Żenczykowski
2a6a6f7b5b remove inprocess tethering am: e15e91ea0d am: 72bc068da9
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2589605

Change-Id: If6a10bb2bcb2d877d97e05a0379d5596b6b6f065
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-15 18:37:06 +00:00
Maciej Żenczykowski
72bc068da9 remove inprocess tethering am: e15e91ea0d
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2589605

Change-Id: I0f5fe75cf3d1141684b8852ebd316630c93acce5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-15 17:57:40 +00:00
Maciej Żenczykowski
e15e91ea0d remove inprocess tethering
The logic dealing with in vs out-of-process tethering flags
was added in aosp/master once it was already not merging to tm-dev,
thus ending up only in udc-dev, it was later removed in aosp/master,
and then cherrypicked to udc-dev.

As such there is no shipping version of the bpfloader
(besides early U developer previews and betas)
with this requirement.

Ignore-AOSP-First: change must land in U first,
since it's not safe if it isn't approved for udc-dev

Test: TreeHugger
Bug: 279942846
Signed-off-by: Maciej Żenczykowski <maze@google.com>
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:48cd8236816ef8d29002fb0c7c66ff480fa3a396)
Merged-In: If7c3ca47891d53f478f7b784580efb2a0014c617
Change-Id: If7c3ca47891d53f478f7b784580efb2a0014c617
2023-05-15 16:32:32 +00:00
Maciej Żenczykowski
2c2b3d9e59 remove inprocess tethering am: 48cd823681
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bpf/+/23214402

Change-Id: I446901ec4c0e78f6b9d44935f29d56dd786dafae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-15 01:33:21 +00:00
Maciej Żenczykowski
48cd823681 remove inprocess tethering
The logic dealing with in vs out-of-process tethering flags
was added in aosp/master once it was already not merging to tm-dev,
thus ending up only in udc-dev, it was later removed in aosp/master,
and then cherrypicked to udc-dev.

As such there is no shipping version of the bpfloader
(besides early U developer previews and betas)
with this requirement.

Ignore-AOSP-First: change must land in U first,
since it's not safe if it isn't approved for udc-dev

Test: TreeHugger
Bug: 279942846
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: If7c3ca47891d53f478f7b784580efb2a0014c617
2023-05-13 01:04:44 +00:00
Maciej Żenczykowski
a2588c95ac [automerger skipped] remove inprocess tethering am: c718d008d8 -s ours
am skip reason: Merged-In I381345cee7431d8e41918870155db4a6a8de7e5b with SHA-1 bca197ccab is already in history

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

Change-Id: Ic76c7e5671611a2bacd85ab910c9455175502f1e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 16:09:38 +00:00
Maciej Żenczykowski
c718d008d8 remove inprocess tethering
Test: TreeHugger
Bug: 279942846
(cherry picked from https://android-review.googlesource.com/q/commit:bca197ccab56cc092a4bb0e50de3d1e40f2e7284)
Merged-In: I381345cee7431d8e41918870155db4a6a8de7e5b
Change-Id: I381345cee7431d8e41918870155db4a6a8de7e5b
2023-05-08 21:15:47 +00:00
Maciej Żenczykowski
0266ae499a Merge "remove inprocess tethering" am: 16b51ab751 am: 4e9f9b0ef7 am: 519f516387
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2568034

Change-Id: I375bc42889ed92ab7808824110ba944995735519
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-05 22:46:21 +00:00