Commit graph

77084 commits

Author SHA1 Message Date
Bart Van Assche
eb19bcb49b Merge "Use the proper memcg directory for the v2 hierarchy" am: c408ee943a
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1975507

Change-Id: Ica1aa14a6518c5c4f4517083531a5da356d77d1f
2022-03-24 04:06:23 +00:00
Bart Van Assche
c408ee943a Merge "Use the proper memcg directory for the v2 hierarchy" 2022-03-24 00:25:47 +00:00
Bart Van Assche
22e17bebe3 Merge "Enable the memory_recursiveprot mount option" am: 3e9eeb8329 am: 842815552f am: 00916cbb6d
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1975508

Change-Id: I994a3bb277e9c3fbe8fb62c23a2f5105b6ca5551
2022-03-23 21:57:06 +00:00
Bart Van Assche
00916cbb6d Merge "Enable the memory_recursiveprot mount option" am: 3e9eeb8329 am: 842815552f
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1975508

Change-Id: I1d9489889815a7b53399db0e3549fcd098975e66
2022-03-23 21:16:26 +00:00
Bart Van Assche
4c95712c9f Use the proper memcg directory for the v2 hierarchy
When using the v1 hierarchy per process memcg directories exist under
/dev/memcg/apps. When using the v2 hierarchy per process memcg
directories exist under /sys/fs/cgroup. Hence this patch that selects
the proper top-level directory depending on the memcg version.

Bug: 213617178
Test: Verified Android operation inside the Cuttlefish emulator.
Change-Id: I7373fb407cb6ad2b1181579691ff54886fd36c24
Signed-off-by: Bart Van Assche <bvanassche@google.com>
2022-03-23 14:12:43 -07:00
Bart Van Assche
842815552f Merge "Enable the memory_recursiveprot mount option" am: 3e9eeb8329
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1975508

Change-Id: Ib570a1b16ea67fff6a8d318ea200777f14d78278
2022-03-23 20:56:27 +00:00
Bart Van Assche
3e9eeb8329 Merge "Enable the memory_recursiveprot mount option" 2022-03-23 20:34:22 +00:00
David Anderson
3d86c2125c Merge "fastboot: Fallback to "raw" partition type if fastboot hal isn't present" am: b51b109ea9 am: 06d9627e76 am: 48e62ef68a
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2005710

Change-Id: Ib80621d92ad0455a2ce35b8569a96d016c7b88b3
2022-03-23 18:53:27 +00:00
David Anderson
48e62ef68a Merge "fastboot: Fallback to "raw" partition type if fastboot hal isn't present" am: b51b109ea9 am: 06d9627e76
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2005710

Change-Id: Iddde7996f7c766be61af7b0fcb6d6c7361833ec4
2022-03-23 18:38:12 +00:00
David Anderson
06d9627e76 Merge "fastboot: Fallback to "raw" partition type if fastboot hal isn't present" am: b51b109ea9
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2005710

Change-Id: Ie251ba25101661df8f36368845bbf9755035211d
2022-03-23 18:22:08 +00:00
David Anderson
b51b109ea9 Merge "fastboot: Fallback to "raw" partition type if fastboot hal isn't present" 2022-03-23 18:09:25 +00:00
Treehugger Robot
04adcd7ff8 Merge "vts_libsnapshot_test: Fix free space calculation." am: f1df9ba5c4 am: 5b9eb5fde0 am: 1123fcd107
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2031284

Change-Id: I10ee2f69aa55dcfaaf15c360392cf4fe9f6ea6b1
2022-03-23 17:42:43 +00:00
Bart Van Assche
4f2e62913d Enable the memory_recursiveprot mount option
Enable the memory_recursiveprot mount option for v2 cgroups because the
v2 memcg documentation mentions the following: "Recursively apply
memory.min and memory.low protection to entire subtrees, without
requiring explicit downward propagation into leaf cgroups.  This allows
protecting entire subtrees from one another, while retaining free
competition within those subtrees. This should have been the default
behavior but is a mount-option to avoid regressing setups relying on the
original semantics (e.g. specifying bogusly high 'bypass' protection
values at higher tree levels)."

Source: https://www.kernel.org/doc/Documentation/admin-guide/cgroup-v2.rst

Bug: 213617178
Test: Verified this change inside the Cuttlefish emulator.
Change-Id: Iecd86109d9ecb9d3354f9d28577b147edf7c50a8
Signed-off-by: Bart Van Assche <bvanassche@google.com>
2022-03-23 10:37:26 -07:00
Treehugger Robot
1123fcd107 Merge "vts_libsnapshot_test: Fix free space calculation." am: f1df9ba5c4 am: 5b9eb5fde0
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2031284

