diff --git a/METADATA b/METADATA deleted file mode 100644 index d97975ca3..000000000 --- a/METADATA +++ /dev/null @@ -1,3 +0,0 @@ -third_party { - license_type: NOTICE -} diff --git a/fs_mgr/libfstab/fstab.cpp b/fs_mgr/libfstab/fstab.cpp index ca3599059..01e0e3d87 100644 --- a/fs_mgr/libfstab/fstab.cpp +++ b/fs_mgr/libfstab/fstab.cpp @@ -39,10 +39,6 @@ #include "fstab_priv.h" #include "logging_macros.h" -#if !defined(MS_LAZYTIME) -#define MS_LAZYTIME (1 << 25) -#endif - using android::base::EndsWith; using android::base::ParseByteCount; using android::base::ParseInt; diff --git a/fs_mgr/libsnapshot/snapuserd/user-space-merge/merge_worker.cpp b/fs_mgr/libsnapshot/snapuserd/user-space-merge/merge_worker.cpp index a0c5c6658..febb4847d 100644 --- a/fs_mgr/libsnapshot/snapuserd/user-space-merge/merge_worker.cpp +++ b/fs_mgr/libsnapshot/snapuserd/user-space-merge/merge_worker.cpp @@ -233,6 +233,11 @@ bool MergeWorker::MergeOrderedOpsAsync() { return false; } + std::optional> buffer_lock; + // Acquire the buffer lock at this point so that RA thread + // doesn't step into this buffer. See b/377819507 + buffer_lock.emplace(snapuserd_->GetBufferLock()); + snapuserd_->SetMergeInProgress(ra_block_index_); loff_t offset = 0; @@ -383,6 +388,9 @@ bool MergeWorker::MergeOrderedOpsAsync() { // Mark the block as merge complete snapuserd_->SetMergeCompleted(ra_block_index_); + // Release the buffer lock + buffer_lock.reset(); + // Notify RA thread that the merge thread is ready to merge the next // window snapuserd_->NotifyRAForMergeReady(); @@ -415,6 +423,11 @@ bool MergeWorker::MergeOrderedOps() { return false; } + std::optional> buffer_lock; + // Acquire the buffer lock at this point so that RA thread + // doesn't step into this buffer. See b/377819507 + buffer_lock.emplace(snapuserd_->GetBufferLock()); + snapuserd_->SetMergeInProgress(ra_block_index_); loff_t offset = 0; @@ -468,6 +481,9 @@ bool MergeWorker::MergeOrderedOps() { // Mark the block as merge complete snapuserd_->SetMergeCompleted(ra_block_index_); + // Release the buffer lock + buffer_lock.reset(); + // Notify RA thread that the merge thread is ready to merge the next // window snapuserd_->NotifyRAForMergeReady(); 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 c7de9951f..2340b0b20 100644 --- a/fs_mgr/libsnapshot/snapuserd/user-space-merge/snapuserd_core.h +++ b/fs_mgr/libsnapshot/snapuserd/user-space-merge/snapuserd_core.h @@ -186,6 +186,7 @@ class SnapshotHandler : public std::enable_shared_from_this { bool IsIouringSupported(); bool CheckPartitionVerification(); + std::mutex& GetBufferLock() { return buffer_lock_; } private: bool ReadMetadata(); @@ -216,6 +217,9 @@ class SnapshotHandler : public std::enable_shared_from_this { std::mutex lock_; std::condition_variable cv; + // Lock the buffer used for snapshot-merge + std::mutex buffer_lock_; + void* mapped_addr_; size_t total_mapped_addr_length_; 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 3007d45f4..c7ae51926 100644 --- a/fs_mgr/libsnapshot/snapuserd/user-space-merge/snapuserd_readahead.cpp +++ b/fs_mgr/libsnapshot/snapuserd/user-space-merge/snapuserd_readahead.cpp @@ -706,25 +706,32 @@ bool ReadAhead::ReadAheadIOStart() { return false; } - // Copy the data to scratch space - memcpy(metadata_buffer_, ra_temp_meta_buffer_.get(), snapuserd_->GetBufferMetadataSize()); - memcpy(read_ahead_buffer_, ra_temp_buffer_.get(), total_blocks_merged_ * BLOCK_SZ); + // Acquire buffer lock before doing memcpy to the scratch buffer. Although, + // by now snapshot-merge thread shouldn't be working on this scratch space + // but we take additional measure to ensure that the buffer is not being + // used by the merge thread at this point. see b/377819507 + { + std::lock_guard buffer_lock(snapuserd_->GetBufferLock()); + // Copy the data to scratch space + memcpy(metadata_buffer_, ra_temp_meta_buffer_.get(), snapuserd_->GetBufferMetadataSize()); + memcpy(read_ahead_buffer_, ra_temp_buffer_.get(), total_blocks_merged_ * BLOCK_SZ); - loff_t offset = 0; - std::unordered_map& read_ahead_buffer_map = snapuserd_->GetReadAheadMap(); - read_ahead_buffer_map.clear(); + loff_t offset = 0; + std::unordered_map& read_ahead_buffer_map = snapuserd_->GetReadAheadMap(); + read_ahead_buffer_map.clear(); - for (size_t block_index = 0; block_index < blocks_.size(); block_index++) { - void* bufptr = static_cast((char*)read_ahead_buffer_ + offset); - uint64_t new_block = blocks_[block_index]; + for (size_t block_index = 0; block_index < blocks_.size(); block_index++) { + void* bufptr = static_cast((char*)read_ahead_buffer_ + offset); + uint64_t new_block = blocks_[block_index]; - read_ahead_buffer_map[new_block] = bufptr; - offset += BLOCK_SZ; + read_ahead_buffer_map[new_block] = bufptr; + offset += BLOCK_SZ; + } + + total_ra_blocks_completed_ += total_blocks_merged_; + snapuserd_->SetMergedBlockCountForNextCommit(total_blocks_merged_); } - total_ra_blocks_completed_ += total_blocks_merged_; - snapuserd_->SetMergedBlockCountForNextCommit(total_blocks_merged_); - // Flush the scratch data - Technically, we should flush only for overlapping // blocks; However, since this region is mmap'ed, the dirty pages can still // get flushed to disk at any random point in time. Instead, make sure diff --git a/fs_mgr/tests/fs_mgr_test.cpp b/fs_mgr/tests/fs_mgr_test.cpp index 6e050cf4b..8004977c9 100644 --- a/fs_mgr/tests/fs_mgr_test.cpp +++ b/fs_mgr/tests/fs_mgr_test.cpp @@ -37,10 +37,6 @@ using namespace android::fs_mgr; using namespace testing; -#if !defined(MS_LAZYTIME) -#define MS_LAZYTIME (1 << 25) -#endif - namespace { const std::string cmdline = diff --git a/libprocessgroup/include/processgroup/processgroup.h b/libprocessgroup/include/processgroup/processgroup.h index d27b56895..6a026a717 100644 --- a/libprocessgroup/include/processgroup/processgroup.h +++ b/libprocessgroup/include/processgroup/processgroup.h @@ -16,7 +16,6 @@ #pragma once -#include #include #include #include @@ -24,8 +23,6 @@ #include #include -__BEGIN_DECLS - static constexpr std::string CGROUPV2_HIERARCHY_NAME = "cgroup2"; bool CgroupsAvailable(); @@ -39,8 +36,6 @@ bool SetTaskProfiles(pid_t tid, const std::vector& profiles, bool SetProcessProfiles(uid_t uid, pid_t pid, const std::vector& profiles); bool SetUserProfiles(uid_t uid, const std::vector& profiles); -__END_DECLS - bool SetTaskProfiles(pid_t tid, std::initializer_list profiles, bool use_fd_cache = false); bool SetProcessProfiles(uid_t uid, pid_t pid, std::initializer_list profiles); @@ -50,7 +45,6 @@ bool SetTaskProfiles(pid_t tid, std::span profiles, bool SetProcessProfiles(uid_t uid, pid_t pid, std::span profiles); #endif -__BEGIN_DECLS #ifndef __ANDROID_VNDK__ @@ -96,5 +90,3 @@ bool getAttributePathForTask(const std::string& attr_name, pid_t tid, std::strin bool isProfileValidForProcess(const std::string& profile_name, uid_t uid, pid_t pid); #endif // __ANDROID_VNDK__ - -__END_DECLS diff --git a/rootdir/init.rc b/rootdir/init.rc index 8ffac2049..6771c5fde 100644 --- a/rootdir/init.rc +++ b/rootdir/init.rc @@ -1128,9 +1128,9 @@ on boot # System server manages zram writeback chown root system /sys/block/zram0/idle - chmod 0664 /sys/block/zram0/idle + chmod 0220 /sys/block/zram0/idle chown root system /sys/block/zram0/writeback - chmod 0664 /sys/block/zram0/writeback + chmod 0220 /sys/block/zram0/writeback # to access F2FS sysfs on dm- directly mkdir /dev/sys/fs/by-name 0755 system system