Commit graph

75302 commits

Author SHA1 Message Date
Treehugger Robot
abc0227fcb Merge "[Init] Create dir for odsign metrics" am: 50e130ed73
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2022697

Change-Id: I4273de4a0c78177b1d3b155e339231b093b16ccd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 20:58:49 +00:00
Treehugger Robot
50e130ed73 Merge "[Init] Create dir for odsign metrics" 2022-04-07 20:30:41 +00:00
Treehugger Robot
66231dabac Merge "Setup tests for libtrusty-rs" am: 3153efa864
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2050796

Change-Id: I09fc662e1ddf43dcca26acb323461aea58a8cdcb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 20:06:03 +00:00
Treehugger Robot
3153efa864 Merge "Setup tests for libtrusty-rs" 2022-04-07 19:45:20 +00:00
Treehugger Robot
5875cf416c Merge "Make some debuggerd libraries available in apex com.android.virt" am: c5b7488c63
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2054410

Change-Id: I6d58bc9addcf17906e8a1a42c66c412d4a57bf3c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 13:53:10 +00:00
Treehugger Robot
c5b7488c63 Merge "Make some debuggerd libraries available in apex com.android.virt" 2022-04-07 13:25:45 +00:00
Treehugger Robot
8f9a356bd1 Merge "Clean up comments/logs" am: 02360a55b7
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2057947

Change-Id: Id5dfd2d13fa70f195781784e332e755fcf95fb40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 03:39:50 +00:00
Treehugger Robot
02360a55b7 Merge "Clean up comments/logs" 2022-04-07 03:17:38 +00:00
David LeGare
23dedb660e Setup tests for libtrusty-rs
Test logic is based on the tests in the original tipc-test C binary,
but adapted to use the Rust unit test infrastructure to make running
tests easier.

Test: Ran the tests
Bug: 226659377
Change-Id: I998013b2f8b304299acb09d58beb49330747802a
2022-04-06 21:11:04 +00:00
Kelvin Zhang
f887e74588 Clean up comments/logs
Test: th
Change-Id: Ie63cfab7bf8d5d8e3e91695259cf62ab3ac17ee9
2022-04-06 14:02:13 -07:00
Shikha Panwar
4b91af7d24 [Init] Create dir for odsign metrics
This is required so that system_server can read/delete the file(s) in
/data/misc/odsign/metrics & report to statsd

Note the group change in odsign directory was required so that
system_server can get the execute permission to read file in the sub dir

Test: adb shell ls -l /data/misc/odsign/metrics
Bug: 202926606
Change-Id: I6dd80e05bbfb9daf4aa3e996fc22bba1de8bd2ce
2022-04-06 17:51:08 +00:00
Akilesh Kailash
f57bff7f08 Merge "libsnapshot: OTA upgrade when vendor partition is S" am: a3ab0a41f2
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2052147

Change-Id: I25154844fc8f33658313787ae98a7e5bfdf165b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-05 22:44:16 +00:00
Akilesh Kailash
a3ab0a41f2 Merge "libsnapshot: OTA upgrade when vendor partition is S" 2022-04-05 22:27:03 +00:00
Treehugger Robot
75f4a8723b Merge "Add libtrusty-rs" am: c942dc549a
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2050795

Change-Id: I59888f9e028328c93810fc14c929334f13c733be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-05 21:11:55 +00:00
Treehugger Robot
c942dc549a Merge "Add libtrusty-rs" 2022-04-05 20:54:18 +00:00
Akilesh Kailash
9fc6ee050f libsnapshot: OTA upgrade when vendor partition is S
In Android S, snapuserd binary was on vendor partition.
When there is an OTA update from S -> T, it is possible
that vendor partitions are not updated. In that case,
successive OTA updates T1 -> T2 will continue to have
snapuserd from Android S as vendor partition wasn't updated
to T. All this means, we should disable user-space snapshots.

When installing OTA during runtime, check for property
ro.vendor.build.version.release_or_codename; if the property
is set to "12", then skip userspace-snapshots.

Bug: 227614163

Test: Simulate OTA test on Pixel 6 from T1 -> T2 by forcefully
setting the property to 12 and verify OTA is applied
successfully by falling back to dm-snapshot.

Signed-off-by: Akilesh Kailash <akailash@google.com>
Change-Id: I95f29145e5cd9ffb8d03d28ae414f0037b88be90
2022-04-05 20:23:14 +00:00
Suren Baghdasaryan
34cc1ffb19 Merge "init: try converting writepid used with cgroups into task_profiles command" am: 8330095807
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1740144

Change-Id: Icf112746d01517742d527d16426dc762111ee85b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-05 16:57:49 +00:00
Suren Baghdasaryan
8330095807 Merge "init: try converting writepid used with cgroups into task_profiles command" 2022-04-05 16:37:55 +00:00
Shikha Panwar
757f299842 Make some debuggerd libraries available in apex com.android.virt
Test: Build passed & tested the whole topic
Bug:227443903

