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

Commit 6866041f authored by Jiyong Park's avatar Jiyong Park
Browse files

Proper mount namespace configuration for bionic 

This CL fixes the design problem of the previous mechanism for providing
the bootstrap bionic and the runtime bionic to the same path.

Previously, bootstrap bionic was self-bind-mounted; i.e.
/system/bin/libc.so is bind-mounted to itself. And the runtime bionic
was bind-mounted on top of the bootstrap bionic. This has not only caused
problems like `adb sync` not working(b/122737045), but also is quite
difficult to understand due to the double-and-self mounting.

This is the new design:

Most importantly, these four are all distinct:
1) bootstrap bionic (/system/lib/bootstrap/libc.so)
2) runtime bionic (/apex/com.android.runtime/lib/bionic/libc.so)
3) mount point for 1) and 2) (/bionic/lib/libc.so)
4) symlink for 3) (/system/lib/libc.so -> /bionic/lib/libc.so)

Inside the mount namespace of the pre-apexd processes, 1) is
bind-mounted to 3). Likewise, inside the mount namespace of the
post-apexd processes, 2) is bind-mounted to 3). In other words, there is
no self-mount, and no double-mount.

Another change is that mount points are under /bionic and the legacy
paths become symlinks to the mount points. This is to make sure that
there is no bind mounts under /system, which is breaking some apps.

Finally, code for creating mount namespaces, mounting bionic, etc are
refactored to mount_namespace.cpp

Bug: 120266448
Bug: 123275379
Test: m, device boots, adb sync/push/pull works,
especially with following paths:
/bionic/lib64/libc.so
/bionic/bin/linker64
/system/lib64/bootstrap/libc.so
/system/bin/bootstrap/linker64
Change-Id: Icdfbdcc1efca540ac854d4df79e07ee61fca559f
parent 4695cf0a

init/Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -110,6 +110,7 @@ cc_library_static { 
        "init.cpp",

        "keychords.cpp",

        "modalias_handler.cpp",

        "mount_namespace.cpp",

        "parser.cpp",

        "persistent_properties.cpp",

        "persistent_properties.proto",
@@ -166,6 +167,7 @@ cc_binary { 
            exclude_shared_libs: ["libbinder", "libutils"],

        },

    },

    ldflags: ["-Wl,--rpath,/system/${LIB}/bootstrap"],

}



// Tests

init/Android.mk

+1 −0
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ LOCAL_SRC_FILES := \ 
    first_stage_init.cpp \

    first_stage_main.cpp \

    first_stage_mount.cpp \

    mount_namespace.cpp \

    reboot_utils.cpp \

    selinux.cpp \

    switch_root.cpp \

init/builtins.cpp

+10 −0
Original line number Diff line number Diff line
@@ -63,6 +63,7 @@ 
#include "action_manager.h"

#include "bootchart.h"

#include "init.h"

#include "mount_namespace.h"

#include "parser.h"

#include "property_service.h"

#include "reboot.h"
@@ -1098,6 +1099,14 @@ static Result<Success> do_parse_apex_configs(const BuiltinArguments& args) { 
    }

}



static Result<Success> do_setup_runtime_bionic(const BuiltinArguments& args) {

    if (SwitchToDefaultMountNamespace()) {

        return Success();

    } else {

        return Error() << "Failed to setup runtime bionic";

    }

}



// Builtin-function-map start

const BuiltinFunctionMap::Map& BuiltinFunctionMap::map() const {

    constexpr std::size_t kMax = std::numeric_limits<std::size_t>::max();
@@ -1145,6 +1154,7 @@ const BuiltinFunctionMap::Map& BuiltinFunctionMap::map() const { 
        {"rmdir",                   {1,     1,    {true,   do_rmdir}}},

        {"setprop",                 {2,     2,    {true,   do_setprop}}},

        {"setrlimit",               {3,     3,    {false,  do_setrlimit}}},

        {"setup_runtime_bionic",    {0,     0,    {false,  do_setup_runtime_bionic}}},

        {"start",                   {1,     1,    {false,  do_start}}},

        {"stop",                    {1,     1,    {false,  do_stop}}},

        {"swapon_all",              {1,     1,    {false,  do_swapon_all}}},

init/first_stage_mount.cpp

+0 −4
Original line number Diff line number Diff line
@@ -136,10 +136,6 @@ static inline bool IsDtVbmetaCompatible(const Fstab& fstab) { 
    return is_android_dt_value_expected("vbmeta/compatible", "android,vbmeta");

}



static bool IsRecoveryMode() {

    return access("/system/bin/recovery", F_OK) == 0;

}



static Fstab ReadFirstStageFstab() {

    Fstab fstab;

    if (!ReadFstabFromDt(&fstab)) {

init/init.cpp

+5 −0
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@ 
#include "first_stage_mount.h"

#include "import_parser.h"

#include "keychords.h"

#include "mount_namespace.h"

#include "property_service.h"

#include "reboot.h"

#include "reboot_utils.h"
@@ -666,6 +667,10 @@ int SecondStageMain(int argc, char** argv) { 
    const BuiltinFunctionMap function_map;

    Action::set_function_map(&function_map);



    if (!SetupMountNamespaces()) {

        PLOG(FATAL) << "SetupMountNamespaces failed";

    }



    subcontexts = InitializeSubcontexts();



    ActionManager& am = ActionManager::GetInstance();