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

Commit 7feb509f authored by Keun-young Park's avatar Keun-young Park
Browse files

add additional dump for timeout 

- add sysrq-trigger current tasks dump
- This helps detecting kernel thread stuck in a specific driver

bug: 37573746
Test: python packages/services/Car/tools/bootanalyze/bootanalyze.py -r -c packages/services/Car/tools/bootanalyze/config.yaml -n 2000 -f -e 15 -w 30  -v -a

(cherry picked from commit 1663e97f)

Change-Id: I1684b9861fe3b797768ea9fdc3544263e0710ee1
parent 57e3528d

init/reboot.cpp

+7 −3
Original line number Diff line number Diff line
@@ -205,7 +205,7 @@ static bool FindPartitionsToUmount(std::vector<MountEntry>* blockDevPartitions, 
    return true;

}



static void DumpUmountDebuggingInfo() {

static void DumpUmountDebuggingInfo(bool dump_all) {

    int status;

    if (!security_getenforce()) {

        LOG(INFO) << "Run lsof";
@@ -214,6 +214,10 @@ static void DumpUmountDebuggingInfo() { 
                                true, nullptr, nullptr, 0);

    }

    FindPartitionsToUmount(nullptr, nullptr, true);

    if (dump_all) {

        // dump current tasks, this log can be lengthy, so only dump with dump_all

        android::base::WriteStringToFile("t", "/proc/sysrq-trigger");

    }

}



static UmountStat UmountPartitions(int timeoutMs) {
@@ -277,11 +281,11 @@ static UmountStat TryUmountAndFsck(bool runFsck, int timeoutMs) { 
    UmountStat stat = UmountPartitions(timeoutMs - t.duration_ms());

    if (stat != UMOUNT_STAT_SUCCESS) {

        LOG(INFO) << "umount timeout, last resort, kill all and try";

        if (DUMP_ON_UMOUNT_FAILURE) DumpUmountDebuggingInfo();

        if (DUMP_ON_UMOUNT_FAILURE) DumpUmountDebuggingInfo(false);

        KillAllProcesses();

        // even if it succeeds, still it is timeout and do not run fsck with all processes killed

        UmountPartitions(0);

        if (DUMP_ON_UMOUNT_FAILURE) DumpUmountDebuggingInfo();

        if (DUMP_ON_UMOUNT_FAILURE) DumpUmountDebuggingInfo(true);

    }



    if (stat == UMOUNT_STAT_SUCCESS && runFsck) {