tequilaOS/platform_system_bpf
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
1562 commits 1 branch 0 tags 1.8 MiB
Commit graph

1562 commits

This branch
This branch
All branches
Author SHA1 Message Date
Maciej Żenczykowski
63ab4ee2dc bpfloader: add ability to disable btfloader am: 37b3d06333 am: 6571031de6 am: c75ca60443 
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bpf/+/19048272

Change-Id: I34b309a53e4108355c1290b90c2b23e2ca190689
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-23 23:18:29 +00:00
Maciej Żenczykowski
c75ca60443 bpfloader: add ability to disable btfloader am: 37b3d06333 am: 6571031de6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bpf/+/19048272

Change-Id: I33d1e5924443112ca6c5f11c4b707f0d6f07efa1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-23 23:02:18 +00:00
Maciej Żenczykowski
6571031de6 bpfloader: add ability to disable btfloader am: 37b3d06333 
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bpf/+/19048272

Change-Id: I44542df80cbac47f9dd6080cdfab32da0d792986
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-23 22:43:29 +00:00
Maciej Żenczykowski
37b3d06333 bpfloader: add ability to disable btfloader 
BTF support was added to bpfloader during Android T dev cycle.

As it causes bpfloader boot time process to shell out to a new
btfloader subprocess for every bpf.o file with BTF debugging
information compiled in, I'm worried this might have unforeseen
consequences - things like crashes or boot time bpfloader cpu
regressions.

However, BTF is exceedingly useful for debugging,
and it would be a huge pity if we were forced to disable it
and keep it disabled in mainline tethering module just to support
Android T devices for the next 5+ years.

It would also be a pity if the bpf.o files in prebuilt mainline
tethering apex in dev branches (like tm-dev) did not include
BTF debug information simply due to compatibility with older
kernels or OSes, since this would require rebuilding the module
everytime BTF information could be of use.

One of the things functioning BTF enables is 'cat /sys/fs/bpf/map_*'
as root on a userdebug build.  Among other things this can be
used to verify that in kernel bpf map state matches that dumped
by the mainline module's pretty dump code.

Even if there's issues wrt. BTF in Android T (or on older kernels),
we can always fix them in Android U or later (for example build
btfloader into bpfloader to avoid exec overhead, etc...).

Bug: 218408035
Bug: 230585250
Bug: 235559605
Test: TreeHugger, cuttlefish devices boots, and:
  adb root && adb shell cat /sys/fs/bpf/map_time_in_state_cpu_last_pid_map
  continues to show information which is available due to BTF debug provided
  in /system/etc/bpf/time_in_state.o file (due to "btf: true" in Android.bp)
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I553e90e0414453f8f3aaca8cf05d5decc8b911a2
 2022-06-23 13:08:38 +00:00
Automerger Merge Worker
a8e36247ae Merge "Revert "disable bpfloader selinux_context support" am: 98ec8cf05b am: 0a4fb56218" into tm-d1-dev-plus-aosp am: 91d9fe6bfc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bpf/+/19039232

Change-Id: I1b0ef50b01c41874ed555f9ba6f6f9cf7b666996
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-23 12:01:28 +00:00
Maciej Żenczykowski
32220f3de2 Revert "disable bpfloader selinux_context support" am: 98ec8cf05b am: aa0cd0b2fa am: f0764257b1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bpf/+/19039232

Change-Id: Ie8ed69e85e7cb49a260837d9bbe2154e719a7a3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-23 12:00:57 +00:00
Maciej Żenczykowski
63d22e6614 Revert "disable bpfloader selinux_context support" am: 98ec8cf05b am: aa0cd0b2fa am: 199963b767 
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bpf/+/19039232

Change-Id: I88125669904e2f8c837d977518cdc707791b03cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-23 12:00:38 +00:00
Automerger Merge Worker
91d9fe6bfc Merge "Revert "disable bpfloader selinux_context support" am: 98ec8cf05b am: 0a4fb56218" into tm-d1-dev-plus-aosp 2022-06-23 11:34:26 +00:00
Maciej Żenczykowski
091be8a04d Revert "disable bpfloader selinux_context support" am: 98ec8cf05b am: 0a4fb56218 
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bpf/+/19039232

