Commit graph

2146 commits

Author SHA1 Message Date
Maciej Żenczykowski
b57c8a22be bpfloader: remove things already enforced by networking bpf loader am: 50fdc95894 am: e8c2a76dde am: ac228f0824 am: f7603192f1
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2777983

Change-Id: I1daad52aac0abff9ae84a0db979d9faeac61b3b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-10 20:09:49 +00:00
Maciej Żenczykowski
e5a7691ed8 bpfloader: remove support for networking bpf programs am: a00b2ad3df am: b80978b195 am: 01e745199e am: 94ba7893af
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2777982

Change-Id: Id8ec9d70d038d5577616f42e92132e463112dc5f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-10 20:09:43 +00:00
Maciej Żenczykowski
bde473c787 bpfloader: stop loading networking bpf programs am: 0e3a078884 am: b081a5d9c4 am: 909229743b am: d9107452c2
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2777981

Change-Id: I7d434c39dcc1fb6f6bcdb4d61ce8e8383129264e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-10 20:09:37 +00:00
Maciej Żenczykowski
f7603192f1 bpfloader: remove things already enforced by networking bpf loader am: 50fdc95894 am: e8c2a76dde am: ac228f0824
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2777983

Change-Id: I9025292beb28faf5120c49bca372d47b24e6afc6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-10 19:37:52 +00:00
Maciej Żenczykowski
94ba7893af bpfloader: remove support for networking bpf programs am: a00b2ad3df am: b80978b195 am: 01e745199e
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2777982

Change-Id: Ide7e637786bc1ded08a8129e7b9a09fadfd57a63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-10 19:37:49 +00:00
Maciej Żenczykowski
d9107452c2 bpfloader: stop loading networking bpf programs am: 0e3a078884 am: b081a5d9c4 am: 909229743b
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2777981

Change-Id: Ie2273a4f5ec6c6f5d270c092ef3b2ed4b2db2867
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-10 19:37:47 +00:00
Maciej Żenczykowski
ac228f0824 bpfloader: remove things already enforced by networking bpf loader am: 50fdc95894 am: e8c2a76dde
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2777983

Change-Id: Idd70a323a2bce0acc4d49e2d006598df0adf7d1b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-10 18:24:01 +00:00
Maciej Żenczykowski
01e745199e bpfloader: remove support for networking bpf programs am: a00b2ad3df am: b80978b195
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2777982

Change-Id: I6c30bcd5e32afe1e04719a9d358c72a8251aa598
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-10 18:23:58 +00:00
Maciej Żenczykowski
909229743b bpfloader: stop loading networking bpf programs am: 0e3a078884 am: b081a5d9c4
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2777981

Change-Id: Ifdc19e96f98d8240407714258058f660a9455616
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-10 18:23:56 +00:00
Maciej Żenczykowski
e8c2a76dde bpfloader: remove things already enforced by networking bpf loader am: 50fdc95894
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2777983

Change-Id: I6f471e7baaa1a9146b7b4fd76a0039b84e64d7f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-10 17:48:38 +00:00
Maciej Żenczykowski
b80978b195 bpfloader: remove support for networking bpf programs am: a00b2ad3df
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2777982

Change-Id: I2d1a9c08d49c4e0242b3e5d472f45a9a5afcc84a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-10 17:48:35 +00:00
Maciej Żenczykowski
b081a5d9c4 bpfloader: stop loading networking bpf programs am: 0e3a078884
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2777981

Change-Id: I93867fcff4566a3be20cbe26b2e9d352cc3fc59a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-10 17:48:29 +00:00
Elliott Hughes
010bb1fe40 Use libbase properties for a slight simplification. am: 3b0811b786 am: 0228644fa2 am: 4541c2eabf am: a0e307cc4a
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2779648

Change-Id: Ice9bf9a239ea7b2aa8e5a8f45ad2bec0a85d4256
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-10 07:04:54 +00:00
Maciej Żenczykowski
e56c0a2366 bpfloader: remove pointless dependency on libnetdutils am: 0d1d07c1b0 am: 0133896d6c am: f320624f27 am: aebdb6c0c8
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2777980