Change-Id: I113cd1e559307e191fec405206f23e1b4ce1a5fc
2022-04-05 15:55:16 +00:00
Suren Baghdasaryan
746ede9629 init: try converting writepid used with cgroups into task_profiles command
writepid usage to add a task to a cgroup was deprecated in favor of the
task_profile command. The reason is that writepid hardcodes cgroup path
and makes it hard to change it in the future, whereas task profiles
configure cgroup paths in one centralized place and are easy to change.
Log a warning when writepid is used with cgroups and try converting it
into a task_profiles command for well-known cgroups. If conversion is
not possible the writepid operation will still be attempted to avoid
breaking existing use cases and an error will be logged.

Bug: 191283136
Test: build and boot
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
Change-Id: Ie58393468ef7d92ab0ffb41e6f339e36d21f7478
2022-04-05 01:25:46 +00:00
Treehugger Robot
f96465ea3f Merge "Add Rust wrapper for tombstoned client using cxx." am: fad82b6c15
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2041969

Change-Id: I3981648c34cf7fc318db02ac68c8077af77ff19d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-04 22:59:03 +00:00
Treehugger Robot
fad82b6c15 Merge "Add Rust wrapper for tombstoned client using cxx." 2022-04-04 22:38:40 +00:00
David LeGare
fd343ee2ea Add libtrusty-rs
Test: manual using tipc-test-rs
Bug: 226659377
Change-Id: I4afc24e5a602e7ca85d5c7088fecc211b71bfc66
2022-04-04 19:12:15 +00:00
TreeHugger Robot
f4d5c4771c Merge "Merge Android 12 QPR3 ab/8391262" into stage-aosp-master 2022-04-03 01:59:56 +00:00
Suren Baghdasaryan
a7cf313f2a Merge "init: Treat failure to create a process group as fatal" am: 11602701d4
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2052022

Change-Id: Iab2ccbe29a60c0217b81cc7d26f1039a06441337
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-02 20:32:42 +00:00
Suren Baghdasaryan
11602701d4 Merge "init: Treat failure to create a process group as fatal" 2022-04-02 20:11:45 +00:00
Suren Baghdasaryan
1bd1746447 init: Treat failure to create a process group as fatal
During process startup, system creates a process group and places the
new process in it. If process group creation fails for some reason, the
new child process will stay in its parent's group. This poses danger
when the child is being frozen because the whole group is affected and
its parent is being frozen as well.
Fix this by treating group creation failure as a fatal error which would
prevent the app from starting.

Bug: 227395690
Test: fake group creation failure and confirm service failure to start
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
Change-Id: I83261bef803751759c7fd709bf1ccd33ccad3a0b
2022-04-01 23:32:47 +00:00
Xin Li
f78ef769bb Merge Android 12 QPR3 ab/8391262
Bug: 226662282
Merged-In: I0cad070975c74c1a4814f0e434f93ad81f6e676e
Change-Id: I30a58b4399c60306c3f5dd7ec621bffacdac7057
2022-04-01 20:33:08 +00:00
Florian Mayer
9e67f9302c Merge "Make callback outlive LruCache." am: 6948bbf62c
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2052189

Change-Id: I19a913c34f9563f71098ff2e995c223d93b3aeb1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01 00:38:55 +00:00
Florian Mayer
6948bbf62c Merge "Make callback outlive LruCache." 2022-04-01 00:19:15 +00:00
Treehugger Robot
ee7752efa1 Merge "Add a comment to explain how errno is set" am: b488db911c
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2052049

Change-Id: I1eaf6244fa6f77d93bfdf690f2f3ac1af17dd73a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-31 21:39:51 +00:00
Treehugger Robot
b488db911c Merge "Add a comment to explain how errno is set" 2022-03-31 21:19:14 +00:00
Florian Mayer
e0240d3f61 Make callback outlive LruCache.
The callback can be called by the destructor of LruCache, so it needs to be destructed last.

Bug: 227635615
Change-Id: I7d965a2000c1ec32d9c9e88d25ab0c1ba3e9c739
2022-03-31 20:21:28 +00:00
Bart Van Assche
54136f8bf4 Add a comment to explain how errno is set
Since it is nontrivial which modifies `errno` is modified in
ExecuteForTask(), add a comment that explains this.

Bug: 213617178
Test: Compile-tested only.
Change-Id: I49ce9c8054fdc59e61b2e5f9ffe6f16743a94401
Signed-off-by: Bart Van Assche <bvanassche@google.com>
2022-03-31 11:30:03 -07:00
David Anderson
9097c5ea60 Merge "ueventd: Allow legacy paths in API version 32." am: 48d403a511 am: 7ce7ea098b
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2048646