Change-Id: Id2af5b061f8dd11697810b410556dc4e81e60857
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-23 11:34:10 +00:00
Maciej Żenczykowski
f0764257b1 Revert "disable bpfloader selinux_context support" am: 98ec8cf05b am: aa0cd0b2fa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bpf/+/19039232

Change-Id: I34da8e9db23f5a6adb46acf9569325354af39e3b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-23 11:34:09 +00:00
Maciej Żenczykowski
199963b767 Revert "disable bpfloader selinux_context support" am: 98ec8cf05b am: aa0cd0b2fa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bpf/+/19039232

Change-Id: I1867acd3417dd14a71578f8e3dae9ec0055375c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-23 11:34:08 +00:00
Maciej Żenczykowski
aa0cd0b2fa Revert "disable bpfloader selinux_context support" am: 98ec8cf05b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bpf/+/19039232

Change-Id: I7863520ef21f4fa2d787325637979c2e4737a867
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-23 11:17:21 +00:00
Maciej Żenczykowski
0a4fb56218 Revert "disable bpfloader selinux_context support" am: 98ec8cf05b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bpf/+/19039232

Change-Id: Ibef2442d3b01614a8ee313485877a7c2b259391d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-23 11:15:50 +00:00
Maciej Żenczykowski
98ec8cf05b Revert "disable bpfloader selinux_context support" 
This reverts commit 8e5e239dd0a7856e486a9e2d772ef3a9e38021eb.

No longer required now that selinux change has landed.

(while we're at it bump the bpfloader version to v0.19 just
 to make sure we can tell these apart in the future)

This is a cherrypick to tm-dev of reviewed/approved but unsubmitted:
  https://android-review.googlesource.com/c/platform/system/bpf/+/2132534

Ignore-AOSP-First: will be cherrypicked to aosp master

Bug: 218408035
Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I0b3349ef908bbfd225b8b7f83b2a4a8870c1e409
 2022-06-22 14:51:58 -07:00
Automerger Merge Worker
315fbffb3f Merge changes from topic "am-7b00c416034c4104ac885e1f4ac35b8a" into tm-d1-dev-plus-aosp am: 1299dc1ad6 -s ours 
am skip reason: Merged-In Ic27d0e5f3c6b78db39c6742fe9e1955f65d2b1f5 with SHA-1 a529b323af is already in history

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

Change-Id: Idfb5ecbfe0d86d8009e0648a4c9c2f5db7013450
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-22 03:26:50 +00:00
Maciej Żenczykowski
e4ced1cd34 [automerger skipped] disable bpfloader selinux_context support am: a529b323af am: 41704bdf0b -s ours am: 395d4dc6f8 -s ours 
am skip reason: Merged-In Ic27d0e5f3c6b78db39c6742fe9e1955f65d2b1f5 with SHA-1 a7a11bda00 is already in history

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

Change-Id: I8850d5eadb3116fd384113eb3ae8fc157c993792
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-22 03:26:48 +00:00
Maciej Żenczykowski
2879858b30 [automerger skipped] disable bpfloader selinux_context support am: a529b323af -s ours am: 8342a26a24 -s ours am: 016a3e50ab -s ours 
am skip reason: Merged-In Ic27d0e5f3c6b78db39c6742fe9e1955f65d2b1f5 with SHA-1 a7a11bda00 is already in history

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

Change-Id: Ifb1c3a43d9fcce20f44e7c8ffa95ac223e75d9f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-22 03:26:38 +00:00
Maciej Żenczykowski
7918fef4c3 [automerger skipped] bpfloader: support 'shared' maps and per-map/program selinux context am: 5ed96f4a1a -s ours am: 005e8a84e7 -s ours am: baec5c62ee -s ours 
am skip reason: Merged-In I9d7449e477c371053a34191a2a9a935ba927d4b3 with SHA-1 4181713963 is already in history

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