Change-Id: I5aa8e43026232f4bc3b3ccd7d54e85caac523352
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-10 07:04:51 +00:00
Elliott Hughes
a0e307cc4a Use libbase properties for a slight simplification. am: 3b0811b786 am: 0228644fa2 am: 4541c2eabf
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2779648

Change-Id: I9e4e97cf015e1c7ee071155fc1b07e70cf45d544
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-10 06:29:54 +00:00
Maciej Żenczykowski
aebdb6c0c8 bpfloader: remove pointless dependency on libnetdutils am: 0d1d07c1b0 am: 0133896d6c am: f320624f27
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2777980

Change-Id: Id8438dfe8aed04dce982f04c91972d6f39818ddb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-10 06:29:50 +00:00
Elliott Hughes
4541c2eabf Use libbase properties for a slight simplification. am: 3b0811b786 am: 0228644fa2
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2779648

Change-Id: If5fdf5d48859808314a6b34c59e3f122687c0741
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-10 05:38:17 +00:00
Maciej Żenczykowski
f320624f27 bpfloader: remove pointless dependency on libnetdutils am: 0d1d07c1b0 am: 0133896d6c
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2777980

Change-Id: Ia1906eda8a785a1ae574b34db3f40926a095068f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-10 05:38:15 +00:00
Elliott Hughes
0228644fa2 Use libbase properties for a slight simplification. am: 3b0811b786
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2779648

Change-Id: Ie38e902784dc28e049159dceeeabef42016da60f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-10 05:05:39 +00:00
Maciej Żenczykowski
0133896d6c bpfloader: remove pointless dependency on libnetdutils am: 0d1d07c1b0
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2777980

Change-Id: Ic14a52c39cde87910dc89e262ebd8093fb691456
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-10 05:05:36 +00:00
Maciej Żenczykowski
50fdc95894 bpfloader: remove things already enforced by networking bpf loader
There is no need / benefit to do(ing) it twice, so might as well
remove it from the non-mainline location.

Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I9887d983714903731f26c9d2478983d8276bfdba
2023-10-10 02:31:23 +00:00
Maciej Żenczykowski
a00b2ad3df bpfloader: remove support for networking bpf programs
The one's we leave are exactly the set which was previously
allowed from locations outside of the tethering apex.

Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: Idd1f8b598127081132dd3e5b106d151b40c47788
2023-10-10 02:31:15 +00:00
Maciej Żenczykowski
0e3a078884 bpfloader: stop loading networking bpf programs
(note: bpf.progs_loaded is set by the network bpf loader)

Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: Ie1a906f31afacd656fcaa402ff348955c5f510b0
2023-10-10 02:31:07 +00:00
Elliott Hughes
3b0811b786 Use libbase properties for a slight simplification.
Test: treehugger
Change-Id: I78f7fb43665640cd6869bfde217f60f19bf0cfa1
2023-10-10 02:30:40 +00:00
Maciej Żenczykowski
0d1d07c1b0 bpfloader: remove pointless dependency on libnetdutils
Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I7ba11432aa2b1b50fce08183f39642d02efd69e1
2023-10-08 23:45:34 -07:00
Maciej Żenczykowski
5e323c5d90 bpfRingbufProg: use named values not raw true/false values. am: 4038b8f63e am: e494e48e6d am: f6848a8d3c am: 1acdaea2af
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2777856

Change-Id: I3937e0ed3bda2241bb5c7cc224f3ce88076af50d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-07 08:04:58 +00:00
Maciej Żenczykowski
1acdaea2af bpfRingbufProg: use named values not raw true/false values. am: 4038b8f63e am: e494e48e6d am: f6848a8d3c
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2777856

Change-Id: I5e6d5c4ee322d9da60bbab0d0ac0198d392dd135
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-07 07:30:03 +00:00
Maciej Żenczykowski
f6848a8d3c bpfRingbufProg: use named values not raw true/false values. am: 4038b8f63e am: e494e48e6d
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2777856

