Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f37113ec authored by Jaegeuk Kim's avatar Jaegeuk Kim Committed by Automerger Merge Worker
Browse files

Merge "Support /dev/fscklogs/log in f2fs back" am: 45aafa58 

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2081719



Change-Id: Ic02e595a64a3c1e74647513d95d83c8f1318c8b1
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 43adeac0 45aafa58

fs_mgr/fs_mgr.cpp

+12 −8
Original line number Original line Diff line number Diff line
@@ -124,8 +124,8 @@ enum FsStatFlags { 
    FS_STAT_RO_MOUNT_FAILED = 0x0040,

    FS_STAT_RO_MOUNT_FAILED = 0x0040,

    FS_STAT_RO_UNMOUNT_FAILED = 0x0080,

    FS_STAT_RO_UNMOUNT_FAILED = 0x0080,

    FS_STAT_FULL_MOUNT_FAILED = 0x0100,

    FS_STAT_FULL_MOUNT_FAILED = 0x0100,

    FS_STAT_E2FSCK_FAILED = 0x0200,

    FS_STAT_FSCK_FAILED = 0x0200,

    FS_STAT_E2FSCK_FS_FIXED = 0x0400,

    FS_STAT_FSCK_FS_FIXED = 0x0400,

    FS_STAT_INVALID_MAGIC = 0x0800,

    FS_STAT_INVALID_MAGIC = 0x0800,

    FS_STAT_TOGGLE_QUOTAS_FAILED = 0x10000,

    FS_STAT_TOGGLE_QUOTAS_FAILED = 0x10000,

    FS_STAT_SET_RESERVED_BLOCKS_FAILED = 0x20000,

    FS_STAT_SET_RESERVED_BLOCKS_FAILED = 0x20000,
@@ -136,7 +136,6 @@ enum FsStatFlags { 
};

};