Change-Id: I588f67f810c4ebe946a576dd2dc51caa10eebed0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-22 03:26:37 +00:00
Maciej Żenczykowski
568508c3cb [automerger skipped] disable bpfloader selinux_context support am: a529b323af am: 41704bdf0b am: cf82d2ae6b -s ours 
am skip reason: Merged-In Ic27d0e5f3c6b78db39c6742fe9e1955f65d2b1f5 with SHA-1 a7a11bda00 is already in history

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

Change-Id: I49f50732dddce6689616356fdd571d4cc71a0e7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-22 03:26:23 +00:00
Maciej Żenczykowski
43581c60b0 [automerger skipped] bpfloader: support 'shared' maps and per-map/program selinux context am: 5ed96f4a1a am: fd42c636a5 am: b5c55e9e4b -s ours 
am skip reason: Merged-In I9d7449e477c371053a34191a2a9a935ba927d4b3 with SHA-1 4181713963 is already in history

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

Change-Id: I4a4a433c7cde7071a506c9781b35210fc2c7d5a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-22 03:26:22 +00:00
Maciej Żenczykowski
cf82d2ae6b disable bpfloader selinux_context support am: a529b323af am: 41704bdf0b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bpf/+/19019684

Change-Id: I9f2afcea7a8425ef557b943b94ed04d53ca13a2a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-22 03:09:50 +00:00
Maciej Żenczykowski
b5c55e9e4b bpfloader: support 'shared' maps and per-map/program selinux context am: 5ed96f4a1a am: fd42c636a5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bpf/+/19019683

Change-Id: I02ef9485d0dff36e1dbd070aec547bb42c7b8526
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-22 03:09:49 +00:00
Automerger Merge Worker
1299dc1ad6 Merge changes from topic "am-7b00c416034c4104ac885e1f4ac35b8a" into tm-d1-dev-plus-aosp 
* changes:
  [automerger skipped] disable bpfloader selinux_context support am: a529b323af am: 41704bdf0b -s ours
  [automerger skipped] bpfloader: support 'shared' maps and per-map/program selinux context am: 5ed96f4a1a am: fd42c636a5 -s ours
 2022-06-22 03:09:39 +00:00
Maciej Żenczykowski
395d4dc6f8 [automerger skipped] disable bpfloader selinux_context support am: a529b323af am: 41704bdf0b -s ours 
am skip reason: Merged-In Ic27d0e5f3c6b78db39c6742fe9e1955f65d2b1f5 with SHA-1 a7a11bda00 is already in history

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

Change-Id: I62e4b45a2b88e58eed6238f051caa4e3962a0e33
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-22 03:09:35 +00:00
Maciej Żenczykowski
9319ed5e25 [automerger skipped] bpfloader: support 'shared' maps and per-map/program selinux context am: 5ed96f4a1a am: fd42c636a5 -s ours 
am skip reason: Merged-In I9d7449e477c371053a34191a2a9a935ba927d4b3 with SHA-1 4181713963 is already in history

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

Change-Id: I7449f8b9d719e4ed4eb5fa975ab1abbea128681f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-22 03:09:34 +00:00
Maciej Żenczykowski
016a3e50ab [automerger skipped] disable bpfloader selinux_context support am: a529b323af -s ours am: 8342a26a24 -s ours 
am skip reason: Merged-In Ic27d0e5f3c6b78db39c6742fe9e1955f65d2b1f5 with SHA-1 a7a11bda00 is already in history

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

Change-Id: Ic70037a04eb9ee4f6afae77c497830819b9925c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-22 03:09:31 +00:00
Maciej Żenczykowski
baec5c62ee [automerger skipped] bpfloader: support 'shared' maps and per-map/program selinux context am: 5ed96f4a1a -s ours am: 005e8a84e7 -s ours 
am skip reason: Merged-In I9d7449e477c371053a34191a2a9a935ba927d4b3 with SHA-1 4181713963 is already in history

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

Change-Id: I67c47d72bf1fae56b8f84bebfb32eafc749c23d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-22 03:09:29 +00:00
Maciej Żenczykowski
41704bdf0b disable bpfloader selinux_context support am: a529b323af 
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bpf/+/19019684