Change-Id: I17e94caa81b7d8cca9b016f420fa508e7179501b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-07 06:58:26 +00:00
Maciej Żenczykowski
e494e48e6d bpfRingbufProg: use named values not raw true/false values. am: 4038b8f63e
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2777856

Change-Id: Ia54f2fdd7a4d227fdff7c1c8a2f7fb8e68453ae1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-07 06:26:03 +00:00
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
af959fcc2d bpfloader: require 64-bit userspace on 6.2+ kernels am: ce66750cb6 am: f8c974e7f4 am: dd4385122d am: c76a982391
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2750990

Change-Id: Ib88f96dd6380ddb7e0024ef35c1187a826de1807
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-14 16:42:47 +00:00
Maciej Żenczykowski
c76a982391 bpfloader: require 64-bit userspace on 6.2+ kernels am: ce66750cb6 am: f8c974e7f4 am: dd4385122d
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2750990

Change-Id: I14c8ea333c5c84f1a9393f4fb7df9a5e078f198c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-14 16:04:21 +00:00
Maciej Żenczykowski
dd4385122d bpfloader: require 64-bit userspace on 6.2+ kernels am: ce66750cb6 am: f8c974e7f4
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2750990

Change-Id: I5d02732eddb81f3365d389f1d01746abf02bfabc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-14 15:14:24 +00: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
d6b3444800 bpfloader: 4.19+ required error message "Android V" -> "Android U QPR2" am: 0156d6e2ba am: 6d37008f7f am: 13ca91ce20 am: 7b5654fb55
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2751705

Change-Id: I6b33c96ab7405ac891fb39d02bb25e1130b0f4cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-14 02:15:52 +00:00
Maciej Żenczykowski
7b5654fb55 bpfloader: 4.19+ required error message "Android V" -> "Android U QPR2" am: 0156d6e2ba am: 6d37008f7f am: 13ca91ce20
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2751705

Change-Id: Ie8ab7707947ad22215a8bd5038921e5a111c26b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-14 01:36:03 +00:00
Maciej Żenczykowski
13ca91ce20 bpfloader: 4.19+ required error message "Android V" -> "Android U QPR2" am: 0156d6e2ba am: 6d37008f7f
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2751705

Change-Id: I6f0b94c7782fd71b04770347b7ead1531f2a5d4b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-14 00:45:55 +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
6e4ab8933a bpfloader: remove btf support am: b44e287ed0 am: 5216425124 am: 839276dcd8 am: 284b3c661d
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2624709

Change-Id: I38bc14cec6c08a666dfe0ee456b68b03f6da55a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-13 08:44:20 +00:00
Maciej Żenczykowski
284b3c661d bpfloader: remove btf support am: b44e287ed0 am: 5216425124 am: 839276dcd8
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2624709

Change-Id: If308eabf390b18c28b5915ca548432b874b4ff20
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-13 08:02:20 +00:00
Maciej Żenczykowski
839276dcd8 bpfloader: remove btf support am: b44e287ed0 am: 5216425124
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2624709

Change-Id: Ic75b0e013e51f4ba94758e42276d8fc840a4bcf3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-13 07:12:37 +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
Treehugger Robot
2690b474e8 Merge "bpfloader: Android V requires kernel 4.19+" into main am: 61b8ba3611 am: fd80e33468 am: e8e0a7fbe7 am: d0451c7fcc
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2749573

Change-Id: Id4dd011d485201bf2050cd7d4f9a414810138abf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-13 06:10:14 +00:00
Treehugger Robot
d0451c7fcc Merge "bpfloader: Android V requires kernel 4.19+" into main am: 61b8ba3611 am: fd80e33468 am: e8e0a7fbe7
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2749573

Change-Id: I86e2dcfccbfb803825c7256ffad9360fc89cbb17
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-13 04:43:01 +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
e8e0a7fbe7 Merge "bpfloader: Android V requires kernel 4.19+" into main am: 61b8ba3611 am: fd80e33468
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2749573

Change-Id: Ib0bcc95df8e20160d7bbd67ec3bcaac27e7237d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-13 03:03:42 +00: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