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

Commit 691163da authored by Sanjana Sunil's avatar Sanjana Sunil
Browse files

Bind mount misc storage to mirror for different volumes 

A mirror for misc_ce and misc_de storage is created for each new volume
UUID and a bind mount occurs from /mnt/expand/<uuid>/misc_{ce,de} to
/data_mirror/misc_{ce,de}/<uuid>.

This is similar to how apps use data_mirror. In addition, when a private
volume is unmounted, the mirror for that volume UUID is deleted.

Bug: 214241165
Test: atest SdkSandboxStorageHostTest

Change-Id: I3ea99145e38ed3781a701c1305720f2d4dbe54ce
Merged-In: I3ea99145e38ed3781a701c1305720f2d4dbe54ce
parent 24e51020

cmds/installd/InstalldNativeService.cpp

+62 −2
Original line number Diff line number Diff line
@@ -99,6 +99,8 @@ static constexpr const char* kXattrDefault = "user.default"; 


static constexpr const char* kDataMirrorCePath = "/data_mirror/data_ce";

static constexpr const char* kDataMirrorDePath = "/data_mirror/data_de";

static constexpr const char* kMiscMirrorCePath = "/data_mirror/misc_ce";

static constexpr const char* kMiscMirrorDePath = "/data_mirror/misc_de";



static constexpr const int MIN_RESTRICTED_HOME_SDK_VERSION = 24; // > M
@@ -3558,16 +3560,28 @@ binder::Status InstalldNativeService::tryMountDataMirror( 


    std::string mirrorVolCePath(StringPrintf("%s/%s", kDataMirrorCePath, uuid_));

    if (fs_prepare_dir(mirrorVolCePath.c_str(), 0711, AID_SYSTEM, AID_SYSTEM) != 0) {

        return error("Failed to create CE mirror");

        return error("Failed to create CE data mirror");

    }



    std::string mirrorVolDePath(StringPrintf("%s/%s", kDataMirrorDePath, uuid_));

    if (fs_prepare_dir(mirrorVolDePath.c_str(), 0711, AID_SYSTEM, AID_SYSTEM) != 0) {

        return error("Failed to create DE mirror");

        return error("Failed to create DE data mirror");

    }



    std::string mirrorVolMiscCePath(StringPrintf("%s/%s", kMiscMirrorCePath, uuid_));

    if (fs_prepare_dir(mirrorVolMiscCePath.c_str(), 0711, AID_SYSTEM, AID_SYSTEM) != 0) {

        return error("Failed to create CE misc mirror");

    }



    std::string mirrorVolMiscDePath(StringPrintf("%s/%s", kMiscMirrorDePath, uuid_));

    if (fs_prepare_dir(mirrorVolMiscDePath.c_str(), 0711, AID_SYSTEM, AID_SYSTEM) != 0) {

        return error("Failed to create DE misc mirror");

    }



    auto cePath = StringPrintf("%s/user", create_data_path(uuid_).c_str());

    auto dePath = StringPrintf("%s/user_de", create_data_path(uuid_).c_str());

    auto miscCePath = StringPrintf("%s/misc_ce", create_data_path(uuid_).c_str());

    auto miscDePath = StringPrintf("%s/misc_de", create_data_path(uuid_).c_str());



    if (access(cePath.c_str(), F_OK) != 0) {

        return error("Cannot access CE path: " + cePath);
@@ -3575,6 +3589,12 @@ binder::Status InstalldNativeService::tryMountDataMirror( 
    if (access(dePath.c_str(), F_OK) != 0) {

        return error("Cannot access DE path: " + dePath);

    }

    if (access(miscCePath.c_str(), F_OK) != 0) {

        return error("Cannot access misc CE path: " + cePath);

    }

    if (access(miscDePath.c_str(), F_OK) != 0) {

        return error("Cannot access misc DE path: " + dePath);

    }



    struct stat ceStat, mirrorCeStat;

    if (stat(cePath.c_str(), &ceStat) != 0) {
@@ -3602,6 +3622,21 @@ binder::Status InstalldNativeService::tryMountDataMirror( 
            MS_NOSUID | MS_NODEV | MS_NOATIME | MS_BIND | MS_NOEXEC, nullptr)) == -1) {

        return error("Failed to mount " + mirrorVolDePath);

    }



    // Mount misc CE mirror

    if (TEMP_FAILURE_RETRY(mount(miscCePath.c_str(), mirrorVolMiscCePath.c_str(), NULL,

                                 MS_NOSUID | MS_NODEV | MS_NOATIME | MS_BIND | MS_NOEXEC,

                                 nullptr)) == -1) {

        return error("Failed to mount " + mirrorVolMiscCePath);

    }



    // Mount misc DE mirror

    if (TEMP_FAILURE_RETRY(mount(miscDePath.c_str(), mirrorVolMiscDePath.c_str(), NULL,

                                 MS_NOSUID | MS_NODEV | MS_NOATIME | MS_BIND | MS_NOEXEC,

                                 nullptr)) == -1) {

        return error("Failed to mount " + mirrorVolMiscDePath);

    }



    return ok();

}
@@ -3624,6 +3659,8 @@ binder::Status InstalldNativeService::onPrivateVolumeRemoved( 


    std::string mirrorCeVolPath(StringPrintf("%s/%s", kDataMirrorCePath, uuid_));

    std::string mirrorDeVolPath(StringPrintf("%s/%s", kDataMirrorDePath, uuid_));

    std::string mirrorMiscCeVolPath(StringPrintf("%s/%s", kMiscMirrorCePath, uuid_));

    std::string mirrorMiscDeVolPath(StringPrintf("%s/%s", kMiscMirrorDePath, uuid_));



    std::lock_guard<std::recursive_mutex> lock(mMountsLock);
@@ -3648,6 +3685,29 @@ binder::Status InstalldNativeService::onPrivateVolumeRemoved( 
    if (delete_dir_contents_and_dir(mirrorDeVolPath, true) != 0) {

        res = error("Failed to delete " + mirrorDeVolPath);

    }



    // Unmount misc CE storage

    if (TEMP_FAILURE_RETRY(umount(mirrorMiscCeVolPath.c_str())) != 0) {

        if (errno != ENOENT) {

            res = error(StringPrintf("Failed to umount %s %s", mirrorMiscCeVolPath.c_str(),

                                     strerror(errno)));

        }

    }

    if (delete_dir_contents_and_dir(mirrorMiscCeVolPath, true) != 0) {

        res = error("Failed to delete " + mirrorMiscCeVolPath);

    }



    // Unmount misc DE storage

    if (TEMP_FAILURE_RETRY(umount(mirrorMiscDeVolPath.c_str())) != 0) {

        if (errno != ENOENT) {

            res = error(StringPrintf("Failed to umount %s %s", mirrorMiscDeVolPath.c_str(),

                                     strerror(errno)));

        }

    }

    if (delete_dir_contents_and_dir(mirrorMiscDeVolPath, true) != 0) {

        res = error("Failed to delete " + mirrorMiscDeVolPath);

    }



    return res;

}