Change-Id: Ifabb142536caa93c985af7c7acc8a392b15a3671
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-22 02:45:29 +00:00
Maciej Żenczykowski
fd42c636a5 bpfloader: support 'shared' maps and per-map/program selinux context am: 5ed96f4a1a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bpf/+/19019683

Change-Id: I99b4e5e9a44a5377896d2f84f93fb9ec06c117ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-22 02:45:28 +00:00
Maciej Żenczykowski
8342a26a24 [automerger skipped] disable bpfloader selinux_context support am: a529b323af -s ours 
am skip reason: Merged-In Ic27d0e5f3c6b78db39c6742fe9e1955f65d2b1f5 with SHA-1 a7a11bda00 is already in history

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

Change-Id: Icd767e7c94cd65478dd8c1856582cde40b3497f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-22 02:43:52 +00:00
Maciej Żenczykowski
005e8a84e7 [automerger skipped] bpfloader: support 'shared' maps and per-map/program selinux context am: 5ed96f4a1a -s ours 
am skip reason: Merged-In I9d7449e477c371053a34191a2a9a935ba927d4b3 with SHA-1 4181713963 is already in history

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

Change-Id: I7c5e4f6b29e948ca02df4c77ed3e427a4e3c8043
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-22 02:43:46 +00:00
Maciej Żenczykowski
a529b323af disable bpfloader selinux_context support 
(it requires bpfloader to be granted rename priv by selinux)

Bug: 218408035
Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: Ic27d0e5f3c6b78db39c6742fe9e1955f65d2b1f5
(cherry picked from commit a7a11bda00)
Merged-In: Ic27d0e5f3c6b78db39c6742fe9e1955f65d2b1f5
 2022-06-21 19:58:42 +00:00
Maciej Żenczykowski
5ed96f4a1a bpfloader: support 'shared' maps and per-map/program selinux context 
allow bpf .o files to specify desired selinux context

Bug: 218408035
Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I9d7449e477c371053a34191a2a9a935ba927d4b3
(cherry picked from commit 4181713963)
Merged-In: I9d7449e477c371053a34191a2a9a935ba927d4b3
 2022-06-21 19:58:41 +00:00
Maciej Żenczykowski
b1413298d4 disable bpfloader selinux_context support am: a7a11bda00 am: e4fae2c26e am: 171d699563 am: 332bfb56c3 
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2132533

Change-Id: Ice4f6e302ca3ccf9128caf4e00d8d15511f2fd02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-21 19:16:09 +00:00
Maciej Żenczykowski
7278dbda21 bpfloader: support 'shared' maps and per-map/program selinux context am: 4181713963 am: cf56c97382 am: 9cbabeebf9 am: d3f5e647e4 
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2115562

Change-Id: I543dcbeedd5148e452e89496bed721daab80f5b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-21 19:16:08 +00:00
Maciej Żenczykowski
332bfb56c3 disable bpfloader selinux_context support am: a7a11bda00 am: e4fae2c26e am: 171d699563 
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2132533

Change-Id: Ia648ac5045d00453e244b238621f7768982bd6fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-21 18:53:11 +00:00
Maciej Żenczykowski
d3f5e647e4 bpfloader: support 'shared' maps and per-map/program selinux context am: 4181713963 am: cf56c97382 am: 9cbabeebf9 
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2115562

Change-Id: I1ed3b6c921bccf11d4aa2aa32128cc3c8d5b0118
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-21 18:53:09 +00:00
Maciej Żenczykowski
171d699563 disable bpfloader selinux_context support am: a7a11bda00 am: e4fae2c26e 
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2132533

Change-Id: I2b934cc11d1fa74e85c444fed92ade972a306038
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-21 18:26:12 +00:00
Maciej Żenczykowski
9cbabeebf9 bpfloader: support 'shared' maps and per-map/program selinux context am: 4181713963 am: cf56c97382 
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2115562

Change-Id: Ia2b152d95b5ed42e8ef5cd7db0801c6f211230a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-21 18:26:10 +00:00
Maciej Żenczykowski
e4fae2c26e disable bpfloader selinux_context support am: a7a11bda00 
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2132533

