platform_system_core/fs_mgr
Mark Salyzyn 8471f92a20 fs_mgr: overlayfs: ReadFstabFromFile touches errno
(cherry picked from commit 98a0128e44)

Regression from commit 77c28476f1
("Remove the mount points defined in skip_mount.cfg from
ReadDefaultFstab()") resulted in ReadFstabFromFile to report
errno ENOENT even upon success, preventing clear error propagation
for real failures (ReadFstabFromFile would _always_ report ENOENT).

The bad error propagation resulted in an adb remount failure.

Added immunization against future adjustments that may also
result in a similar regression in adb remount behaviors.

Test: adb-remount-test.sh
Bug: 132594161
Bug: 128961335
Change-Id: Icf5d48bbfc6d938d4b9657ca8004a6a6ddaab5a6
2019-05-13 11:03:10 -07:00
..
include init: add umount_all builtin. 2019-04-15 10:22:57 -07:00
include_fstab/fstab Remove the mount points defined in skip_mount.cfg from ReadDefaultFstab() 2019-04-24 15:38:58 +08:00
libdm Allow makefiles to be parsed in a trimmed down manifest. 2019-03-25 09:14:33 +00:00
libfiemap_writer Add fiemap_writer_test to VTS. 2019-04-09 17:04:04 -07:00
libfs_avb Support booting a chained boot-debug.img 2019-05-08 08:04:33 +08:00
liblp Add a liblp test that we can parse the device's super partition. 2019-05-10 12:16:19 -07:00
tests Replace reboot-fastboot by reboot fastboot 2019-04-02 17:04:39 -07:00
tools init: Support booting off GSIs installed to non-userdata block devices. 2019-03-20 18:22:00 -07:00
.clang-format Fix-up coding style 2017-02-18 12:33:36 +08:00
Android.bp fs_mgr_remount: support legacy devices (marlin) 2019-02-27 13:03:13 -08:00
fs_mgr.cpp Fix bug that would prevent us from reserving right amount of space. 2019-05-10 10:39:54 +02:00
fs_mgr_boot_config.cpp fs_mgr: Fix kernel command line parsing 2018-12-19 20:03:10 +02:00
fs_mgr_dm_linear.cpp init: add umount_all builtin. 2019-04-15 10:22:57 -07:00
fs_mgr_format.cpp Add android::fs_mgr namespace for new Fstab code 2019-01-30 20:20:05 -08:00
fs_mgr_fstab.cpp fs_mgr: overlayfs: ReadFstabFromFile touches errno 2019-05-13 11:03:10 -07:00
fs_mgr_overlayfs.cpp fs_mgr: overlayfs: ReadFstabFromFile touches errno 2019-05-13 11:03:10 -07:00
fs_mgr_priv.h init: add umount_all builtin. 2019-04-15 10:22:57 -07:00
fs_mgr_priv_boot_config.h fs_mgr: fs_mgr_get_boot_config_from_kernel_cmdline deal with quote 2018-06-08 16:04:17 -07:00
fs_mgr_remount.cpp fs_mgr_remount: fix a typo 2019-05-09 17:20:13 +08:00
fs_mgr_roots.cpp fs_mgr: make changes needed to port vold to new Fstab interface 2019-01-29 14:56:49 -08:00
fs_mgr_slotselect.cpp Add android::fs_mgr namespace for new Fstab code 2019-01-30 20:20:05 -08:00
fs_mgr_vendor_overlay.cpp Allow product partition to have vendor_overlay 2018-11-27 23:34:00 +00:00
fs_mgr_verity.cpp init: add umount_all builtin. 2019-04-15 10:22:57 -07:00
OWNERS fs_mgr: add dvander@ to OWNERS 2019-01-18 16:36:59 -08:00
README.overlayfs.md fs_mgr: overlayfs: requires override_creds patch for 4.4+ kernels (taimen) 2019-02-26 08:45:17 -08:00

Android Overlayfs integration with adb remount

Introduction

Users working with userdebug or eng builds expect to be able to remount the system partition as read-write and then add or modify any number of files without reflashing the system image, which is understandably efficient for a development cycle. Limited memory systems that chose to use readonly filesystems like squashfs, or Logical Resizable Android Partitions which land system partition images right-sized, and with filesystem that have been deduped on the block level to compress the content; means that either a remount is not possible directly, or when done offers little or no utility because of remaining space limitations or support logistics.

Overlayfs comes to the rescue for these debug scenarios, and logic will automatically setup backing storage for a writable filesystem as an upper reference, and mount overtop the lower. These actions will be performed in the adb disable-verity and adb remount requests.

Operations

Cookbook

The typical action to utilize the remount facility is:

$ adb root
$ adb disable-verity
$ adb reboot
$ adb wait-for-device
$ adb root
$ adb remount

Followed by one of the following:

$ adb stop
$ adb sync
$ adb start
$ adb reboot

or

$ adb push <source> <destination>
$ adb reboot

Note that the sequence above:

$ adb disable-verity
$ adb reboot

or

$ adb remount

can be replaced in both places with:

$ adb remount -R

which will not reboot if everything is already prepared and ready to go.

None of this changes if overlayfs needs to be engaged. The decisions whether to use traditional direct filesystem remount, or one wrapped by overlayfs is automatically determined based on a probe of the filesystem types and space remaining.

Backing Storage

When overlayfs logic is feasible, it will use either the /cache/overlay/ directory for non-A/B devices, or the /mnt/scratch/overlay directory for A/B devices that have access to Logical Resizable Android Partitions. The backing store is used as soon as possible in the boot process and can occur at first stage init, or at the mount_all init rc commands.

This early as possible attachment of overlayfs means that sepolicy or init itself can also be pushed and used after the exec phases that accompany each stage.

Caveats

  • Space used in the backing storage is on a file by file basis and will require more space than if updated in place. As such it is important to be mindful of any wasted space, for instance BOARD_IMAGE_PARTITION_RESERVED_SIZE being defined will have a negative impact on the overall right-sizing of images and thus free dynamic partition space.
  • Kernel must have CONFIG_OVERLAY_FS=y and will need to be patched with "overlayfs: override_creds=off option bypass creator_cred" if kernel is 4.4 or higher. The patch is available on the upstream mailing list and the latest as of Feb 8 2019 is https://lore.kernel.org/patchwork/patch/1009299/. This patch adds an override_creds mount option to overlayfs that permits legacy behavior for systems that do not have overlapping sepolicy rules, principals of least privilege, which is how Android behaves.
  • adb enable-verity will free up overlayfs and as a bonus the device will be reverted pristine to before any content was updated. Update engine does not take advantage of this, will perform a full OTA.
  • Update engine may not run if fs_mgr_overlayfs_is_setup() reports true as adb remount overrides are incompatible with an OTA resources.
  • For implementation simplicity on retrofit dynamic partition devices, take the whole alternate super (eg: if "a" slot, then the whole of "system_b"). Since landing a filesystem on the alternate super physical device without differentiating if it is setup to support logical or physical, the alternate slot metadata and previous content will be lost.
  • If dynamic partitions runs out of space, resizing a logical partition larger may fail because of the scratch partition. If this happens, either fastboot flashall or adb enable-verity can be used to clear scratch storage to permit the flash. Then reinstate the overrides and continue.
  • File bugs or submit fixes for review.