Xin Li
087d2814ff
[automerger skipped] Skip ab/6749736 in stage. am: 1c03504660
-s ours am: 6913dfab73
-s ours am: e172920520
-s ours
...
am skip reason: Change-Id I90fe97de22008bfd80d121fe2d9c46e8591b4fa2 with SHA-1 b07faf770e
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bpf/+/12797502
Change-Id: I7ba161700b811ff17fc66526e0525cdddabaf8c0
2020-10-09 06:06:19 +00:00
Xin Li
e172920520
[automerger skipped] Skip ab/6749736 in stage. am: 1c03504660
-s ours am: 6913dfab73
-s ours
...
am skip reason: Change-Id I90fe97de22008bfd80d121fe2d9c46e8591b4fa2 with SHA-1 b07faf770e
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bpf/+/12797502
Change-Id: I2a5b5c856e51a29747b7da4a272cddb6aee38781
2020-10-09 04:17:52 +00:00
Xin Li
6913dfab73
[automerger skipped] Skip ab/6749736 in stage. am: 1c03504660
-s ours
...
am skip reason: Change-Id I90fe97de22008bfd80d121fe2d9c46e8591b4fa2 with SHA-1 b07faf770e
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bpf/+/12797502
Change-Id: I226c9426164230d2a2f585eba1546a73d676867e
2020-10-09 03:39:55 +00:00
Xin Li
1c03504660
Skip ab/6749736 in stage.
...
Merged-In: I90fe97de22008bfd80d121fe2d9c46e8591b4fa2
Change-Id: Ib1dc57e74cbb0869764c790acb068545cb013f94
2020-10-08 17:23:55 -07:00
Hungming Chen
383952dcb1
Load BPF programs from system and mainline folder am: 4b8e982fae
am: ea0fe1584f
am: 5cc8270e23
am: 20cc4c86ed
am: 916a1a7dbc
...
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/1424248
Change-Id: Ia4b514f70599a54d7bd24da8a670eb35a7b6ae36
2020-09-18 06:50:05 +00:00
Hungming Chen
916a1a7dbc
Load BPF programs from system and mainline folder am: 4b8e982fae
am: ea0fe1584f
am: 5cc8270e23
am: 20cc4c86ed
...
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/1424248
Change-Id: I15af9e61dfd098fbac449b2c758559065f7805a1
2020-09-18 06:12:51 +00:00
Hungming Chen
20cc4c86ed
Load BPF programs from system and mainline folder am: 4b8e982fae
am: ea0fe1584f
am: 5cc8270e23
...
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/1424248
Change-Id: Idd27dbb323488257126b5ae7f3b929a939f5e3d9
2020-09-18 05:36:25 +00:00
Hungming Chen
5cc8270e23
Load BPF programs from system and mainline folder am: 4b8e982fae
am: ea0fe1584f
...
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/1424248
Change-Id: I87fe09b0dfdac5e6bff2d53a22b9dc4477d40b58
2020-09-18 04:56:57 +00:00
Hungming Chen
ea0fe1584f
Load BPF programs from system and mainline folder am: 4b8e982fae
...
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/1424248
Change-Id: I358583155b75dedda0d94b76da49145665590178
2020-09-18 04:27:28 +00:00
Hungming Chen
4b8e982fae
Load BPF programs from system and mainline folder
...
Test: flash and boot successfully
Change-Id: Ia1a713024686c36e34f7cf525a284abc00fe56e2
2020-09-17 11:38:53 +08:00
Maciej Żenczykowski
743a52a3ad
[automerger skipped] start bpfloader asynchronously am: 5a0fdfa8e8
am: 4b3c8add53
-s ours
...
am skip reason: Change-Id Id62009a9f888ce2092b8a1e7aef24ae4224109d5 with SHA-1 5a0fdfa8e8
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bpf/+/11983040
Change-Id: Ie3ccef1c550c347d891517568a7b63a8929055d3
2020-09-16 08:39:46 +00:00
Maciej Żenczykowski
7a5de7bea6
[automerger skipped] launch bpfloader earlier, and reboot the device on bpfloader failure am: 20f74bc41a
am: d3f2961b00
-s ours
...
am skip reason: Change-Id If11d491d78958ff18290e826011d2593f58d217d with SHA-1 20f74bc41a
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bpf/+/11980907
Change-Id: I74db09cefb597ebd27c8d1d979c02ff54b004622
2020-09-16 08:34:17 +00:00
Maciej Żenczykowski
8817ee59ad
[automerger skipped] waitForProgsLoaded() - reduce log spaminess am: 2d12844a4e
am: c86d75c650
-s ours
...
am skip reason: Change-Id I77b82bf44141df8ffab1d11d01a89c3927fbe827 with SHA-1 2d12844a4e
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bpf/+/11920083
Change-Id: Id13a69fbe9e8010a01a538776ac82bd517cffc07
2020-09-16 08:30:26 +00:00
Maciej Żenczykowski
4c87a2f119
[automerger skipped] implement support for functions which may optionally fail to load am: 2464ddb0df
am: bce7b7f688
-s ours
...
am skip reason: Change-Id I50b292c061b05fc8f4b4b8574f128345c45c78db with SHA-1 2464ddb0df
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bpf/+/11905498
Change-Id: Ia290eb1168a30c2dea99b29955006950830b4c5b
2020-09-16 08:09:15 +00:00
Maciej Żenczykowski
3fd7f7e5cf
[automerger skipped] Warn loudly and do not set bpf.progs_loaded property on critical bpf load failure. am: 45f5ffd167
am: eaa7cc3d8c
-s ours
...
am skip reason: Change-Id Iefa01e60cd0a9a223e96411726a199bfb4857a5a with SHA-1 45f5ffd167
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bpf/+/11859851
Change-Id: I6e1016d95bb449d2c1962b920324e1aa9c30a427
2020-09-16 07:59:36 +00:00
TreeHugger Robot
a8e68574c8
[automerger skipped] Merge "allow tagging a bpf .o as critical" into rvc-dev am: 731e9939e6
am: 6749e30256
-s ours
...
am skip reason: Change-Id Ie07549528800d6d7c5ff7f12b859702113d7194e with SHA-1 8586589c26
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bpf/+/11859850
Change-Id: I111d1910af64bffbcfd3ebf75e361eb557e686af
2020-09-12 23:30:30 +00:00
Maciej Żenczykowski
65ad7738cb
[automerger skipped] only set 'bpf.progs_loaded' property on eBPF capable devices... am: 007c9dd245
am: 241a842818
-s ours
...
am skip reason: Change-Id Iddabcf56c187ea518dd2e4d8db451b2f6902aa8e with SHA-1 007c9dd245
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bpf/+/11859849
Change-Id: I4ea950951e551d648f0461eb568a4e03d81bb77e
2020-09-12 23:30:28 +00:00
Xin Li
b48240ef78
[automerger skipped] Mark Android R (rvc-dev-plus-aosp-without-vendor@6692709) as merged am: 0afd92cb3a
-s ours am: 3c36540323
-s ours am: 7edad4a869
-s ours am: 9db2ddb684
-s ours
...
am skip reason: Change-Id I722aedc00409b8931c6d05efea4342279d32a7cf with SHA-1 0c7e97eb67
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bpf/+/12470023
Change-Id: I47f636cef640e3caf23f3768d0f6dd3d85534ee8
2020-08-27 20:13:35 +00:00
Xin Li
9db2ddb684
[automerger skipped] Mark Android R (rvc-dev-plus-aosp-without-vendor@6692709) as merged am: 0afd92cb3a
-s ours am: 3c36540323
-s ours am: 7edad4a869
-s ours
...
am skip reason: Change-Id I722aedc00409b8931c6d05efea4342279d32a7cf with SHA-1 0c7e97eb67
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bpf/+/12470023
Change-Id: I662ff9e242c1108e62058ff0c3070d5b367fbd3a
2020-08-27 19:25:39 +00:00
Xin Li
7edad4a869
[automerger skipped] Mark Android R (rvc-dev-plus-aosp-without-vendor@6692709) as merged am: 0afd92cb3a
-s ours am: 3c36540323
-s ours
...
am skip reason: Change-Id I722aedc00409b8931c6d05efea4342279d32a7cf with SHA-1 0c7e97eb67
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bpf/+/12470023
Change-Id: I20180e1e01e8ef1e27330d70b3c4fa55926f1437
2020-08-27 19:02:56 +00:00
Xin Li
3c36540323
[automerger skipped] Mark Android R (rvc-dev-plus-aosp-without-vendor@6692709) as merged am: 0afd92cb3a
-s ours
...
am skip reason: Change-Id I722aedc00409b8931c6d05efea4342279d32a7cf with SHA-1 0c7e97eb67
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bpf/+/12470023
Change-Id: I4da34894dba42e4361157637c9f701545220eae5
2020-08-27 18:34:12 +00:00
Xin Li
0afd92cb3a
Mark Android R (rvc-dev-plus-aosp-without-vendor@6692709) as merged
...
Bug: 166295507
Merged-In: I722aedc00409b8931c6d05efea4342279d32a7cf
Change-Id: Ib95718b5c7d73700055185598bd7a38e65ec7162
2020-08-27 09:44:20 -07:00
Maciej Żenczykowski
e34bf981b5
reduce error to warning - happens for valid progs-section-less programs am: 21f34cb32c
am: c2fe18428e
am: c44910988a
am: b07faf770e
am: 8e2769dfb2
...
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/1387317
Change-Id: I315d70f32fd9b3a2db8e3817b83d6516f498b70b
2020-08-05 06:01:25 +00:00
Maciej Żenczykowski
8e2769dfb2
reduce error to warning - happens for valid progs-section-less programs am: 21f34cb32c
am: c2fe18428e
am: c44910988a
am: b07faf770e
...
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/1387317
Change-Id: I5bb1798a427cff5808694b1bff59bd6f305f46d3
2020-08-05 05:42:48 +00:00
Maciej Żenczykowski
b07faf770e
reduce error to warning - happens for valid progs-section-less programs am: 21f34cb32c
am: c2fe18428e
am: c44910988a
...
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/1387317
Change-Id: I90fe97de22008bfd80d121fe2d9c46e8591b4fa2
2020-08-05 05:27:03 +00:00
Maciej Żenczykowski
c44910988a
reduce error to warning - happens for valid progs-section-less programs am: 21f34cb32c
am: c2fe18428e
...
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/1387317
Change-Id: I7fe99e96e540fad1a2a84927079c7fdcf8651b2c
2020-08-05 05:03:37 +00:00
Maciej Żenczykowski
c2fe18428e
reduce error to warning - happens for valid progs-section-less programs am: 21f34cb32c
...
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/1387317
Change-Id: I9eeda4fd182fe18b3dd7191092b5a7406eafa594
2020-08-05 04:46:57 +00:00
Maciej Żenczykowski
21f34cb32c
reduce error to warning - happens for valid progs-section-less programs
...
07-21 01:39:43.946 26835 26835 E LibBpfLoader: No progs section could be found in elf object
07-21 01:39:43.951 26835 26835 I bpfloader: Loaded object: /system/etc/bpf/clatd.o
07-21 01:39:43.955 26835 26835 I bpfloader: Loaded object: /system/etc/bpf/offload.o
07-21 01:39:43.958 26835 26835 I bpfloader: Loaded object: /system/etc/bpf/time_in_state.o
07-21 01:39:43.967 26835 26835 I bpfloader: Loaded object: /system/etc/bpf/netd.o
Test: build, atest
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: Ie8413509f76741a66a4b00f0131a58e7ebdbae3f
2020-08-05 03:39:17 +00:00
Maciej Żenczykowski
d2462a1c81
bpfloader: sleep 20 seconds on failure am: 07b874481f
am: 6841c2b102
am: 2c450121a5
am: acb5ea3607
am: e226d0794a
...
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/1363957
Change-Id: Id585045c006bcd12a4fff05640bd27201440d95b
2020-08-04 09:00:50 +00:00
Maciej Żenczykowski
e226d0794a
bpfloader: sleep 20 seconds on failure am: 07b874481f
am: 6841c2b102
am: 2c450121a5
am: acb5ea3607
...
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/1363957
Change-Id: Ia617f650ee3380676318186dafc47138f7e22406
2020-08-04 08:36:42 +00:00
Maciej Żenczykowski
acb5ea3607
bpfloader: sleep 20 seconds on failure am: 07b874481f
am: 6841c2b102
am: 2c450121a5
...
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/1363957
Change-Id: I5d128373f2a9ed38ee0404781c17918a771fcbb3
2020-08-04 08:09:50 +00:00
Maciej Żenczykowski
2c450121a5
bpfloader: sleep 20 seconds on failure am: 07b874481f
am: 6841c2b102
...
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/1363957
Change-Id: I97add5d5d0935dcf43ddd5c77f6c52e802fd8b18
2020-08-04 07:45:28 +00:00
Maciej Żenczykowski
6841c2b102
bpfloader: sleep 20 seconds on failure am: 07b874481f
...
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/1363957
Change-Id: I99f4bd43bb9f8f8310c00e5c30b1344170525ade
2020-08-04 07:23:33 +00:00
Maciej Żenczykowski
07b874481f
bpfloader: sleep 20 seconds on failure
...
(should make it easier to observe logs via adb)
Test: atest, TreeHugger
Bug: 150040815
Bug: 160546011
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I20d6ede4ddf516a91c707aa08cf3a92aed39b03b
2020-07-15 01:44:12 -07:00
Automerger Merge Worker
f13fe51a02
Merge "Merge "[automerger skipped] start bpfloader asynchronously am: 5a0fdfa8e8
-s ours am: 0c7e97eb67
-s ours" into rvc-d1-dev-plus-aosp am: 6315593649
-s ours" into rvc-qpr-dev-plus-aosp am: 240808d444
-s ours
...
am skip reason: Change-Id Id62009a9f888ce2092b8a1e7aef24ae4224109d5 with SHA-1 5a0fdfa8e8
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bpf/+/11983040
Change-Id: I5b1aa7dec924f21d64a5ac5781ad23314f8d988c
2020-06-24 09:55:53 +00:00
Automerger Merge Worker
7537e1c299
Merge "[automerger skipped] start bpfloader asynchronously am: 5a0fdfa8e8
am: 372cc578d3
am: 81b26a8a96
-s ours" into rvc-qpr-dev-plus-aosp am: 58511ca53d
-s ours
...
am skip reason: Change-Id Id62009a9f888ce2092b8a1e7aef24ae4224109d5 with SHA-1 5a0fdfa8e8
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bpf/+/11983040
Change-Id: I87b011adbe204bd94b6767378018e5d2c9ad5c98
2020-06-24 09:55:46 +00:00
Maciej Żenczykowski
caff637000
[automerger skipped] start bpfloader asynchronously am: 5a0fdfa8e8
am: 372cc578d3
-s ours am: 868e83c89b
-s ours am: bcb973e50d
-s ours
...
am skip reason: Change-Id Id62009a9f888ce2092b8a1e7aef24ae4224109d5 with SHA-1 838b81de8f
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bpf/+/11983040
Change-Id: Id30fa3b26fb9b97259b421383cba2b518e6e4a37
2020-06-24 09:55:31 +00:00
Automerger Merge Worker
240808d444
Merge "Merge "[automerger skipped] start bpfloader asynchronously am: 5a0fdfa8e8
-s ours am: 0c7e97eb67
-s ours" into rvc-d1-dev-plus-aosp am: 6315593649
-s ours" into rvc-qpr-dev-plus-aosp
2020-06-24 09:48:57 +00:00
Automerger Merge Worker
58511ca53d
Merge "[automerger skipped] start bpfloader asynchronously am: 5a0fdfa8e8
am: 372cc578d3
am: 81b26a8a96
-s ours" into rvc-qpr-dev-plus-aosp
2020-06-24 09:48:54 +00:00
Automerger Merge Worker
1d43aedb99
Merge "[automerger skipped] start bpfloader asynchronously am: 5a0fdfa8e8
-s ours am: 0c7e97eb67
-s ours" into rvc-d1-dev-plus-aosp am: 6315593649
-s ours
...
am skip reason: Change-Id Id62009a9f888ce2092b8a1e7aef24ae4224109d5 with SHA-1 5a0fdfa8e8
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bpf/+/11983040
Change-Id: Ied718868012e448c351e2a0d5cfa1130bc91830e
2020-06-24 09:48:53 +00:00
Maciej Żenczykowski
0ebe38f2ac
[automerger skipped] start bpfloader asynchronously am: 5a0fdfa8e8
am: 372cc578d3
am: 81b26a8a96
-s ours
...
am skip reason: Change-Id Id62009a9f888ce2092b8a1e7aef24ae4224109d5 with SHA-1 838b81de8f
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bpf/+/11983040
Change-Id: I2af0cdd0f657860ad9d470b948dff1214b5f7e5d
2020-06-24 09:48:50 +00:00
Maciej Żenczykowski
bcb973e50d
[automerger skipped] start bpfloader asynchronously am: 5a0fdfa8e8
am: 372cc578d3
-s ours am: 868e83c89b
-s ours
...
am skip reason: Change-Id Id62009a9f888ce2092b8a1e7aef24ae4224109d5 with SHA-1 838b81de8f
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bpf/+/11983040
Change-Id: Ibc13ea916875977cd4c53bf8a4a41249901da45c
2020-06-24 09:48:44 +00:00
Automerger Merge Worker
6315593649
Merge "[automerger skipped] start bpfloader asynchronously am: 5a0fdfa8e8
-s ours am: 0c7e97eb67
-s ours" into rvc-d1-dev-plus-aosp
2020-06-24 09:35:50 +00:00
Maciej Żenczykowski
6f781c09f1
[automerger skipped] start bpfloader asynchronously am: 5a0fdfa8e8
-s ours am: 0c7e97eb67
-s ours
...
am skip reason: Change-Id Id62009a9f888ce2092b8a1e7aef24ae4224109d5 with SHA-1 838b81de8f
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bpf/+/11983040
Change-Id: Idfbad27d416fba7f31c89269170e106c2285ae46
2020-06-24 09:35:46 +00:00
Maciej Żenczykowski
81b26a8a96
start bpfloader asynchronously am: 5a0fdfa8e8
am: 372cc578d3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bpf/+/11983040
Change-Id: Ib67e7bfbad7b1a6584428f985654e3332bc294ee
2020-06-24 09:35:41 +00:00
Maciej Żenczykowski
868e83c89b
[automerger skipped] start bpfloader asynchronously am: 5a0fdfa8e8
am: 372cc578d3
-s ours
...
am skip reason: Change-Id Id62009a9f888ce2092b8a1e7aef24ae4224109d5 with SHA-1 838b81de8f
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bpf/+/11983040
Change-Id: I948ef768392a50e54ffd5023425e7927dbcfb1f2
2020-06-24 09:35:35 +00:00
Maciej Żenczykowski
4b3c8add53
start bpfloader asynchronously am: 5a0fdfa8e8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bpf/+/11983040
Change-Id: Ic872e3fbe02a505a98c53cfe4d393105bff814d6
2020-06-24 09:15:44 +00:00
Maciej Żenczykowski
0c7e97eb67
[automerger skipped] start bpfloader asynchronously am: 5a0fdfa8e8
-s ours
...
am skip reason: Change-Id Id62009a9f888ce2092b8a1e7aef24ae4224109d5 with SHA-1 838b81de8f
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bpf/+/11983040
Change-Id: I722aedc00409b8931c6d05efea4342279d32a7cf
2020-06-24 09:15:21 +00:00
Maciej Żenczykowski
372cc578d3
start bpfloader asynchronously am: 5a0fdfa8e8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bpf/+/11983040
Change-Id: I0abbf6b818cf8ccade8837b4cf8ed26023da4760
2020-06-24 09:15:17 +00:00
Maciej Żenczykowski
cd68437868
Revert "start bpfloader asynchronously" am: 2a775a423a
am: d230ef3812
am: af08072d80
am: c1e8235d07
am: 73529ab255
...
Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/1347790
Change-Id: I300e2318ff581354fba7f83f6dcec68198569679
2020-06-24 08:30:58 +00:00