diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-11-01 21:43:35 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-11-01 21:43:35 +0000 |
commit | 4e4702327133fb1fdb549648f7a505cb4a3f7772 (patch) | |
tree | 08dd67897bbab89673f47e1582ef6eccc760daba | |
parent | 83366e7e7a1556ab6cff117673bb9f17b973de99 (diff) | |
parent | 66e0463cf8d5ba9ed1ec1325ae7408120f45dae6 (diff) | |
download | core-android-platform-13.0.0_r3.tar.gz |
Snap for 9239618 from 66e0463cf8d5ba9ed1ec1325ae7408120f45dae6 to tm-platform-releaseandroid-platform-13.0.0_r3
Change-Id: I86b6d4799de87ef522ade5d8c849611a2cdb5b1e
22 files changed, 227 insertions, 68 deletions
diff --git a/bootstat/bootstat.cpp b/bootstat/bootstat.cpp index 2c878f024..af0c89e9f 100644 --- a/bootstat/bootstat.cpp +++ b/bootstat/bootstat.cpp @@ -463,6 +463,11 @@ const std::map<std::string, int32_t> kBootReasonMap = { {"watchdog,gsa,hard", 215}, {"watchdog,gsa,soft", 216}, {"watchdog,pmucal", 217}, + {"reboot,early,bl", 218}, + {"watchdog,apc,gsa,crashed", 219}, + {"watchdog,apc,bl31,crashed", 220}, + {"watchdog,apc,pbl,crashed", 221}, + {"reboot,memory_protect,hyp", 222}, }; // Converts a string value representing the reason the system booted to an diff --git a/fastboot/fastboot.bash b/fastboot/fastboot.bash index e9bf9e940..911071aee 100644 --- a/fastboot/fastboot.bash +++ b/fastboot/fastboot.bash @@ -109,7 +109,7 @@ _fastboot_cmd_flash() { cur="${COMP_WORDS[COMP_CWORD]}" if [[ $i -eq $COMP_CWORD ]]; then - partitions="boot bootloader dtbo init_boot modem odm odm_dlkm oem product pvmfw radio recovery system system_dlkm vbmeta vendor vendor_dlkm" + partitions="boot bootloader dtbo init_boot modem odm odm_dlkm oem product pvmfw radio recovery system system_dlkm vbmeta vendor vendor_dlkm vendor_kernel_boot" COMPREPLY=( $(compgen -W "$partitions" -- $cur) ) else _fastboot_util_complete_local_file "${cur}" '!*.img' diff --git a/fastboot/fastboot.cpp b/fastboot/fastboot.cpp index 39d86f9b3..79c3ac746 100644 --- a/fastboot/fastboot.cpp +++ b/fastboot/fastboot.cpp @@ -186,6 +186,11 @@ static Image images[] = { "vendor_dlkm.img", "vendor_dlkm.sig", "vendor_dlkm", true, ImageType::Normal }, + { "vendor_kernel_boot", + "vendor_kernel_boot.img", + "vendor_kernel_boot.sig", + "vendor_kernel_boot", + true, ImageType::BootCritical }, { nullptr, "vendor_other.img", "vendor.sig", "vendor", true, ImageType::Normal }, // clang-format on }; diff --git a/fs_mgr/libsnapshot/cow_reader.cpp b/fs_mgr/libsnapshot/cow_reader.cpp index 746feeb8d..75a58a6fc 100644 --- a/fs_mgr/libsnapshot/cow_reader.cpp +++ b/fs_mgr/libsnapshot/cow_reader.cpp @@ -38,7 +38,7 @@ CowReader::CowReader(ReaderFlags reader_flag) : fd_(-1), header_(), fd_size_(0), - merge_op_blocks_(std::make_shared<std::vector<uint32_t>>()), + block_pos_index_(std::make_shared<std::vector<int>>()), reader_flag_(reader_flag) {} static void SHA256(const void*, size_t, uint8_t[]) { @@ -58,13 +58,12 @@ std::unique_ptr<CowReader> CowReader::CloneCowReader() { cow->fd_size_ = fd_size_; cow->last_label_ = last_label_; cow->ops_ = ops_; - cow->merge_op_blocks_ = merge_op_blocks_; cow->merge_op_start_ = merge_op_start_; - cow->block_map_ = block_map_; cow->num_total_data_ops_ = num_total_data_ops_; cow->num_ordered_ops_to_merge_ = num_ordered_ops_to_merge_; cow->has_seq_ops_ = has_seq_ops_; cow->data_loc_ = data_loc_; + cow->block_pos_index_ = block_pos_index_; return cow; } @@ -415,10 +414,10 @@ bool CowReader::ParseOps(std::optional<uint64_t> label) { // Replace-op-4, Zero-op-9, Replace-op-5 } //============================================================== bool CowReader::PrepMergeOps() { - auto merge_op_blocks = std::make_shared<std::vector<uint32_t>>(); + auto merge_op_blocks = std::make_unique<std::vector<uint32_t>>(); std::vector<int> other_ops; auto seq_ops_set = std::unordered_set<uint32_t>(); - auto block_map = std::make_shared<std::unordered_map<uint32_t, int>>(); + auto block_map = std::make_unique<std::unordered_map<uint32_t, int>>(); size_t num_seqs = 0; size_t read; @@ -477,13 +476,18 @@ bool CowReader::PrepMergeOps() { merge_op_blocks->insert(merge_op_blocks->end(), other_ops.begin(), other_ops.end()); + for (auto block : *merge_op_blocks) { + block_pos_index_->push_back(block_map->at(block)); + } + num_total_data_ops_ = merge_op_blocks->size(); if (header_.num_merge_ops > 0) { merge_op_start_ = header_.num_merge_ops; } - block_map_ = block_map; - merge_op_blocks_ = merge_op_blocks; + block_map->clear(); + merge_op_blocks->clear(); + return true; } @@ -589,9 +593,7 @@ const CowOperation& CowOpIter::Get() { class CowRevMergeOpIter final : public ICowOpIter { public: explicit CowRevMergeOpIter(std::shared_ptr<std::vector<CowOperation>> ops, - std::shared_ptr<std::vector<uint32_t>> merge_op_blocks, - std::shared_ptr<std::unordered_map<uint32_t, int>> map, - uint64_t start); + std::shared_ptr<std::vector<int>> block_pos_index, uint64_t start); bool Done() override; const CowOperation& Get() override; @@ -602,17 +604,15 @@ class CowRevMergeOpIter final : public ICowOpIter { private: std::shared_ptr<std::vector<CowOperation>> ops_; - std::shared_ptr<std::vector<uint32_t>> merge_op_blocks_; - std::shared_ptr<std::unordered_map<uint32_t, int>> map_; - std::vector<uint32_t>::reverse_iterator block_riter_; + std::vector<int>::reverse_iterator block_riter_; + std::shared_ptr<std::vector<int>> cow_op_index_vec_; uint64_t start_; }; class CowMergeOpIter final : public ICowOpIter { public: explicit CowMergeOpIter(std::shared_ptr<std::vector<CowOperation>> ops, - std::shared_ptr<std::vector<uint32_t>> merge_op_blocks, - std::shared_ptr<std::unordered_map<uint32_t, int>> map, uint64_t start); + std::shared_ptr<std::vector<int>> block_pos_index, uint64_t start); bool Done() override; const CowOperation& Get() override; @@ -623,26 +623,21 @@ class CowMergeOpIter final : public ICowOpIter { private: std::shared_ptr<std::vector<CowOperation>> ops_; - std::shared_ptr<std::vector<uint32_t>> merge_op_blocks_; - std::shared_ptr<std::unordered_map<uint32_t, int>> map_; - std::vector<uint32_t>::iterator block_iter_; + std::vector<int>::iterator block_iter_; + std::shared_ptr<std::vector<int>> cow_op_index_vec_; uint64_t start_; }; CowMergeOpIter::CowMergeOpIter(std::shared_ptr<std::vector<CowOperation>> ops, - std::shared_ptr<std::vector<uint32_t>> merge_op_blocks, - std::shared_ptr<std::unordered_map<uint32_t, int>> map, - uint64_t start) { + std::shared_ptr<std::vector<int>> block_pos_index, uint64_t start) { ops_ = ops; - merge_op_blocks_ = merge_op_blocks; - map_ = map; start_ = start; - - block_iter_ = merge_op_blocks->begin() + start; + cow_op_index_vec_ = block_pos_index; + block_iter_ = cow_op_index_vec_->begin() + start; } bool CowMergeOpIter::RDone() { - return block_iter_ == merge_op_blocks_->begin(); + return block_iter_ == cow_op_index_vec_->begin(); } void CowMergeOpIter::Prev() { @@ -651,7 +646,7 @@ void CowMergeOpIter::Prev() { } bool CowMergeOpIter::Done() { - return block_iter_ == merge_op_blocks_->end(); + return block_iter_ == cow_op_index_vec_->end(); } void CowMergeOpIter::Next() { @@ -661,23 +656,20 @@ void CowMergeOpIter::Next() { const CowOperation& CowMergeOpIter::Get() { CHECK(!Done()); - return ops_->data()[map_->at(*block_iter_)]; + return ops_->data()[*block_iter_]; } CowRevMergeOpIter::CowRevMergeOpIter(std::shared_ptr<std::vector<CowOperation>> ops, - std::shared_ptr<std::vector<uint32_t>> merge_op_blocks, - std::shared_ptr<std::unordered_map<uint32_t, int>> map, + std::shared_ptr<std::vector<int>> block_pos_index, uint64_t start) { ops_ = ops; - merge_op_blocks_ = merge_op_blocks; - map_ = map; start_ = start; - - block_riter_ = merge_op_blocks->rbegin(); + cow_op_index_vec_ = block_pos_index; + block_riter_ = cow_op_index_vec_->rbegin(); } bool CowRevMergeOpIter::RDone() { - return block_riter_ == merge_op_blocks_->rbegin(); + return block_riter_ == cow_op_index_vec_->rbegin(); } void CowRevMergeOpIter::Prev() { @@ -686,7 +678,7 @@ void CowRevMergeOpIter::Prev() { } bool CowRevMergeOpIter::Done() { - return block_riter_ == merge_op_blocks_->rend() - start_; + return block_riter_ == cow_op_index_vec_->rend() - start_; } void CowRevMergeOpIter::Next() { @@ -696,7 +688,7 @@ void CowRevMergeOpIter::Next() { const CowOperation& CowRevMergeOpIter::Get() { CHECK(!Done()); - return ops_->data()[map_->at(*block_riter_)]; + return ops_->data()[*block_riter_]; } std::unique_ptr<ICowOpIter> CowReader::GetOpIter() { @@ -704,12 +696,12 @@ std::unique_ptr<ICowOpIter> CowReader::GetOpIter() { } std::unique_ptr<ICowOpIter> CowReader::GetRevMergeOpIter(bool ignore_progress) { - return std::make_unique<CowRevMergeOpIter>(ops_, merge_op_blocks_, block_map_, + return std::make_unique<CowRevMergeOpIter>(ops_, block_pos_index_, ignore_progress ? 0 : merge_op_start_); } std::unique_ptr<ICowOpIter> CowReader::GetMergeOpIter(bool ignore_progress) { - return std::make_unique<CowMergeOpIter>(ops_, merge_op_blocks_, block_map_, + return std::make_unique<CowMergeOpIter>(ops_, block_pos_index_, ignore_progress ? 0 : merge_op_start_); } diff --git a/fs_mgr/libsnapshot/include/libsnapshot/cow_reader.h b/fs_mgr/libsnapshot/include/libsnapshot/cow_reader.h index f4d5c72f3..fbdd6b98b 100644 --- a/fs_mgr/libsnapshot/include/libsnapshot/cow_reader.h +++ b/fs_mgr/libsnapshot/include/libsnapshot/cow_reader.h @@ -170,9 +170,8 @@ class CowReader final : public ICowReader { uint64_t fd_size_; std::optional<uint64_t> last_label_; std::shared_ptr<std::vector<CowOperation>> ops_; - std::shared_ptr<std::vector<uint32_t>> merge_op_blocks_; uint64_t merge_op_start_{}; - std::shared_ptr<std::unordered_map<uint32_t, int>> block_map_; + std::shared_ptr<std::vector<int>> block_pos_index_; uint64_t num_total_data_ops_{}; uint64_t num_ordered_ops_to_merge_{}; bool has_seq_ops_{}; diff --git a/fs_mgr/libsnapshot/snapshot.cpp b/fs_mgr/libsnapshot/snapshot.cpp index 019b64a44..870801ef1 100644 --- a/fs_mgr/libsnapshot/snapshot.cpp +++ b/fs_mgr/libsnapshot/snapshot.cpp @@ -2151,8 +2151,17 @@ bool SnapshotManager::ListSnapshots(LockedFile* lock, std::vector<std::string>* if (!suffix.empty() && !android::base::EndsWith(name, suffix)) { continue; } - snapshots->emplace_back(std::move(name)); + + // Insert system and product partition at the beginning so that + // during snapshot-merge, these partitions are merged first. + if (name == "system_a" || name == "system_b" || name == "product_a" || + name == "product_b") { + snapshots->insert(snapshots->begin(), std::move(name)); + } else { + snapshots->emplace_back(std::move(name)); + } } + return true; } diff --git a/fs_mgr/libsnapshot/snapshot_test.cpp b/fs_mgr/libsnapshot/snapshot_test.cpp index 6a348b4e5..c145da718 100644 --- a/fs_mgr/libsnapshot/snapshot_test.cpp +++ b/fs_mgr/libsnapshot/snapshot_test.cpp @@ -2755,6 +2755,10 @@ bool IsDaemonRequired() { return false; } + if (!IsCompressionEnabled()) { + return false; + } + const std::string UNKNOWN = "unknown"; const std::string vendor_release = android::base::GetProperty("ro.vendor.build.version.release_or_codename", UNKNOWN); diff --git a/fs_mgr/libsnapshot/snapuserd/user-space-merge/snapuserd_core.cpp b/fs_mgr/libsnapshot/snapuserd/user-space-merge/snapuserd_core.cpp index 692cb740c..718c13ce0 100644 --- a/fs_mgr/libsnapshot/snapuserd/user-space-merge/snapuserd_core.cpp +++ b/fs_mgr/libsnapshot/snapuserd/user-space-merge/snapuserd_core.cpp @@ -143,17 +143,18 @@ void SnapshotHandler::PrepareReadAhead() { NotifyRAForMergeReady(); } -void SnapshotHandler::CheckMergeCompletionStatus() { +bool SnapshotHandler::CheckMergeCompletionStatus() { if (!merge_initiated_) { SNAP_LOG(INFO) << "Merge was not initiated. Total-data-ops: " << reader_->get_num_total_data_ops(); - return; + return false; } struct CowHeader* ch = reinterpret_cast<struct CowHeader*>(mapped_addr_); SNAP_LOG(INFO) << "Merge-status: Total-Merged-ops: " << ch->num_merge_ops << " Total-data-ops: " << reader_->get_num_total_data_ops(); + return true; } bool SnapshotHandler::ReadMetadata() { diff --git a/fs_mgr/libsnapshot/snapuserd/user-space-merge/snapuserd_core.h b/fs_mgr/libsnapshot/snapuserd/user-space-merge/snapuserd_core.h index 83d40f635..c6805e5d9 100644 --- a/fs_mgr/libsnapshot/snapuserd/user-space-merge/snapuserd_core.h +++ b/fs_mgr/libsnapshot/snapuserd/user-space-merge/snapuserd_core.h @@ -18,6 +18,9 @@ #include <stdint.h> #include <stdlib.h> #include <sys/mman.h> +#include <sys/resource.h> +#include <sys/time.h> +#include <unistd.h> #include <condition_variable> #include <cstring> @@ -54,6 +57,8 @@ static_assert(PAYLOAD_BUFFER_SZ >= BLOCK_SZ); static constexpr int kNumWorkerThreads = 4; +static constexpr int kNiceValueForMergeThreads = -5; + #define SNAP_LOG(level) LOG(level) << misc_name_ << ": " #define SNAP_PLOG(level) PLOG(level) << misc_name_ << ": " @@ -274,7 +279,7 @@ class SnapshotHandler : public std::enable_shared_from_this<SnapshotHandler> { const bool& IsAttached() const { return attached_; } void AttachControlDevice() { attached_ = true; } - void CheckMergeCompletionStatus(); + bool CheckMergeCompletionStatus(); bool CommitMerge(int num_merge_ops); void CloseFds() { cow_fd_ = {}; } @@ -305,6 +310,8 @@ class SnapshotHandler : public std::enable_shared_from_this<SnapshotHandler> { // State transitions for merge void InitiateMerge(); + void MonitorMerge(); + void WakeupMonitorMergeThread(); void WaitForMergeComplete(); bool WaitForMergeBegin(); void NotifyRAForMergeReady(); @@ -333,6 +340,7 @@ class SnapshotHandler : public std::enable_shared_from_this<SnapshotHandler> { void SetSocketPresent(bool socket) { is_socket_present_ = socket; } void SetIouringEnabled(bool io_uring_enabled) { is_io_uring_enabled_ = io_uring_enabled; } bool MergeInitiated() { return merge_initiated_; } + bool MergeMonitored() { return merge_monitored_; } double GetMergePercentage() { return merge_completion_percentage_; } // Merge Block State Transitions @@ -407,6 +415,7 @@ class SnapshotHandler : public std::enable_shared_from_this<SnapshotHandler> { double merge_completion_percentage_; bool merge_initiated_ = false; + bool merge_monitored_ = false; bool attached_ = false; bool is_socket_present_; bool is_io_uring_enabled_ = false; diff --git a/fs_mgr/libsnapshot/snapuserd/user-space-merge/snapuserd_merge.cpp b/fs_mgr/libsnapshot/snapuserd/user-space-merge/snapuserd_merge.cpp index c26a2cd5c..63f47d6f0 100644 --- a/fs_mgr/libsnapshot/snapuserd/user-space-merge/snapuserd_merge.cpp +++ b/fs_mgr/libsnapshot/snapuserd/user-space-merge/snapuserd_merge.cpp @@ -71,16 +71,16 @@ int Worker::PrepareMerge(uint64_t* source_offset, int* pending_ops, } bool Worker::MergeReplaceZeroOps() { - // Flush every 8192 ops. Since all ops are independent and there is no + // Flush after merging 2MB. Since all ops are independent and there is no // dependency between COW ops, we will flush the data and the number - // of ops merged in COW file for every 8192 ops. If there is a crash, - // we will end up replaying some of the COW ops which were already merged. - // That is ok. + // of ops merged in COW block device. If there is a crash, we will + // end up replaying some of the COW ops which were already merged. That is + // ok. // - // Why 8192 ops ? Increasing this may improve merge time 3-4 seconds but - // we need to make sure that we checkpoint; 8k ops seems optimal. In-case - // if there is a crash merge should always make forward progress. - int total_ops_merged_per_commit = (PAYLOAD_BUFFER_SZ / BLOCK_SZ) * 32; + // Although increasing this greater than 2MB may help in improving merge + // times; however, on devices with low memory, this can be problematic + // when there are multiple merge threads in parallel. + int total_ops_merged_per_commit = (PAYLOAD_BUFFER_SZ / BLOCK_SZ) * 2; int num_ops_merged = 0; SNAP_LOG(INFO) << "MergeReplaceZeroOps started...."; @@ -543,6 +543,10 @@ bool Worker::RunMergeThread() { return true; } + if (setpriority(PRIO_PROCESS, gettid(), kNiceValueForMergeThreads)) { + SNAP_PLOG(ERROR) << "Failed to set priority for TID: " << gettid(); + } + SNAP_LOG(INFO) << "Merge starting.."; if (!Init()) { diff --git a/fs_mgr/libsnapshot/snapuserd/user-space-merge/snapuserd_readahead.cpp b/fs_mgr/libsnapshot/snapuserd/user-space-merge/snapuserd_readahead.cpp index fa2866f39..b9e4255b2 100644 --- a/fs_mgr/libsnapshot/snapuserd/user-space-merge/snapuserd_readahead.cpp +++ b/fs_mgr/libsnapshot/snapuserd/user-space-merge/snapuserd_readahead.cpp @@ -727,6 +727,10 @@ bool ReadAhead::RunThread() { InitializeIouring(); + if (setpriority(PRIO_PROCESS, gettid(), kNiceValueForMergeThreads)) { + SNAP_PLOG(ERROR) << "Failed to set priority for TID: " << gettid(); + } + while (!RAIterDone()) { if (!ReadAheadIOStart()) { break; diff --git a/fs_mgr/libsnapshot/snapuserd/user-space-merge/snapuserd_server.cpp b/fs_mgr/libsnapshot/snapuserd/user-space-merge/snapuserd_server.cpp index 82b2b25dd..5d93f01a7 100644 --- a/fs_mgr/libsnapshot/snapuserd/user-space-merge/snapuserd_server.cpp +++ b/fs_mgr/libsnapshot/snapuserd/user-space-merge/snapuserd_server.cpp @@ -59,6 +59,14 @@ DaemonOps UserSnapshotServer::Resolveop(std::string& input) { return DaemonOps::INVALID; } +UserSnapshotServer::UserSnapshotServer() { + monitor_merge_event_fd_.reset(eventfd(0, EFD_CLOEXEC)); + if (monitor_merge_event_fd_ == -1) { + PLOG(FATAL) << "monitor_merge_event_fd_: failed to create eventfd"; + } + terminating_ = false; +} + UserSnapshotServer::~UserSnapshotServer() { // Close any client sockets that were added via AcceptClient(). for (size_t i = 1; i < watched_fds_.size(); i++) { @@ -249,7 +257,7 @@ bool UserSnapshotServer::Receivemsg(android::base::borrowed_fd fd, const std::st return Sendmsg(fd, "fail"); } - if (!StartMerge(*iter)) { + if (!StartMerge(&lock, *iter)) { return Sendmsg(fd, "fail"); } @@ -298,7 +306,7 @@ void UserSnapshotServer::RunThread(std::shared_ptr<UserSnapshotDmUserHandler> ha } handler->snapuserd()->CloseFds(); - handler->snapuserd()->CheckMergeCompletionStatus(); + bool merge_completed = handler->snapuserd()->CheckMergeCompletionStatus(); handler->snapuserd()->UnmapBufferRegion(); auto misc_name = handler->misc_name(); @@ -306,7 +314,11 @@ void UserSnapshotServer::RunThread(std::shared_ptr<UserSnapshotDmUserHandler> ha { std::lock_guard<std::mutex> lock(lock_); - num_partitions_merge_complete_ += 1; + if (merge_completed) { + num_partitions_merge_complete_ += 1; + active_merge_threads_ -= 1; + WakeupMonitorMergeThread(); + } handler->SetThreadTerminated(); auto iter = FindHandler(&lock, handler->misc_name()); if (iter == dm_users_.end()) { @@ -418,6 +430,9 @@ void UserSnapshotServer::JoinAllThreads() { if (th.joinable()) th.join(); } + + stop_monitor_merge_thread_ = true; + WakeupMonitorMergeThread(); } void UserSnapshotServer::AddWatchedFd(android::base::borrowed_fd fd, int events) { @@ -502,13 +517,24 @@ bool UserSnapshotServer::StartHandler(const std::shared_ptr<UserSnapshotDmUserHa return true; } -bool UserSnapshotServer::StartMerge(const std::shared_ptr<UserSnapshotDmUserHandler>& handler) { +bool UserSnapshotServer::StartMerge(std::lock_guard<std::mutex>* proof_of_lock, + const std::shared_ptr<UserSnapshotDmUserHandler>& handler) { + CHECK(proof_of_lock); + if (!handler->snapuserd()->IsAttached()) { LOG(ERROR) << "Handler not attached to dm-user - Merge thread cannot be started"; return false; } - handler->snapuserd()->InitiateMerge(); + handler->snapuserd()->MonitorMerge(); + + if (!is_merge_monitor_started_.has_value()) { + std::thread(&UserSnapshotServer::MonitorMerge, this).detach(); + is_merge_monitor_started_ = true; + } + + merge_handlers_.push(handler); + WakeupMonitorMergeThread(); return true; } @@ -590,6 +616,42 @@ bool UserSnapshotServer::RemoveAndJoinHandler(const std::string& misc_name) { return true; } +void UserSnapshotServer::WakeupMonitorMergeThread() { + uint64_t notify = 1; + ssize_t rc = TEMP_FAILURE_RETRY(write(monitor_merge_event_fd_.get(), ¬ify, sizeof(notify))); + if (rc < 0) { + PLOG(FATAL) << "failed to notify monitor merge thread"; + } +} + +void UserSnapshotServer::MonitorMerge() { + while (!stop_monitor_merge_thread_) { + uint64_t testVal; + ssize_t ret = + TEMP_FAILURE_RETRY(read(monitor_merge_event_fd_.get(), &testVal, sizeof(testVal))); + if (ret == -1) { + PLOG(FATAL) << "Failed to read from eventfd"; + } else if (ret == 0) { + LOG(FATAL) << "Hit EOF on eventfd"; + } + + LOG(INFO) << "MonitorMerge: active-merge-threads: " << active_merge_threads_; + { + std::lock_guard<std::mutex> lock(lock_); + while (active_merge_threads_ < kMaxMergeThreads && merge_handlers_.size() > 0) { + auto handler = merge_handlers_.front(); + merge_handlers_.pop(); + LOG(INFO) << "Starting merge for partition: " + << handler->snapuserd()->GetMiscName(); + handler->snapuserd()->InitiateMerge(); + active_merge_threads_ += 1; + } + } + } + + LOG(INFO) << "Exiting MonitorMerge: size: " << merge_handlers_.size(); +} + bool UserSnapshotServer::WaitForSocket() { auto scope_guard = android::base::make_scope_guard([this]() -> void { JoinAllThreads(); }); @@ -646,6 +708,7 @@ bool UserSnapshotServer::WaitForSocket() { if (!StartWithSocket(true)) { return false; } + return Run(); } diff --git a/fs_mgr/libsnapshot/snapuserd/user-space-merge/snapuserd_server.h b/fs_mgr/libsnapshot/snapuserd/user-space-merge/snapuserd_server.h index 34e7941bc..e0844aeb1 100644 --- a/fs_mgr/libsnapshot/snapuserd/user-space-merge/snapuserd_server.h +++ b/fs_mgr/libsnapshot/snapuserd/user-space-merge/snapuserd_server.h @@ -15,6 +15,7 @@ #pragma once #include <poll.h> +#include <sys/eventfd.h> #include <cstdio> #include <cstring> @@ -22,6 +23,8 @@ #include <future> #include <iostream> #include <mutex> +#include <optional> +#include <queue> #include <sstream> #include <string> #include <thread> @@ -34,6 +37,7 @@ namespace android { namespace snapshot { static constexpr uint32_t kMaxPacketSize = 512; +static constexpr uint8_t kMaxMergeThreads = 2; enum class DaemonOps { INIT, @@ -84,13 +88,19 @@ class UserSnapshotServer { std::vector<struct pollfd> watched_fds_; bool is_socket_present_ = false; int num_partitions_merge_complete_ = 0; + int active_merge_threads_ = 0; + bool stop_monitor_merge_thread_ = false; bool is_server_running_ = false; bool io_uring_enabled_ = false; + std::optional<bool> is_merge_monitor_started_; + + android::base::unique_fd monitor_merge_event_fd_; std::mutex lock_; using HandlerList = std::vector<std::shared_ptr<UserSnapshotDmUserHandler>>; HandlerList dm_users_; + std::queue<std::shared_ptr<UserSnapshotDmUserHandler>> merge_handlers_; void AddWatchedFd(android::base::borrowed_fd fd, int events); void AcceptClient(); @@ -108,6 +118,8 @@ class UserSnapshotServer { bool IsTerminating() { return terminating_; } void RunThread(std::shared_ptr<UserSnapshotDmUserHandler> handler); + void MonitorMerge(); + void JoinAllThreads(); bool StartWithSocket(bool start_listening); @@ -119,7 +131,7 @@ class UserSnapshotServer { void TerminateMergeThreads(std::lock_guard<std::mutex>* proof_of_lock); public: - UserSnapshotServer() { terminating_ = false; } + UserSnapshotServer(); ~UserSnapshotServer(); bool Start(const std::string& socketname); @@ -133,9 +145,11 @@ class UserSnapshotServer { const std::string& backing_device, const std::string& base_path_merge); bool StartHandler(const std::shared_ptr<UserSnapshotDmUserHandler>& handler); - bool StartMerge(const std::shared_ptr<UserSnapshotDmUserHandler>& handler); + bool StartMerge(std::lock_guard<std::mutex>* proof_of_lock, + const std::shared_ptr<UserSnapshotDmUserHandler>& handler); std::string GetMergeStatus(const std::shared_ptr<UserSnapshotDmUserHandler>& handler); + void WakeupMonitorMergeThread(); void SetTerminating() { terminating_ = true; } void ReceivedSocketSignal() { received_socket_signal_ = true; } void SetServerRunning() { is_server_running_ = true; } diff --git a/fs_mgr/libsnapshot/snapuserd/user-space-merge/snapuserd_transitions.cpp b/fs_mgr/libsnapshot/snapuserd/user-space-merge/snapuserd_transitions.cpp index d4e1d7c7e..28c9f688a 100644 --- a/fs_mgr/libsnapshot/snapuserd/user-space-merge/snapuserd_transitions.cpp +++ b/fs_mgr/libsnapshot/snapuserd/user-space-merge/snapuserd_transitions.cpp @@ -165,6 +165,13 @@ using namespace android; using namespace android::dm; using android::base::unique_fd; +void SnapshotHandler::MonitorMerge() { + { + std::lock_guard<std::mutex> lock(lock_); + merge_monitored_ = true; + } +} + // This is invoked once primarily by update-engine to initiate // the merge void SnapshotHandler::InitiateMerge() { @@ -361,10 +368,16 @@ void SnapshotHandler::WaitForMergeComplete() { std::string SnapshotHandler::GetMergeStatus() { bool merge_not_initiated = false; + bool merge_monitored = false; bool merge_failed = false; { std::lock_guard<std::mutex> lock(lock_); + + if (MergeMonitored()) { + merge_monitored = true; + } + if (!MergeInitiated()) { merge_not_initiated = true; } @@ -387,6 +400,12 @@ std::string SnapshotHandler::GetMergeStatus() { return "snapshot-merge-complete"; } + // Merge monitor thread is tracking the merge but the merge thread + // is not started yet. + if (merge_monitored) { + return "snapshot-merge"; + } + // Return the state as "snapshot". If the device was rebooted during // merge, we will return the status as "snapshot". This is ok, as // libsnapshot will explicitly resume the merge. This is slightly diff --git a/fs_mgr/libsnapshot/vts_ota_config_test.cpp b/fs_mgr/libsnapshot/vts_ota_config_test.cpp index afc2d81a4..02bcc3438 100644 --- a/fs_mgr/libsnapshot/vts_ota_config_test.cpp +++ b/fs_mgr/libsnapshot/vts_ota_config_test.cpp @@ -17,7 +17,14 @@ #include <android-base/properties.h> #include <gtest/gtest.h> +static int GetVsrLevel() { + return android::base::GetIntProperty("ro.vendor.api_level", -1); +} + TEST(VAB, Enabled) { ASSERT_TRUE(android::base::GetBoolProperty("ro.virtual_ab.enabled", false)); + if (GetVsrLevel() < __ANDROID_API_T__) { + GTEST_SKIP(); + } ASSERT_TRUE(android::base::GetBoolProperty("ro.virtual_ab.userspace.snapshots.enabled", false)); } diff --git a/fs_mgr/tests/vts_fs_test.cpp b/fs_mgr/tests/vts_fs_test.cpp index aac2cfd9b..ae8e45992 100644 --- a/fs_mgr/tests/vts_fs_test.cpp +++ b/fs_mgr/tests/vts_fs_test.cpp @@ -28,8 +28,8 @@ static int GetVsrLevel() { } TEST(fs, ErofsSupported) { - // S and higher for this test. - if (GetVsrLevel() < __ANDROID_API_S__) { + // T-launch GKI kernels and higher must support EROFS. + if (GetVsrLevel() < __ANDROID_API_T__) { GTEST_SKIP(); } diff --git a/rootdir/init.rc b/rootdir/init.rc index cd71aa8aa..c56f86089 100644 --- a/rootdir/init.rc +++ b/rootdir/init.rc @@ -720,9 +720,13 @@ on post-fs-data # Multi-installed APEXes are selected using persist props. # Load persist properties and override properties (if enabled) from /data, # before starting apexd. + # /data/property should be created before `load_persist_props` + mkdir /data/property 0700 root root encryption=Require load_persist_props + start logd start logd-reinit + # Some existing vendor rc files use 'on load_persist_props_action' to know # when persist props are ready. These are difficult to change due to GRF, # so continue triggering this action here even though props are already loaded @@ -842,7 +846,6 @@ on post-fs-data mkdir /data/app-asec 0700 root root encryption=Require mkdir /data/app-lib 0771 system system encryption=Require mkdir /data/app 0771 system system encryption=Require - mkdir /data/property 0700 root root encryption=Require # create directory for updated font files. mkdir /data/fonts/ 0771 root root encryption=Require diff --git a/trusty/apploader/apploader.cpp b/trusty/apploader/apploader.cpp index 278499f17..17d083c73 100644 --- a/trusty/apploader/apploader.cpp +++ b/trusty/apploader/apploader.cpp @@ -226,6 +226,9 @@ static ssize_t read_response(int tipc_fd) { case APPLOADER_ERR_POLICY_VIOLATION: LOG(ERROR) << "Error: loading denied by policy engine"; break; + case APPLOADER_ERR_NOT_ENCRYPTED: + LOG(ERROR) << "Error: unmet application encryption requirement"; + break; default: LOG(ERROR) << "Unrecognized error: " << resp.error; break; diff --git a/trusty/apploader/apploader_ipc.h b/trusty/apploader/apploader_ipc.h index 306596eba..f0376929c 100644 --- a/trusty/apploader/apploader_ipc.h +++ b/trusty/apploader/apploader_ipc.h @@ -45,6 +45,10 @@ enum apploader_command : uint32_t { * @APPLOADER_ERR_INTERNAL: miscellaneous or internal apploader * error not covered by the above * @APPLOADER_ERR_INVALID_VERSION: invalid application version + * @APPLOADER_ERR_POLICY_VIOLATION: signature verification succeeded but + * key+manifest combination not allowed + * by app loader policy engine + * @APPLOADER_ERR_NOT_ENCRYPTED: unmet application encryption requirement */ enum apploader_error : uint32_t { APPLOADER_NO_ERROR = 0, @@ -57,6 +61,7 @@ enum apploader_error : uint32_t { APPLOADER_ERR_INTERNAL, APPLOADER_ERR_INVALID_VERSION, APPLOADER_ERR_POLICY_VIOLATION, + APPLOADER_ERR_NOT_ENCRYPTED, }; /** diff --git a/trusty/storage/interface/include/trusty/interface/storage.h b/trusty/storage/interface/include/trusty/interface/storage.h index 3f1dcb8c6..255ade127 100644 --- a/trusty/storage/interface/include/trusty/interface/storage.h +++ b/trusty/storage/interface/include/trusty/interface/storage.h @@ -70,6 +70,9 @@ enum storage_cmd { * @STORAGE_ERR_TRANSACT returned by various operations to indicate that current transaction * is in error state. Such state could be only cleared by sending * STORAGE_END_TRANSACTION message. + * @STORAGE_ERR_SYNC_FAILURE indicates that the current operation failed to sync + * to disk. Only returned if STORAGE_MSG_FLAG_PRE_COMMIT or + * STORAGE_MSG_FLAG_POST_COMMIT was set for the request. */ enum storage_err { STORAGE_NO_ERROR = 0, @@ -80,6 +83,7 @@ enum storage_err { STORAGE_ERR_NOT_FOUND = 5, STORAGE_ERR_EXIST = 6, STORAGE_ERR_TRANSACT = 7, + STORAGE_ERR_SYNC_FAILURE = 8, }; /** diff --git a/trusty/storage/proxy/proxy.c b/trusty/storage/proxy/proxy.c index 262003427..f01589287 100644 --- a/trusty/storage/proxy/proxy.c +++ b/trusty/storage/proxy/proxy.c @@ -116,10 +116,11 @@ static int drop_privs(void) { static int handle_req(struct storage_msg* msg, const void* req, size_t req_len) { int rc; - if ((msg->flags & STORAGE_MSG_FLAG_POST_COMMIT) && (msg->cmd != STORAGE_RPMB_SEND)) { + if ((msg->flags & STORAGE_MSG_FLAG_POST_COMMIT) && msg->cmd != STORAGE_RPMB_SEND && + msg->cmd != STORAGE_FILE_WRITE) { /* - * handling post commit messages on non rpmb commands are not - * implemented as there is no use case for this yet. + * handling post commit messages on commands other than rpmb and write + * operations are not implemented as there is no use case for this yet. */ ALOGE("cmd 0x%x: post commit option is not implemented\n", msg->cmd); msg->result = STORAGE_ERR_UNIMPLEMENTED; @@ -129,7 +130,7 @@ static int handle_req(struct storage_msg* msg, const void* req, size_t req_len) if (msg->flags & STORAGE_MSG_FLAG_PRE_COMMIT) { rc = storage_sync_checkpoint(); if (rc < 0) { - msg->result = STORAGE_ERR_GENERIC; + msg->result = STORAGE_ERR_SYNC_FAILURE; return ipc_respond(msg, NULL, 0); } } diff --git a/trusty/storage/proxy/storage.c b/trusty/storage/proxy/storage.c index c00c399d9..c531cfd13 100644 --- a/trusty/storage/proxy/storage.c +++ b/trusty/storage/proxy/storage.c @@ -407,6 +407,14 @@ int storage_file_write(struct storage_msg *msg, goto err_response; } + if (msg->flags & STORAGE_MSG_FLAG_POST_COMMIT) { + rc = storage_sync_checkpoint(); + if (rc < 0) { + msg->result = STORAGE_ERR_SYNC_FAILURE; + goto err_response; + } + } + msg->result = STORAGE_NO_ERROR; err_response: |