From 0c024a7f2b4c48781dab365512430c4f2059c683 Mon Sep 17 00:00:00 2001 From: Jaegeuk Kim Date: Thu, 19 May 2022 08:20:33 -0700 Subject: [PATCH] Revert "use erofs for RO partitions" This reverts commit 554e90c4397ef05f41e0e4fb7b69c2d839227cea. It turned out EROFS has app-launch time regression. FS Total image App-launch OTA size (MB) size (MB) Time (AVG) ext4 4040 (0%) 403.77 2252 erofs (compression) 2754 (-32%) 540.98 (+34%) 2528 (+12%) erofs (no-compression) 4126 (+2%) 476.23 (+18%) 2277 (+1%) Bug: 231934752 Signed-off-by: Jaegeuk Kim Change-Id: I33f68a426ff655a9282fec66c0fa54215954aa45 Merged-In: I33f68a426ff655a9282fec66c0fa54215954aa45 --- BoardConfig-common.mk | 9 +++------ conf/fstab.gs201.in | 12 ++++++------ conf/fstab.postinstall | 2 +- device.mk | 2 +- 4 files changed, 11 insertions(+), 14 deletions(-) diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk index 313ca5d9..18bdad62 100644 --- a/BoardConfig-common.mk +++ b/BoardConfig-common.mk @@ -157,15 +157,12 @@ PRODUCT_FS_COMPRESSION := 1 BOARD_FLASH_BLOCK_SIZE := 4096 BOARD_MOUNT_SDCARD_RW := true -# system.img -BOARD_SYSTEMIMAGE_FILE_SYSTEM_TYPE := erofs - # product.img -BOARD_PRODUCTIMAGE_FILE_SYSTEM_TYPE := erofs +BOARD_PRODUCTIMAGE_FILE_SYSTEM_TYPE := ext4 TARGET_COPY_OUT_PRODUCT := product # system_ext.img -BOARD_SYSTEM_EXTIMAGE_FILE_SYSTEM_TYPE := erofs +BOARD_SYSTEM_EXTIMAGE_FILE_SYSTEM_TYPE := ext4 TARGET_COPY_OUT_SYSTEM_EXT := system_ext # persist.img @@ -199,7 +196,7 @@ BOARD_SUPER_PARTITION_ERROR_LIMIT := 8006926336 # Build a separate system_dlkm partition BOARD_USES_SYSTEM_DLKMIMAGE := true -BOARD_SYSTEM_DLKMIMAGE_FILE_SYSTEM_TYPE := erofs +BOARD_SYSTEM_DLKMIMAGE_FILE_SYSTEM_TYPE := ext4 TARGET_COPY_OUT_SYSTEM_DLKM := system_dlkm # diff --git a/conf/fstab.gs201.in b/conf/fstab.gs201.in index 79f8cc82..83ba6889 100644 --- a/conf/fstab.gs201.in +++ b/conf/fstab.gs201.in @@ -4,12 +4,12 @@ # specify MF_CHECK, and must come before any filesystems that do specify MF_CHECK # # -system /system erofs ro wait,slotselect,avb=vbmeta_system,logical,first_stage_mount,readahead_size_kb=128 -system_dlkm /system_dlkm erofs ro wait,slotselect,avb=vbmeta_system,logical,first_stage_mount,readahead_size_kb=128 -system_ext /system_ext erofs ro wait,slotselect,avb=vbmeta_system,logical,first_stage_mount,readahead_size_kb=128 -product /product erofs ro wait,slotselect,avb=vbmeta_system,logical,first_stage_mount,readahead_size_kb=128 -vendor /vendor erofs ro wait,slotselect,avb=vbmeta_vendor,logical,first_stage_mount,readahead_size_kb=128 -vendor_dlkm /vendor_dlkm erofs ro wait,slotselect,avb=vbmeta,logical,first_stage_mount +system /system ext4 ro wait,slotselect,avb=vbmeta_system,logical,first_stage_mount,readahead_size_kb=128 +system_dlkm /system_dlkm ext4 ro wait,slotselect,avb=vbmeta_system,logical,first_stage_mount,readahead_size_kb=128 +system_ext /system_ext ext4 ro wait,slotselect,avb=vbmeta_system,logical,first_stage_mount,readahead_size_kb=128 +product /product ext4 ro wait,slotselect,avb=vbmeta_system,logical,first_stage_mount,readahead_size_kb=128 +vendor /vendor ext4 ro wait,slotselect,avb=vbmeta_vendor,logical,first_stage_mount,readahead_size_kb=128 +vendor_dlkm /vendor_dlkm ext4 ro wait,slotselect,avb=vbmeta,logical,first_stage_mount /dev/block/platform/14700000.ufs/by-name/boot /boot emmc defaults slotselect,avb=boot,first_stage_mount /dev/block/platform/14700000.ufs/by-name/init_boot /init_boot emmc defaults slotselect,avb=init_boot,first_stage_mount /dev/block/platform/14700000.ufs/by-name/efs /mnt/vendor/efs f2fs noatime,sync wait,check,formattable diff --git a/conf/fstab.postinstall b/conf/fstab.postinstall index 16b167c2..955fba71 100644 --- a/conf/fstab.postinstall +++ b/conf/fstab.postinstall @@ -1,4 +1,4 @@ # Android fstab file. # # -system /postinstall erofs ro,nosuid,nodev,noexec slotselect_other,logical,avb_keys=/product/etc/security/avb/system_other.avbpubkey +system /postinstall ext4 ro,nosuid,nodev,noexec slotselect_other,logical,avb_keys=/product/etc/security/avb/system_other.avbpubkey diff --git a/device.mk b/device.mk index 572008eb..90ef451d 100644 --- a/device.mk +++ b/device.mk @@ -21,7 +21,7 @@ TARGET_BOARD_PLATFORM := gs201 AB_OTA_POSTINSTALL_CONFIG += \ RUN_POSTINSTALL_system=true \ POSTINSTALL_PATH_system=system/bin/otapreopt_script \ - FILESYSTEM_TYPE_system=erofs \ + FILESYSTEM_TYPE_system=ext4 \ POSTINSTALL_OPTIONAL_system=true # Set Vendor SPL to match platform