[pull] master from aosp-mirror:master #562
Open
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…829a951 Original change: https://android-review.googlesource.com/c/platform/system/core/+/3474240 Change-Id: Idfac3e476d6c4ae90fba7b65da68e268346c9966 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Bug: 393978923 Test: th Change-Id: I7d51eab0ba27a487b853037a62b0884726da58dd
Bug: 394150111 Test: apply_update Change-Id: I4db0232f4552dc58c88f2e8d5a29cef18f5399ce Signed-off-by: Akilesh Kailash <akailash@google.com>
Test: none Change-Id: Ie4c218fe51b13407137c4374fe641f1818124fac Signed-off-by: Jason Chiu <jasoncschiu@google.com>
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3458941 Change-Id: If1cfe4c0afe240150eb885d34a845eee725c16df Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
…d6a3 Original change: https://android-review.googlesource.com/c/platform/system/core/+/3475911 Change-Id: I508ee27a97d8f0a5fc8d3bebf72c1a0e723f491b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
…099460c Original change: https://android-review.googlesource.com/c/platform/system/core/+/3476610 Change-Id: I84b81b2816978687c922884db804c3b652410a90 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This was mistakenly removed while removing usercreds Bug: 394441256 Test: system/core/fs_mgr/tests/adb-remount-test.sh and manual confirmation from bug reporter that bug has gone Change-Id: I80934faf4f4f70d9988edfacf879b9fa89b02eb1
two rules are defined to be used in vendor apex: - one for keymint in Trusty TEE - one for keymint in Trusty AVF VM Bug: 392769828 Test: lunch qemu-generic-arm64-gicv3-test-debug Change-Id: I049f4aec38e6d16d6a64faeb54a8701db6f296ba
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3480097 Change-Id: If30c2285fa1319dd473e667eedbb832b9daee733 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
…x" into main am: babce93 Original change: https://android-review.googlesource.com/c/platform/system/core/+/3474575 Change-Id: I5cf9f723d6cafe3560b17ef580f93709152cb02e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
- skip BootReasonStrToReason() if device boot up from shipmode
- skip BootReasonAddToHistory() if device boot up from shipmode
and system_boot_reason is factory_reset or ota
Bug: 349723310
Test: verify sys.boot.reason work as expected if
device boot up from shipmode
Change-Id: I4279deae8c14977c684b5b77035f16fb1b20ed71
Signed-off-by: Jason Chiu <jasoncschiu@google.com>
For android15-6.6 and later kernels, for 4kb page size kernel variants include the substring "-4k". The 16kb page size kernels omit this substring. So update modprobe to check for the `-4k` substring when the kernel modules are under the folder `/lib/modules/$UTS_RELEASE` for android15-6.6 and later. This fixes loading pkvm modules when booting kernel images packaged from the kernel tree. For Android platform images, the kernel modules are directly under `/lib/modules` and therefore _pgagnostic targets are not affected by this. Test: boot sb3 with v6.1 Test: boot sb3 with v6.12 and 16kb pages Bug: 340631213 Change-Id: I657ec9cf5cefd7d9831a7f5d2453fb21acc6d3be
…de" into main am: f2bb4d1 Original change: https://android-review.googlesource.com/c/platform/system/core/+/3458559 Change-Id: I0c958d40ab02ec72ea1cfca003aa1fc7145ca1a5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
…OWNERS" into main
…OWNERS" into main am: ec5ee47 Original change: https://android-review.googlesource.com/c/platform/system/core/+/3449688 Change-Id: I8e50ddd083a7eb6cdf7fbfb7e919577cbfaf1ee7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
253b758 Original change: https://android-review.googlesource.com/c/platform/system/core/+/3205777 Change-Id: I15600788f9999cbc0f28b3dc51879491822dff99 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
…1164 Original change: https://android-review.googlesource.com/c/platform/system/core/+/3205086 Change-Id: I710a5eb09faf6228617cdb4375b3792146e8a2c5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Bug: 392489757 Test: launch_cvd --secure_hals=guest_keymint_trusty_insecure Change-Id: Icb3210012d04b13eec54858d3304c64eb9a0c4a8
This reverts commit 84efbc5. Reason for revert: Droidmonitor created revert due to b/404901840. Will be verifying through ABTD before submission. Change-Id: I92ac8a1868753758f082ad20fd5967da7bbb1701
Instead of creating new threads in each run, reuse same threads to load the modules and we can keep the utilization of threads and cpufreq higher. And let subthreads dedicated to loading modules in parallel or alone, main thread only needs to update independent module pool. this architecture should be simpler and more readable. Bug: 402263126 Change-Id: If3f07a18cd7c43132ff799d32786d2466f3110f1 Signed-off-by: Chungkai Mei <chungkai@google.com>
Enable per-PID memcgs by default. Vendor overrides to alternate MaxActivationDepths are supported in Android 16. Overrides to memcg v1 are also supported in Android 16. [1] In Android 17 these overrides are not likely to be supported. [1] https://source.android.com/docs/core/perf/cgroups#per-api-level-task-profiles Bug: 386797284 Change-Id: Ia2107ac2244dcd9d05c918fe964529d0f83a13cf
`mm_filemap_add_to_page_cache` event has a different formatting depending on whether the version of kernel is 5.x or 6.x. 1. 5.x has a `page=` section after inode, while 6.x does not. 2. 6.x has a `order=` section at the end, while 5.x does not. Current regex only matches to 6.x versions, which causes `cargo test` to fail as the test uses 5.x format for testing. Fix the regex to match on both existing 5.x test input, and newly added 6.x test input. Bug: 365889232 Test: `cargo test` passes with mixed 5.x and 6.x test input Test: on emulator with 6.6 kernel, observe that pack file is generated correctly. Change-Id: I869b5570e4d1cb2c155eceb3fd00c177ed4676f6
Add the performance mode. It improved parallel module loading performance by enabling the main thread to identify any new independent modules without waiting for subthreads to load all the old independent threads. Bug: 385049709 Change-Id: I638bc2d7d8fea6457be503c2b7aecd975250835a Signed-off-by: Chungkai Mei <chungkai@google.com>
it help us to debug or load modules more conservatively. Bug: 385049709 Change-Id: I41ebaf7298398652475918c2c3a3127c4bf6ac3f Signed-off-by: Chungkai Mei <chungkai@google.com>
* changes: Parallel Module Loading: Add conservative mode Parallel Module Loading: Add performance mode
The FF-A changes add new names for the Trusty devices (trusty-ffa and trusty-core) and expand the device hierarchy. See https://r.android.com/3369480 and https://r.android.com/3368602 for the corresponding changes to the Trusty test-map. Bug: 284057071 Test: adb sync data && trusty_driver_test.py Change-Id: I509cf3a78214c3cf4a54727cc6c8d057ae2257ad
Filter out the out-of-tree and unsigned module bits because our CI builds always have one or both of those. Bug: 284057071 Test: adb shell /.../trusty_driver_test Change-Id: I2c736fbb413b44d82558e71e2a8eac66e69cbdee
Remove redundant `find()` call as `insert()` performs an internal search and use `load_modules_parallel` directly for all mode selection. Bug: 402263126 Change-Id: Ib87d45843fe34df41eee33fdc72179c964061c73 Signed-off-by: Chungkai Mei <chungkai@google.com>
Sort the copy blocks so consecutive target blocks can be together. Fix WriteOrderedSnapshots() to go through copy operations using topological sort and re-order them so we can maximize copy operations and reduce the replace operations further. If we detect the cycles in dependency, convert only those blocks to replace blocks. Test: create_snapshot on 2 builds before and after, patch size reduced by 10x (~900MB -> ~90MB). Bug: 401284556 Change-Id: I4aaa02849164575d1a4dbf1578cdfc1627230c5c Signed-off-by: Sandeep Dhavale <dhavale@google.com>
Previously, only f2fs /data filesystems were shutdown using the F2FS_IOC_SHUTDOWN ioctl. This change adds support for shutting down ext4 /data filesystem with the EXT4_IOC_SHUTDOWN ioctl. Bug: 403381187 Test: Verify /data was clean after reboot on desktop Test: Verify e2fsck returns immediately when booting on desktop Change-Id: I08208888d839649efe54fcab5d73177e9e06ec88
Test: snapshotctl apply-update <empty-directory> Change-Id: Ieda5fe24b74182cdebf9f2c6c0c0a455cd8bfcc7 Signed-off-by: Akilesh Kailash <akailash@google.com>
This reverts commit 0455ece. Reason for revert: stability issue Bug: 406160196 Change-Id: Ia452e970add145a2a9bd6d4ea56455756c411cec
Revert submission 3556468 Reason for revert: stability issue Reverted changes: /q/submissionid:3556468 Bug: 406160196 Change-Id: Ic3d2c950249ed745134761bb43cd3eeb5889b303
Revert submission 3556468 Reason for revert: stability issue Reverted changes: /q/submissionid:3556468 Bug: 406160196 Change-Id: I5566ccde4003b674bad51d4f8f449090fb890f67
This reverts commit 435557c. Reason for revert: stability issue Bug: 406160196 Change-Id: Ic84dc4f6189f8950c73620a709e1ccceceb94faf
* changes: Revert "Parallel Module Loading: Refactor threads pool and architecture" Revert "Parallel Module Loading: Add performance mode" Revert "Parallel Module Loading: Add conservative mode" Revert "Parallel module loading: Fix typo and simplify logic"
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
29 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
See Commits and Changes for more details.
Created by
pull[bot]
Can you help keep this open source service alive? 💖 Please sponsor : )