From 55ef3d6104032dcaa773e486405cb9f8978fd5ce Mon Sep 17 00:00:00 2001 From: Jooyung Han Date: Thu, 10 Aug 2023 18:27:22 +0900 Subject: [PATCH] Skip bootstrap APEX RC files for the second round Reading .rc files from bootstrap APEXes causes "double loading". This works for services because init just ignores duplicates. But it emits error logs, which can mislead even though there's no actual errors. Besides, for actions, duplicates can cause a problem when commands are not idempotent. So, when loading RC files from APEXes for the second time, we'd better skip those bootstrap APEXes. Bug: 290148081 Test: VendorApexHostTestCases Change-Id: Ia630dbd14046064b5e5c612c01ebacf57091c8d4 --- init/apex_init_util.cpp | 95 ++++++++++++++++++++++++++++++++--------- init/apex_init_util.h | 8 ++-- init/builtins.cpp | 6 +-- init/init.cpp | 2 +- 4 files changed, 83 insertions(+), 28 deletions(-) diff --git a/init/apex_init_util.cpp b/init/apex_init_util.cpp index c818f8fe9..d88da390e 100644 --- a/init/apex_init_util.cpp +++ b/init/apex_init_util.cpp @@ -16,13 +16,15 @@ #include "apex_init_util.h" +#include #include +#include #include #include -#include #include +#include #include #include "action_manager.h" @@ -34,10 +36,13 @@ namespace android { namespace init { -static Result> CollectApexConfigs(const std::string& apex_name) { +static Result> CollectRcScriptsFromApex( + const std::string& apex_name, const std::set& skip_apexes) { glob_t glob_result; - std::string glob_pattern = apex_name.empty() ? - "/apex/*/etc/*rc" : "/apex/" + apex_name + "/etc/*rc"; + // Pattern uses "*rc" instead of ".rc" because APEXes can have versioned RC files + // like foo.34rc. + std::string glob_pattern = + apex_name.empty() ? "/apex/*/etc/*rc" : "/apex/" + apex_name + "/etc/*rc"; const int ret = glob(glob_pattern.c_str(), GLOB_MARK, nullptr, &glob_result); if (ret != 0 && ret != GLOB_NOMATCH) { @@ -47,15 +52,28 @@ static Result> CollectApexConfigs(const std::string& ap std::vector configs; for (size_t i = 0; i < glob_result.gl_pathc; i++) { std::string path = glob_result.gl_pathv[i]; - // Filter-out /apex/@ paths. The paths are bind-mounted to - // /apex/ paths, so unless we filter them out, we will parse the - // same file twice. - std::vector paths = android::base::Split(path, "/"); - if (paths.size() >= 3 && paths[2].find('@') != std::string::npos) { + + // Filter out directories + if (path.back() == '/') { continue; } - // Filter directories - if (path.back() == '/') { + + // Get apex name from path. + std::vector paths = android::base::Split(path, "/"); + if (paths.size() < 3) { + continue; + } + const std::string& apex_name = paths[2]; + + // Filter out /apex/@ paths. The paths are bind-mounted to + // /apex/ paths, so unless we filter them out, we will parse the + // same file twice. + if (apex_name.find('@') != std::string::npos) { + continue; + } + + // Filter out skip_set apexes + if (skip_apexes.count(apex_name) > 0) { continue; } configs.push_back(path); @@ -64,11 +82,41 @@ static Result> CollectApexConfigs(const std::string& ap return configs; } -static Result ParseConfigs(const std::vector& configs) { +static std::set GetApexListFrom(const std::string& apex_dir) { + std::set apex_list; + auto dirp = std::unique_ptr(opendir(apex_dir.c_str()), closedir); + if (!dirp) { + return apex_list; + } + struct dirent* entry; + while ((entry = readdir(dirp.get())) != nullptr) { + if (entry->d_type != DT_DIR) continue; + + const char* name = entry->d_name; + if (name[0] == '.') continue; + if (strchr(name, '@') != nullptr) continue; + if (strcmp(name, "sharedlibs") == 0) continue; + apex_list.insert(name); + } + return apex_list; +} + +static Result ParseRcScripts(const std::vector& files) { + if (files.empty()) { + return {}; + } + // APEXes can have versioned RC files. These should be filtered based on + // SDK version. + auto filtered = FilterVersionedConfigs( + files, android::base::GetIntProperty("ro.build.version.sdk", INT_MAX)); + if (filtered.empty()) { + return {}; + } + Parser parser = CreateApexConfigParser(ActionManager::GetInstance(), ServiceList::GetInstance()); std::vector errors; - for (const auto& c : configs) { + for (const auto& c : filtered) { auto result = parser.ParseConfigFile(c); // We should handle other config files even when there's an error. if (!result.ok()) { @@ -81,16 +129,21 @@ static Result ParseConfigs(const std::vector& configs) { return {}; } -Result ParseApexConfigs(const std::string& apex_name) { - auto configs = OR_RETURN(CollectApexConfigs(apex_name)); +Result ParseRcScriptsFromApex(const std::string& apex_name) { + auto configs = OR_RETURN(CollectRcScriptsFromApex(apex_name, /*skip_apexes=*/{})); + return ParseRcScripts(configs); +} - if (configs.empty()) { - return {}; +Result ParseRcScriptsFromAllApexes(bool bootstrap) { + std::set skip_apexes; + if (!bootstrap) { + // In case we already loaded config files from bootstrap APEXes, we need to avoid loading + // them again. We can get the list of bootstrap APEXes by scanning /bootstrap-apex and + // skip them in CollectRcScriptsFromApex. + skip_apexes = GetApexListFrom("/bootstrap-apex"); } - - auto filtered_configs = FilterVersionedConfigs(configs, - android::base::GetIntProperty("ro.build.version.sdk", INT_MAX)); - return ParseConfigs(filtered_configs); + auto configs = OR_RETURN(CollectRcScriptsFromApex(/*apex_name=*/"", skip_apexes)); + return ParseRcScripts(configs); } } // namespace init diff --git a/init/apex_init_util.h b/init/apex_init_util.h index 43f8ad5eb..e55b3c0c9 100644 --- a/init/apex_init_util.h +++ b/init/apex_init_util.h @@ -24,9 +24,11 @@ namespace android { namespace init { -// Parse all config files for a given apex. -// If apex name is empty(""), config files for all apexes will be parsed. -Result ParseApexConfigs(const std::string& apex_name); +// Parse all RC scripts for a given apex. +Result ParseRcScriptsFromApex(const std::string& apex_name); + +// Parse all RC scripts for all apexes under /apex. +Result ParseRcScriptsFromAllApexes(bool bootstrap); } // namespace init } // namespace android diff --git a/init/builtins.cpp b/init/builtins.cpp index e40b831d1..2ced66d11 100644 --- a/init/builtins.cpp +++ b/init/builtins.cpp @@ -1307,9 +1307,9 @@ static Result do_perform_apex_config(const BuiltinArguments& args) { } } - auto parse_configs = ParseApexConfigs(/*apex_name=*/""); - if (!parse_configs.ok()) { - return parse_configs.error(); + auto parse_result = ParseRcScriptsFromAllApexes(bootstrap); + if (!parse_result.ok()) { + return parse_result.error(); } auto update_linker_config = do_update_linker_config(args); diff --git a/init/init.cpp b/init/init.cpp index 4bb8eecb9..40e21696f 100644 --- a/init/init.cpp +++ b/init/init.cpp @@ -487,7 +487,7 @@ static Result UpdateApexLinkerConfig(const std::string& apex_name) { } static Result DoLoadApex(const std::string& apex_name) { - if (auto result = ParseApexConfigs(apex_name); !result.ok()) { + if (auto result = ParseRcScriptsFromApex(apex_name); !result.ok()) { return result.error(); }