Change-Id: I757e645cb774520d3279fbfd3044e67d7bec3db8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-21 18:07:07 +00:00
Maciej Żenczykowski
cf56c97382 bpfloader: support 'shared' maps and per-map/program selinux context am: 4181713963 
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2115562

Change-Id: I4c5dbb9113b661865726b3373c5dbefe02ab0b08
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-21 18:07:06 +00:00
Maciej Żenczykowski
a7a11bda00 disable bpfloader selinux_context support 
(it requires bpfloader to be granted rename priv by selinux)

Bug: 218408035
Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: Ic27d0e5f3c6b78db39c6742fe9e1955f65d2b1f5
 2022-06-21 09:42:48 -07:00
Maciej Żenczykowski
4181713963 bpfloader: support 'shared' maps and per-map/program selinux context 
allow bpf .o files to specify desired selinux context

Bug: 218408035
Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I9d7449e477c371053a34191a2a9a935ba927d4b3
 2022-06-21 02:23:09 -07:00
Maciej Żenczykowski
be3c8a1cdc [automerger skipped] bpfLoader: verify that reused maps are the right type & shape am: 8482e88f9e am: 5d739dad8f -s ours am: 2a07a8372e -s ours 
am skip reason: Merged-In I9e8a5893ed4f91354f6544be587b10a97d179de6 with SHA-1 8482e88f9e is already in history

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

Change-Id: Id47f894a763932e56dc20184fdbeddf348588476
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-21 03:17:34 +00:00
Automerger Merge Worker
5d7f59efd6 Merge "[automerger skipped] bpfLoader: verify that reused maps are the right type & shape am: 8482e88f9e -s ours am: f75bcf8283 -s ours am: 82ffc6e9a7 -s ours" into tm-qpr-dev-plus-aosp 2022-06-21 03:16:44 +00:00
Maciej Żenczykowski
a3928e7db6 [automerger skipped] bpfLoader: verify that reused maps are the right type & shape am: 8482e88f9e -s ours am: f75bcf8283 -s ours am: 82ffc6e9a7 -s ours 
am skip reason: Merged-In I9e8a5893ed4f91354f6544be587b10a97d179de6 with SHA-1 12bb520707 is already in history

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

Change-Id: I27fcdb86c97e6a0fee091f987fadad82b0be438a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-21 03:16:36 +00:00
Maciej Żenczykowski
2d238dd9a1 [automerger skipped] bpfLoader: verify that reused maps are the right type & shape am: 8482e88f9e am: 5d739dad8f am: 51bc2fb869 -s ours 
am skip reason: Merged-In I9e8a5893ed4f91354f6544be587b10a97d179de6 with SHA-1 12bb520707 is already in history

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

Change-Id: I36c50af8be90af2050d493f8562d21852a14acc1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-21 03:16:29 +00:00
Maciej Żenczykowski
2a07a8372e [automerger skipped] bpfLoader: verify that reused maps are the right type & shape am: 8482e88f9e am: 5d739dad8f -s ours 
am skip reason: Merged-In I9e8a5893ed4f91354f6544be587b10a97d179de6 with SHA-1 8482e88f9e is already in history

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

Change-Id: I469630d9c35a37eeda80dd8478f28d7b2920b51c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-21 03:00:40 +00:00
Maciej Żenczykowski
51bc2fb869 bpfLoader: verify that reused maps are the right type & shape am: 8482e88f9e am: 5d739dad8f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bpf/+/18992185

Change-Id: Ie5b6a3d908316a1e019ae41e8494d54ecb50b368
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-21 03:00:37 +00:00
Maciej Żenczykowski
82ffc6e9a7 [automerger skipped] bpfLoader: verify that reused maps are the right type & shape am: 8482e88f9e -s ours am: f75bcf8283 -s ours 
am skip reason: Merged-In I9e8a5893ed4f91354f6544be587b10a97d179de6 with SHA-1 12bb520707 is already in history

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

Change-Id: I4f3be6a60d0a14ac48f203364edb7f61972b6971
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-21 03:00:07 +00:00