summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Ignore bpf errors for < 4.9 kernelsHEADs12.1SagarMakhar2022-06-041-11/+16
| | | | | | Change-Id: I037e4745d5bde12e6edd35203d3d3604ef1ec4c2 Signed-off-by: SagarMakhar <sagarmakhar@gmail.com> Signed-off-by: rajkale99 <kaleraj.rk@gmail.com>
* Snap for 7526832 from bb1485f836d496570a337f6d7b809a3e44191f71 to sc-v2-releaseAndroid Build Coastguard Worker2021-07-074-26/+119
|\ | | | | | | Change-Id: Ief52c115940a7a55e36ba1dda99cebed153c15ed
| * expose readSectionUint() for testing am: c1f8ca3060Maciej Żenczykowski2021-07-062-1/+4
| |\ | | | | | | | | | | | | | | | Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bpf/+/15212804 Change-Id: I8295ca337517fcf9b95b6f36f7d0da47dcfe765e
| | * expose readSectionUint() for testingMaciej Żenczykowski2021-07-062-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 190519702 Test: atest bpf_module_test, TreeHugger Signed-off-by: Maciej Żenczykowski <maze@google.com> Original-Change: https://android-review.googlesource.com/1756850 Merged-In: I772c918d162440de6cc492b2faeafe03340fca11 Change-Id: I772c918d162440de6cc492b2faeafe03340fca11
| * | bpf - struct bpf_map_def - add min/max kernel version. am: 2a51516a63Maciej Żenczykowski2021-07-063-15/+40
| |\| | | | | | | | | | | | | | | | Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bpf/+/15212803 Change-Id: Ifb8ba64bf84680d79aad6d8cdd5fface4671d2e1
| | * bpf - struct bpf_map_def - add min/max kernel version.Maciej Żenczykowski2021-07-063-15/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is also bpfloader v0.2. Some newer map types (for example DEVMAP) are unusable on older kernel versions. Bug: 190519702 Test: atest, TreeHugger Signed-off-by: Maciej Żenczykowski <maze@google.com> Original-Change: https://android-review.googlesource.com/1756575 Merged-In: I085cc723ff1c19d8acc8972a391f894e16dd1875 Change-Id: I085cc723ff1c19d8acc8972a391f894e16dd1875
| * | bpf - add a bunch of static asserts on size/alignment of struct field types ↵Maciej Żenczykowski2021-07-061-11/+76
| |\| | | | | | | | | | | | | | | | | | | | | | am: 0c713b1b19 Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bpf/+/15212614 Change-Id: I9f070e1dae50770b336e2cc478938cafc6f46357
| | * bpf - add a bunch of static asserts on size/alignment of struct field typesMaciej Żenczykowski2021-07-061-11/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It really turns out that till now we've just been lucky to not have ever used a 64-bit type. See also discussion on: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=69560 (and other places on the internet) Bug: 190519702 Test: atest, TreeHugger Signed-off-by: Maciej Żenczykowski <maze@google.com> Original-Change: https://android-review.googlesource.com/1756574 Merged-In: Ibe74a6f97bdbba490a7848060d07dc3efcee0e68 Change-Id: Ibe74a6f97bdbba490a7848060d07dc3efcee0e68
* | | Snap for 7524653 from 9de1fa570082f5297a3137fe1a64f7ec221c663e to sc-v2-releaseAndroid Build Coastguard Worker2021-07-062-2/+6
|\| | | | | | | | | | | Change-Id: I06f9bd8f625def12808ebf1898e5ece6a35e3c03
| * | bpf - move to v0.1 .o struct formatting am: e8edd956baMaciej Żenczykowski2021-07-052-2/+6
| |\| | | | | | | | | | | | | | | | Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bpf/+/15197128 Change-Id: I0ea297be5364950611fe17fb4e7c44b4907c648a
| | * bpf - move to v0.1 .o struct formattingMaciej Żenczykowski2021-07-032-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We cannot submit this as long as we want current mainline releases bpf .o objects to be loaded by images with bpfloader v0.0. Bug: 190519702 Test: atest, TreeHugger - existing bpf programs load examination of bpfloader logs Signed-off-by: Maciej Żenczykowski <maze@google.com> Original-Change: https://android-review.googlesource.com/1754795 Merged-In: I157458a4f798e455fb563fad569e20bfde5248fd Change-Id: I157458a4f798e455fb563fad569e20bfde5248fd
* | | Snap for 7521319 from 6cb4e3f847043d484245d717ba14f2b1c21c0d41 to sc-v2-releaseAndroid Build Coastguard Worker2021-07-033-14/+225
|\| | | | | | | | | | | Change-Id: I1eabfbcf2b4ef5110db307d9b6b1fb0812b462c1
| * | bpfloader - minor fixups asked for by reviewer am: d521e47d30Maciej Żenczykowski2021-07-022-4/+4
| |\| | | | | | | | | | | | | | | | Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bpf/+/15177779 Change-Id: I0d48b6219c88462ced3f2542cbd728fe4acb6f6a
| | * bpfloader - minor fixups asked for by reviewerMaciej Żenczykowski2021-07-022-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As requested by Bernie on previous commit. Bug: 190519702 Test: atest, TreeHugger - existing bpf programs load examination of bpfloader logs Signed-off-by: Maciej Żenczykowski <maze@google.com> Original-Change: https://android-review.googlesource.com/1754722 Merged-In: I4f5181f371d31dcf52768217ffd2b1b5b772103d Change-Id: I4f5181f371d31dcf52768217ffd2b1b5b772103d
| * | bpf loader improvements for better long term compatibility with mainline am: ↵Maciej Żenczykowski2021-07-023-14/+225
| |\| | | | | | | | | | | | | | | | | | | | | | 355b8df7f5 Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bpf/+/15187416 Change-Id: I6dc10e91173826c7958ed21009288e64e14f416b
| | * bpf loader improvements for better long term compatibility with mainlineMaciej Żenczykowski2021-07-023-14/+225
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is bpfLoader v0.1, previously we had no version number, the version immediately preceding this commit we'll call v0.0. Versions older than that are either pre-S and don't matter, since loading mainline eBpf code was only added in S, or are from early during the S development cycle (ie. pre-March 5th 2021 or earlier) and simply no longer supported (no need to maintain compatibility). Bug: 190519702 Test: atest, TreeHugger - existing bpf programs load examination of bpfloader logs Signed-off-by: Maciej Żenczykowski <maze@google.com> Original-Change: https://android-review.googlesource.com/1754794 Merged-In: I36fa5b917540be7ea3ecfddc5fe7834e9eb18d88 Change-Id: I36fa5b917540be7ea3ecfddc5fe7834e9eb18d88
* | | Snap for 7422643 from f514b2593f4853f9e317bd5b446bb0c6fb2c049b to sc-v2-releaseandroid-build-team Robot2021-06-041-0/+1
|\| | | | | | | | | | | Change-Id: I5117846daf3404112655c50c7ca8c79404159e48
| * | Enable Async MTE in bpfloader. am: a88de013d7Evgenii Stepanov2021-06-021-0/+1
| |\| | | | | | | | | | | | | | | | Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bpf/+/14793615 Change-Id: I7ff4d5c56f7f296b7ba93563fd4feba7d116059f
| | * Enable Async MTE in bpfloader.Evgenii Stepanov2021-06-011-0/+1
| |/ | | | | | | | | | | | | | | | | | | | | This change enables Async mode ARM MTE in the bpfloader process on compatible hardware and has no effect otherwise. Bug: 181603044 Test: atest under system/bpf Change-Id: I6340055fea1f97fcc781b418e2465a7961ecedf4 Merged-In: I6340055fea1f97fcc781b418e2465a7961ecedf4 (cherry picked from commit d27ae792e11e8f1d318a5d482176e7e308cd448a)
* | Snap for 7205268 from 1ebce20b0f778c7927936a55fba86ef2ad8a0330 to sc-v2-releaseandroid-build-team Robot2021-03-131-0/+16
|\| | | | | | | Change-Id: I002f94278401ea4368bace78e64cfa1cce6a48e0
| * BpfUtils.h - add back SKIP_IF_BPF_NOT_SUPPORTED macro am: 67fa2073ff am: ↵Maciej Żenczykowski2021-03-121-0/+16
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | 625c2c6bc6 am: c5468f82d4 Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/1631935 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I0e6a740dcb11c9c8ea73ba9aa8646e473a5a3242
| | * BpfUtils.h - add back SKIP_IF_BPF_NOT_SUPPORTED macro am: 67fa2073ff am: ↵Maciej Żenczykowski2021-03-121-0/+16
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 625c2c6bc6 Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/1631935 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I8d84f5368f2f9fa78b136d67dc92587cf05e3b81
| | | * BpfUtils.h - add back SKIP_IF_BPF_NOT_SUPPORTED macro am: 67fa2073ffMaciej Żenczykowski2021-03-121-0/+16
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/1631935 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I4319f83b426be2800ee92f3fb900ad98ec597ed9
| | | | * BpfUtils.h - add back SKIP_IF_BPF_NOT_SUPPORTED macroMaciej Żenczykowski2021-03-111-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Needs to be used by dns mainline module tests on R devices (Pixel 2). Test: TreeHugger Signed-off-by: Maciej Żenczykowski <maze@google.com> Change-Id: I2974a5368f4a9d744e30be9148aefac117d09acb
* | | | | Snap for 7188367 from ade234047b9055421127a549be896b21f480dd7e to sc-v2-releaseandroid-build-team Robot2021-03-062-4/+26
|\| | | | | | | | | | | | | | | | | | | Change-Id: Id648f4c7586fbbd979ae172b3b1e229d84743805
| * | | | bpfloader: auto-demote DEVMAP/DEVMAP_HASH map types on too old kernels am: ↵Maciej Żenczykowski2021-03-051-1/+22
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cb358de067 am: 76f565a3f1 am: 3aa8ecefd5 Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/1619223 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I7dc2b7da56ee348f87cded9c1fb858a240e3776b
| | * | | bpfloader: auto-demote DEVMAP/DEVMAP_HASH map types on too old kernels am: ↵Maciej Żenczykowski2021-03-051-1/+22
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cb358de067 am: 76f565a3f1 Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/1619223 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I5423fe59d3c9a360e9687a2c6c8619c6741800db
| | | * | bpfloader: auto-demote DEVMAP/DEVMAP_HASH map types on too old kernels am: ↵Maciej Żenczykowski2021-03-051-1/+22
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cb358de067 Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/1619223 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I30a799d8beb4784baa0820d3fbad16d9b7e88464
| | | | * bpfloader: auto-demote DEVMAP/DEVMAP_HASH map types on too old kernelsMaciej Żenczykowski2021-03-051-1/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Basically: <4.14: DEVMAP -> ARRAY <5.4: DEVMAP_HASH -> HASH See added comments for explanation of why, but basically: This allows our bpf program .o files to load maps on all kernel versions, even if those map types are not supported by the kernel. This avoids the need for code that conditionally creates maps based on kernel version. Any program that actually attempts to use one of these maps will fail to load, but programs are already loaded conditionally based on kernel version so this is not a problem. Test: atest, TreeHugger Signed-off-by: Maciej Żenczykowski <maze@google.com> Change-Id: I1a1d73b68de3606423de078fddb224402621e154
| * | | | bpf_map_def.h - fix no longer correct comment am: fd59a4a0a6 am: 9123fe9e56 ↵Maciej Żenczykowski2021-03-051-3/+4
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: a10d63db2f Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/1619222 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I781e41e5a0f6e18b421d223043ab4fca5557e0d1
| | * | | bpf_map_def.h - fix no longer correct comment am: fd59a4a0a6 am: 9123fe9e56Maciej Żenczykowski2021-03-051-3/+4
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/1619222 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ibd6609deeb272056d82d964d8d9e50c05496ab07
| | | * | bpf_map_def.h - fix no longer correct comment am: fd59a4a0a6Maciej Żenczykowski2021-03-051-3/+4
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/1619222 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ifdef2d29e0d5ddebd5f7d1a68c4d2d8b64600239
| | | | * bpf_map_def.h - fix no longer correct commentMaciej Żenczykowski2021-03-041-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is due to changing how many bits are assigned to individual fragments, which was done to support kernel version 4.9.256. Test: atest, TreeHugger Signed-off-by: Maciej Żenczykowski <maze@google.com> Change-Id: I7f556352beab009cd114e2241f3d7fe6d878a458
* | | | | Snap for 7183400 from f06c06780001fd40a6cc04d5bffa208d7411c9c2 to sc-v2-releaseandroid-build-team Robot2021-03-042-3/+5
|\| | | | | | | | | | | | | | | | | | | Change-Id: Iec6893a345a40750008385afe73e052b53b55f51
| * | | | grant bpfloader NET_ADMIN capability am: 265d1310ec am: 8db5909149 am: ↵Maciej Żenczykowski2021-03-031-1/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 41b916ccb9 Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/1611658 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I646b517f70f248af653a26fd0af51a1694ab3298
| | * | | grant bpfloader NET_ADMIN capability am: 265d1310ec am: 8db5909149Maciej Żenczykowski2021-03-031-1/+1
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/1611658 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I59971b39ea15559c8347788b949a72fd2e555da8
| | | * | grant bpfloader NET_ADMIN capability am: 265d1310ecMaciej Żenczykowski2021-03-031-1/+1
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/1611658 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I82525512c6732d43521bb9d6c3e4ef09d45e18ba
| | | | * grant bpfloader NET_ADMIN capabilityMaciej Żenczykowski2021-03-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is required for it to be able to create DEVMAP/DEVMAP_HASH maps. See kernel source code in kernel/bpf/devmap.c: static struct bpf_map *dev_map_alloc(union bpf_attr *attr) { ... if (!capable(CAP_NET_ADMIN)) return ERR_PTR(-EPERM); Test: atest, TreeHugger Signed-off-by: Maciej Żenczykowski <maze@google.com> Change-Id: I4f3012209186ff0e4bde8807b9032de056367132
| * | | | Merge "make failure on map creation returns -errno" am: e5b8aa240b am: ↵Treehugger Robot2021-03-031-2/+4
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5db68dbf66 am: 9752a3f790 Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/1611659 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ib1484b8f6a57f15280337b970e212f0672416a82
| | * | | Merge "make failure on map creation returns -errno" am: e5b8aa240b am: ↵Treehugger Robot2021-03-031-2/+4
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5db68dbf66 Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/1611659 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I52b92bdd3bd134703fd7f956c5e1e63dcecc05f7
| | | * | Merge "make failure on map creation returns -errno" am: e5b8aa240bTreehugger Robot2021-03-031-2/+4
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/1611659 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: If411792759899077e248365d980bf77eece2a274
| | | | * Merge "make failure on map creation returns -errno"Treehugger Robot2021-03-031-2/+4
| | | |/|
| | | | * make failure on map creation returns -errnoMaciej Żenczykowski2021-03-021-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This slightly improves error logging. (also fd == 0 is not an error condition) Test: atest, TreeHugger Signed-off-by: Maciej Żenczykowski <maze@google.com> Change-Id: I135e7405c508951fba632c634bc4e2d2161fc940
* | | | | Snap for 7168754 from ee82f48c133e689d381d8dd60e698437502c1119 to sc-v2-releaseandroid-build-team Robot2021-02-250-0/+0
|\| | | | | | | | | | | | | | | | | | | Change-Id: Ic53fed9abf6e13b4c5addac3b7d2af3bd0660559
| * | | | [automerged blank] bpf_helpers - hardcode declaration of ↵Presubmit Automerger Backend2021-02-240-0/+0
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bpf_ktime_get_boot_ns() 2p: 8c794ee2e5 Blank merge reason: Change-Id I87f344c779d89cebe9a0d09dc466966ca7fda1a6 with SHA-1 6b28299441 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bpf/+/13674371 Change-Id: I65c5958ba9f8577f8988606f09c77c106fa0bf93
| | * | | | bpf_helpers - hardcode declaration of bpf_ktime_get_boot_ns()Maciej Żenczykowski2021-02-241-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a temporary hack that is needed only in mainline-prod, where the kernel headers are not new enough to define it. Test: m com.android.tethering Signed-off-by: Maciej Żenczykowski <maze@google.com> Merged-In: I87f344c779d89cebe9a0d09dc466966ca7fda1a6 Change-Id: I281a25d0a2f3d1c265599c78c58c47b6f234425f
| * | | | | [automerged blank] bpf_helpers - add declaration for bpf_ktime_get_boot_ns() ↵Presubmit Automerger Backend2021-02-240-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2p: f87f9a3031 Blank merge reason: Change-Id I87f344c779d89cebe9a0d09dc466966ca7fda1a6 with SHA-1 6b28299441 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bpf/+/13674368 Change-Id: Ieb22cd324695f66300f37e31852576285bb0e3b7
| | * | | | bpf_helpers - add declaration for bpf_ktime_get_boot_ns()Maciej Żenczykowski2021-02-241-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test: atest, TreeHugger Signed-off-by: Maciej Żenczykowski <maze@google.com> Change-Id: I87f344c779d89cebe9a0d09dc466966ca7fda1a6 Merged-In: I87f344c779d89cebe9a0d09dc466966ca7fda1a6
* | | | | | Snap for 7160059 from 454d5f78e85b3b859a80fc4d6a7a8b031da9f22d to sc-v2-releaseandroid-build-team Robot2021-02-210-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic71cb6632cfb575d73b4e731113ed905b8d95bd5
| * | | | | [automerger skipped] Mark ab/7061308 as merged in stage. am: f988c7bad6 -s ↵Xin Li2021-02-200-0/+0
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours am: 3b6196bebb -s ours am skip reason: Change-Id I29e012cafcbadea5f0ce8f5b0348581afdd78339 with SHA-1 6014445629 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Icdc6348d903273493e2d86143dab44825ed81559
generated by cgit v1.2.3 (git 2.25.1) at 2026-01-17 17:35:55 +0000