Change-Id: I0cad070975c74c1a4814f0e434f93ad81f6e676e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-30 22:24:35 +00:00
David Anderson
7ce7ea098b Merge "ueventd: Allow legacy paths in API version 32." am: 48d403a511
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2048646

Change-Id: I6c269c5952652833ebcfbd7b23d9f3600c1d625c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-30 22:07:01 +00:00
David Anderson
48d403a511 Merge "ueventd: Allow legacy paths in API version 32." 2022-03-30 21:45:46 +00:00
Wei Wang
0cafbb6824 Merge "Revert "Migrate the blkio controller to the v2 cgroup hierarchy"" am: 921d266c81 am: a308946663
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2049926

Change-Id: Ie1820b71fc3488c6828f6b6fb9b03c96b266d604
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-30 16:47:21 +00:00
Wei Wang
a308946663 Merge "Revert "Migrate the blkio controller to the v2 cgroup hierarchy"" am: 921d266c81
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2049926

Change-Id: Iab5a3987158f0e856e9acfab76f0cee28d67f173
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-30 16:22:53 +00:00
Wei Wang
921d266c81 Merge "Revert "Migrate the blkio controller to the v2 cgroup hierarchy"" 2022-03-30 16:02:45 +00:00
Bart Van Assche
159563561a Revert "Migrate the blkio controller to the v2 cgroup hierarchy"
Revert "Migrate the blkio controller to the cgroup v2 hierarchy"

Revert "Migrate the blkio controller to the cgroup v2 hierarchy"

Revert "Migrate the blkio controller to the cgroup v2 hierarchy"

Revert submission 1962326-blkio-cgroup-v2

Reason for revert: This set of changes is suspected to have caused a redfin boot time regression for the git_tm-dev branch.

Reverted Changes:
Id18d876b6:Migrate the blkio controller to the cgroup v2 hier...
I7dfa52136:Migrate the blkio controller to the v2 cgroup hier...
I5336167be:Migrate the blkio controller to the cgroup v2 hier...
I3f0131d8f:Migrate the blkio controller to the cgroup v2 hier...
Ibb62b2d4d:Migrate the blkio controller to the cgroup v2 hier...

Bug: 227382327
Bug: 227389363
Change-Id: I6c8183ed1c3044c8947c4fca07799deff98101b3
2022-03-30 14:58:20 +00:00
Andrew Walbran
3b7591248d Add Rust wrapper for tombstoned client using cxx.
Bug: 226162295
Test: atest libtombstoned_client_rust_test
Change-Id: Ibe7c41e2381f0f369a76175d6f71fc60b71cc7d5
2022-03-30 14:17:55 +00:00
Suren Baghdasaryan
20a63b9391 Merge "Revert "Fix the cgroup directory owner in createProcessGroupInternal()"" am: 7c43c6c9a0 am: 71b587a9a5
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2048643

Change-Id: I18994b9b9ebc6d3210973c30193e96cf2174e44a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-30 02:20:43 +00:00
Suren Baghdasaryan
71b587a9a5 Merge "Revert "Fix the cgroup directory owner in createProcessGroupInternal()"" am: 7c43c6c9a0
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2048643

Change-Id: I809ee9bd4d9991f83187948fb4d6f18651d469f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-30 02:04:28 +00:00
Suren Baghdasaryan
7c43c6c9a0 Merge "Revert "Fix the cgroup directory owner in createProcessGroupInternal()"" 2022-03-30 01:48:19 +00:00
Bart Van Assche
8eb7a6edea Revert "Fix the cgroup directory owner in createProcessGroupInternal()"
This reverts commit 812d7698d8.

Reason for revert: this patch is suspected to have caused b/227337425.

Bug: 227337425
Bug: 227331047
Change-Id: I4ae26ccf61ad7c63dacc85da878ba0920736951c
2022-03-30 01:40:50 +00:00
David Anderson
ed1bca4b52 ueventd: Allow legacy paths in API version 32.
Bug: 226699360
Test: manual test
Change-Id: I2602eaa217a2b6cba8a5fb8acd6d5a8a9e3d405e
2022-03-29 17:50:01 -07:00
Treehugger Robot
cd92c351b5 Merge "Tweak linux_glibc properties for musl builds in system/core" am: ec8519e953 am: e06b7e163e
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2044103

Change-Id: Ib595f7b9603da792547e18e1afc0f6ca456a53c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-30 00:37:50 +00:00
Daniel Norman
3156527be1 Merge "Adds an init host lib for use in host_apex_verifier." am: c015f7f96d am: 6d9c7b738d
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2019275

Change-Id: Ic38ddf2f710d5dad9e1b83ca7dee2093fa69b200
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-30 00:37:39 +00:00
Treehugger Robot
e06b7e163e Merge "Tweak linux_glibc properties for musl builds in system/core" am: ec8519e953
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2044103

Change-Id: I495181e0811a02adbd89decd306a83be31ebf74d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-30 00:14:29 +00:00