Change-Id: Ie378aa231a1f0915fd00db724a575f9585359b2b
2022-03-23 17:21:21 +00:00
Treehugger Robot
5b9eb5fde0 Merge "vts_libsnapshot_test: Fix free space calculation." am: f1df9ba5c4
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2031284

Change-Id: I0ec3d5c3f02ae607fee2e6de5903db1bc021b974
2022-03-23 17:00:51 +00:00
Treehugger Robot
f1df9ba5c4 Merge "vts_libsnapshot_test: Fix free space calculation." 2022-03-23 16:40:20 +00:00
Treehugger Robot
65b73b10fa Merge "Load kernel modules in parallel" am: a41f3812fd am: 64e73d8b33 am: e427b728bb
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2022817

Change-Id: I15e8c9dec9f66076d3e4c0de6be8f21b3e975efa
2022-03-23 08:25:53 +00:00
Treehugger Robot
e427b728bb Merge "Load kernel modules in parallel" am: a41f3812fd am: 64e73d8b33
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2022817

Change-Id: I1206e849c6ad75ee945a7fbc42f735bbb1db15ba
2022-03-23 08:12:10 +00:00
Treehugger Robot
64e73d8b33 Merge "Load kernel modules in parallel" am: a41f3812fd
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2022817

Change-Id: I86403d68d485775dc58c1d4dd2ffcc2d7aebd05a
2022-03-23 07:55:45 +00:00
Treehugger Robot
a41f3812fd Merge "Load kernel modules in parallel" 2022-03-23 07:40:18 +00:00
Treehugger Robot
52a84a6559 Merge "restorecon /dev/console at the second stage boot" am: 99c892e579 am: fa04ae51a0 am: e92c89410f
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2035768

Change-Id: I6590009119054394729945fe4831432bc37bde6e
2022-03-23 05:18:51 +00:00
Treehugger Robot
e92c89410f Merge "restorecon /dev/console at the second stage boot" am: 99c892e579 am: fa04ae51a0
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2035768

Change-Id: I22dadf285d40cee613b86dd5ce0df67363b0c179
2022-03-23 04:59:26 +00:00
Treehugger Robot
fa04ae51a0 Merge "restorecon /dev/console at the second stage boot" am: 99c892e579
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2035768

Change-Id: If3f1a4883c0b329d225959811665ec616e39f5dd
2022-03-23 04:45:55 +00:00
Treehugger Robot
99c892e579 Merge "restorecon /dev/console at the second stage boot" 2022-03-23 04:29:53 +00:00
Yifan Hong
f764aaf998 storaged: Fix double ownership for HealthInfoCallback.
SharedRefBase objects can only be created via
SharedRefBase::make, not std::make_shared. Otherwise
there'll be a double-ownership problem.

Test: TH
Fixes: 225448524
Change-Id: I856677626cb146eb52a5b4a4562148e899d5a57b
2022-03-22 21:25:28 -07:00
Inseob Kim
89d6913cf2 restorecon /dev/console at the second stage boot
It could be the case that /dev/console is created at the first stage
boot. ueventd doesn't have a permission to relabel from tmpfs to
console_device, so we should try restorecon /dev/console, together with
/dev.

Bug: 193118220
Test: atest MicrodroidHostTestCases
Change-Id: Ic538bc9214d3996fe7b37fa2224c1f0c6eb373d1
2022-03-22 21:51:07 +09:00
Eric Biggers
951a45d58c Merge "init.rc: remove commented-out code that set vold.post_fs_data_done" am: 0c9413d883 am: db4a1e8ae9 am: 1ef9638787
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2035123

Change-Id: Iab5fe1dbec94b469b9fc4a9f021a57811dd0d526
2022-03-22 04:31:40 +00:00
Eric Biggers
1ef9638787 Merge "init.rc: remove commented-out code that set vold.post_fs_data_done" am: 0c9413d883 am: db4a1e8ae9
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2035123

Change-Id: I51b55473b3bdcb37f9576ede2443caf3fa2f84f1
2022-03-22 04:16:40 +00:00
Eric Biggers
db4a1e8ae9 Merge "init.rc: remove commented-out code that set vold.post_fs_data_done" am: 0c9413d883
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2035123

Change-Id: I89774de9b9a493839791aa8715a4e8f66a4557fd
2022-03-22 03:59:49 +00:00
Eric Biggers
0c9413d883 Merge "init.rc: remove commented-out code that set vold.post_fs_data_done" 2022-03-22 03:42:23 +00:00
Treehugger Robot
83aabe1316 Merge "Symbolic constants for older minijails" am: 76bb5f1c6e am: 2ad56d8cc0 am: ef80f20881
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2032582

