ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

remount: Create a bigger scratch partition on /data.

Browse source 
When creating a scratch partition on /data, use either the size of
super, or half the free space on /data - whichever is smaller.

Bug: 213617068
Test: adb remount
Change-Id: If42fe9e1dc53d5a0137ace917a440232f70947fa
This commit is contained in:
David Anderson 2022-02-16 18:57:41 -08:00
parent 15a20e3906
commit c1c05daac1
1 changed files with 21 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
fs_mgr/fs_mgr_overlayfs.cpp
View file

@ -1122,6 +1122,23 @@ static bool CreateDynamicScratch(std::string* scratch_device, bool* partition_ex
return true;
}
static inline uint64_t GetIdealDataScratchSize() {
BlockDeviceInfo super_info;
PartitionOpener opener;
if (!opener.GetInfo(fs_mgr_get_super_partition_name(), &super_info)) {
LERROR << "could not get block device info for super";
return 0;
}
struct statvfs s;
if (statvfs("/data", &s) < 0) {
PERROR << "could not statfs /data";
return 0;
}
return std::min(super_info.size, (uint64_t(s.f_frsize) * s.f_bfree) / 2);
}
static bool CreateScratchOnData(std::string* scratch_device, bool* partition_exists, bool* change) {
*partition_exists = false;
if (change) *change = false;
@ -1137,13 +1154,6 @@ static bool CreateScratchOnData(std::string* scratch_device, bool* partition_exi
return true;
}
BlockDeviceInfo info;
PartitionOpener opener;
if (!opener.GetInfo(fs_mgr_get_super_partition_name(), &info)) {
LERROR << "could not get block device info for super";
return false;
}
if (change) *change = true;
// Note: calling RemoveDisabledImages here ensures that we do not race with
@ -1153,10 +1163,11 @@ static bool CreateScratchOnData(std::string* scratch_device, bool* partition_exi
return false;
}
if (!images->BackingImageExists(partition_name)) {
static constexpr uint64_t kMinimumSize = 64_MiB;
static constexpr uint64_t kMaximumSize = 2_GiB;
uint64_t size = GetIdealDataScratchSize();
if (!size) {
size = 2_GiB;
}
uint64_t size = std::clamp(info.size / 2, kMinimumSize, kMaximumSize);
auto flags = IImageManager::CREATE_IMAGE_DEFAULT;
if (!images->CreateBackingImage(partition_name, size, flags)) {