static void log_fs_stat(const std::string& blk_device, int fs_stat) {

static void log_fs_stat(const std::string& blk_device, int fs_stat) {

    if ((fs_stat & FS_STAT_IS_EXT4) == 0) return; // only log ext4

    std::string msg =

    std::string msg =

            android::base::StringPrintf("\nfs_stat,%s,0x%x\n", blk_device.c_str(), fs_stat);

            android::base::StringPrintf("\nfs_stat,%s,0x%x\n", blk_device.c_str(), fs_stat);

    android::base::unique_fd fd(TEMP_FAILURE_RETRY(open(FSCK_LOG_FILE, O_WRONLY | O_CLOEXEC |

    android::base::unique_fd fd(TEMP_FAILURE_RETRY(open(FSCK_LOG_FILE, O_WRONLY | O_CLOEXEC |
@@ -166,7 +165,7 @@ static bool should_force_check(int fs_stat) { 
    return fs_stat &

    return fs_stat &

           (FS_STAT_E2FSCK_F_ALWAYS | FS_STAT_UNCLEAN_SHUTDOWN | FS_STAT_QUOTA_ENABLED |

           (FS_STAT_E2FSCK_F_ALWAYS | FS_STAT_UNCLEAN_SHUTDOWN | FS_STAT_QUOTA_ENABLED |

            FS_STAT_RO_MOUNT_FAILED | FS_STAT_RO_UNMOUNT_FAILED | FS_STAT_FULL_MOUNT_FAILED |

            FS_STAT_RO_MOUNT_FAILED | FS_STAT_RO_UNMOUNT_FAILED | FS_STAT_FULL_MOUNT_FAILED |

            FS_STAT_E2FSCK_FAILED | FS_STAT_TOGGLE_QUOTAS_FAILED |

            FS_STAT_FSCK_FAILED | FS_STAT_TOGGLE_QUOTAS_FAILED |

            FS_STAT_SET_RESERVED_BLOCKS_FAILED | FS_STAT_ENABLE_ENCRYPTION_FAILED);

            FS_STAT_SET_RESERVED_BLOCKS_FAILED | FS_STAT_ENABLE_ENCRYPTION_FAILED);

}

}
@@ -255,10 +254,10 @@ static void check_fs(const std::string& blk_device, const std::string& fs_type, 
            if (ret < 0) {

            if (ret < 0) {

                /* No need to check for error in fork, we can't really handle it now */

                /* No need to check for error in fork, we can't really handle it now */

                LERROR << "Failed trying to run " << E2FSCK_BIN;

                LERROR << "Failed trying to run " << E2FSCK_BIN;

                *fs_stat |= FS_STAT_E2FSCK_FAILED;

                *fs_stat |= FS_STAT_FSCK_FAILED;

            } else if (status != 0) {

            } else if (status != 0) {

                LINFO << "e2fsck returned status 0x" << std::hex << status;

                LINFO << "e2fsck returned status 0x" << std::hex << status;

                *fs_stat |= FS_STAT_E2FSCK_FS_FIXED;

                *fs_stat |= FS_STAT_FSCK_FS_FIXED;

            }

            }

        }

        }

    } else if (is_f2fs(fs_type)) {

    } else if (is_f2fs(fs_type)) {
@@ -271,16 +270,20 @@ static void check_fs(const std::string& blk_device, const std::string& fs_type, 
            LINFO << "Running " << F2FS_FSCK_BIN << " -f -c 10000 --debug-cache "

            LINFO << "Running " << F2FS_FSCK_BIN << " -f -c 10000 --debug-cache "

                  << realpath(blk_device);

                  << realpath(blk_device);

            ret = logwrap_fork_execvp(ARRAY_SIZE(f2fs_fsck_forced_argv), f2fs_fsck_forced_argv,

            ret = logwrap_fork_execvp(ARRAY_SIZE(f2fs_fsck_forced_argv), f2fs_fsck_forced_argv,

                                      &status, false, LOG_KLOG | LOG_FILE, false, nullptr);

                                      &status, false, LOG_KLOG | LOG_FILE, false, FSCK_LOG_FILE);

        } else {

        } else {

            LINFO << "Running " << F2FS_FSCK_BIN << " -a -c 10000 --debug-cache "

            LINFO << "Running " << F2FS_FSCK_BIN << " -a -c 10000 --debug-cache "

                  << realpath(blk_device);

                  << realpath(blk_device);

            ret = logwrap_fork_execvp(ARRAY_SIZE(f2fs_fsck_argv), f2fs_fsck_argv, &status, false,

            ret = logwrap_fork_execvp(ARRAY_SIZE(f2fs_fsck_argv), f2fs_fsck_argv, &status, false,

                                      LOG_KLOG | LOG_FILE, false, nullptr);

                                      LOG_KLOG | LOG_FILE, false, FSCK_LOG_FILE);

        }

        }

        if (ret < 0) {

        if (ret < 0) {

            /* No need to check for error in fork, we can't really handle it now */

            /* No need to check for error in fork, we can't really handle it now */

            LERROR << "Failed trying to run " << F2FS_FSCK_BIN;

            LERROR << "Failed trying to run " << F2FS_FSCK_BIN;

            *fs_stat |= FS_STAT_FSCK_FAILED;

        } else if (status != 0) {

            LINFO << F2FS_FSCK_BIN << " returned status 0x" << std::hex << status;

            *fs_stat |= FS_STAT_FSCK_FS_FIXED;

        }

        }

    }

    }

    android::base::SetProperty("ro.boottime.init.fsck." + Basename(target),

    android::base::SetProperty("ro.boottime.init.fsck." + Basename(target),
@@ -1911,6 +1914,7 @@ static int fs_mgr_do_mount_helper(Fstab* fstab, const std::string& n_name, 
        while (retry_count-- > 0) {

        while (retry_count-- > 0) {

            if (!__mount(n_blk_device, mount_point, fstab_entry)) {

            if (!__mount(n_blk_device, mount_point, fstab_entry)) {

                fs_stat &= ~FS_STAT_FULL_MOUNT_FAILED;

                fs_stat &= ~FS_STAT_FULL_MOUNT_FAILED;

                log_fs_stat(fstab_entry.blk_device, fs_stat);

                return FS_MGR_DOMNT_SUCCESS;

                return FS_MGR_DOMNT_SUCCESS;

            } else {

            } else {

                if (retry_count <= 0) break;  // run check_fs only once

                if (retry_count <= 0) break;  // run check_fs only once

rootdir/init.rc

+4 −4
Original line number Original line Diff line number Diff line
@@ -86,6 +86,10 @@ on early-init 
    mkdir /dev/sys/fs 0755 system system

    mkdir /dev/sys/fs 0755 system system

    mkdir /dev/sys/block 0755 system system

    mkdir /dev/sys/block 0755 system system





    # Create location for fs_mgr to store abbreviated output from filesystem

    # checker programs.

    mkdir /dev/fscklogs 0770 root system



# Run boringssl self test for each ABI so that later processes can skip it. http://b/139348610

# Run boringssl self test for each ABI so that later processes can skip it. http://b/139348610

on early-init && property:ro.product.cpu.abilist32=*

on early-init && property:ro.product.cpu.abilist32=*

    exec_start boringssl_self_test32

    exec_start boringssl_self_test32
@@ -447,10 +451,6 @@ on init 




    mount bpf bpf /sys/fs/bpf nodev noexec nosuid

    mount bpf bpf /sys/fs/bpf nodev noexec nosuid





    # Create location for fs_mgr to store abbreviated output from filesystem

    # checker programs.

    mkdir /dev/fscklogs 0770 root system



    # pstore/ramoops previous console log

    # pstore/ramoops previous console log

    mount pstore pstore /sys/fs/pstore nodev noexec nosuid

    mount pstore pstore /sys/fs/pstore nodev noexec nosuid

    chown system log /sys/fs/pstore

    chown system log /sys/fs/pstore