Change-Id: I878f6004f3c3129698033bf72a3ab93a52605747
2022-03-22 02:26:12 +00:00
Treehugger Robot
6f2a89fb08 Merge "Add libmodprobe to hwasan-postsubmit" am: 38fe7c848c am: 2488876411 am: 17ffbc5a29
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2032710

Change-Id: I738ad11b6c5cf34fa5a3ffba568c1a9d56a86f1d
2022-03-22 02:26:04 +00:00
Treehugger Robot
5f0e1aef0c Merge "Add support for memcg v2 attributes" am: 1f34b28356 am: 7b1723767b am: 2dd8b0b817
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1990494

Change-Id: I2a6a5ab5b853df1a24cdea2136c6ad402f38ead3
2022-03-22 02:25:55 +00:00
Treehugger Robot
ef80f20881 Merge "Symbolic constants for older minijails" am: 76bb5f1c6e am: 2ad56d8cc0
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2032582

Change-Id: I3d82b6591a64265b68a5aa78be3cf57347ca9d52
2022-03-22 02:12:53 +00:00
Treehugger Robot
17ffbc5a29 Merge "Add libmodprobe to hwasan-postsubmit" am: 38fe7c848c am: 2488876411
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2032710

Change-Id: I84e4fbbd3ee4d8576ce245ed38a3a9b4607bed8a
2022-03-22 02:12:45 +00:00
Treehugger Robot
2dd8b0b817 Merge "Add support for memcg v2 attributes" am: 1f34b28356 am: 7b1723767b
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1990494

Change-Id: I744a1c76ea82a2400c492a59f31de731a62cbfeb
2022-03-22 02:12:27 +00:00
Treehugger Robot
2ad56d8cc0 Merge "Symbolic constants for older minijails" am: 76bb5f1c6e
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2032582

Change-Id: I9a9246795472a0576839f69e57aa9f69056db8b7
2022-03-22 02:04:50 +00:00
Treehugger Robot
76bb5f1c6e Merge "Symbolic constants for older minijails" 2022-03-22 02:01:29 +00:00
Treehugger Robot
2488876411 Merge "Add libmodprobe to hwasan-postsubmit" am: 38fe7c848c
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2032710

Change-Id: I13bc669d184c5bde7b70890e6af9d242b04a05b6
2022-03-22 01:57:47 +00:00
Treehugger Robot
7b1723767b Merge "Add support for memcg v2 attributes" am: 1f34b28356
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1990494

Change-Id: I6285033d9acff9bad0a4cabd069960a2cf91cc08
2022-03-22 01:57:24 +00:00
Treehugger Robot
38fe7c848c Merge "Add libmodprobe to hwasan-postsubmit" 2022-03-22 01:42:17 +00:00
Treehugger Robot
1f34b28356 Merge "Add support for memcg v2 attributes" 2022-03-22 01:40:09 +00:00
Treehugger Robot
a38fe7788d Merge "Add keymint to hwasan-postsubmit" am: 948b4a5a8b am: cfea128d73 am: f39356b358
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2032709

Change-Id: I66beeca8f9fcec3829fa6b157f6e9dd0ce8ec516
2022-03-22 01:16:57 +00:00
Treehugger Robot
e15810cf85 Merge "Add etc to hwasan-postsubmit" am: 9f856bf6aa am: 2aacc48761 am: da03c26656
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2032706

Change-Id: Ia44a8a8c22cade46f7981731c794ef8b1a22a5c0
2022-03-22 01:16:23 +00:00
Treehugger Robot
f39356b358 Merge "Add keymint to hwasan-postsubmit" am: 948b4a5a8b am: cfea128d73
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2032709

Change-Id: Ic2f550e03979522652e77a287c2b438c4a868465
2022-03-22 01:02:02 +00:00
Treehugger Robot
da03c26656 Merge "Add etc to hwasan-postsubmit" am: 9f856bf6aa am: 2aacc48761
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2032706

Change-Id: I09a957c4dc170088163a77f16b479b06cb3430a5
2022-03-22 01:01:37 +00:00
Treehugger Robot
cfea128d73 Merge "Add keymint to hwasan-postsubmit" am: 948b4a5a8b
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2032709

Change-Id: I774ecf35b004d708e0872766bd24020e2fbaad0d
2022-03-22 00:45:57 +00:00
Treehugger Robot
2aacc48761 Merge "Add etc to hwasan-postsubmit" am: 9f856bf6aa
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2032706

Change-Id: I4c916fd79cf5fb337be9e928f2a196363ba72329
2022-03-22 00:45:47 +00:00
Treehugger Robot
948b4a5a8b Merge "Add keymint to hwasan-postsubmit" 2022-03-22 00:27:17 +00:00
Treehugger Robot
9f856bf6aa Merge "Add etc to hwasan-postsubmit" 2022-03-22 00:26:02 +00:00