Remove the function EnableBlocklist() and add a constructor argument to enable/disable the use of modules.blocklist. In all cases, the enabling/disabling of the blocklist happens immediately after creating the Modprobe object. So this simplies libmodprobe. Additionally, the use of the blocklist by libmodprobe should be enabled by default unless explicitly disabled during creation of the Modprobe object. Currently, only modprobe(8) defaults to not using the blocklist and includes the argument -b BLOCKLIST for enabling it. That functionality remains. This refactor allows us to use the blocklist during first stage init. However, additional logic is needed to not return an error for the blocked non-aliased modules during first stage init; otherwise, the error would result in an init crash leading to a device reboot. So fixup LoadListedModules() to allow blocking modules without returning an error. Bug: 182582036 Test: boot test on pixel 5 with a module in modules.blocklist Change-Id: I394b5aa98fa98821011982cfe693749010c381f7
72 lines
3.2 KiB
C++
72 lines
3.2 KiB
C++
/*
|
|
* Copyright (C) 2018 The Android Open Source Project
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
|
|
#pragma once
|
|
|
|
#include <set>
|
|
#include <string>
|
|
#include <unordered_map>
|
|
#include <unordered_set>
|
|
#include <vector>
|
|
|
|
class Modprobe {
|
|
public:
|
|
Modprobe(const std::vector<std::string>&, const std::string load_file = "modules.load",
|
|
bool use_blocklist = true);
|
|
|
|
bool LoadListedModules(bool strict = true);
|
|
bool LoadWithAliases(const std::string& module_name, bool strict,
|
|
const std::string& parameters = "");
|
|
bool Remove(const std::string& module_name);
|
|
std::vector<std::string> ListModules(const std::string& pattern);
|
|
bool GetAllDependencies(const std::string& module, std::vector<std::string>* pre_dependencies,
|
|
std::vector<std::string>* dependencies,
|
|
std::vector<std::string>* post_dependencies);
|
|
void ResetModuleCount() { module_count_ = 0; }
|
|
int GetModuleCount() { return module_count_; }
|
|
|
|
private:
|
|
std::string MakeCanonical(const std::string& module_path);
|
|
bool InsmodWithDeps(const std::string& module_name, const std::string& parameters);
|
|
bool Insmod(const std::string& path_name, const std::string& parameters);
|
|
bool Rmmod(const std::string& module_name);
|
|
std::vector<std::string> GetDependencies(const std::string& module);
|
|
bool ModuleExists(const std::string& module_name);
|
|
void AddOption(const std::string& module_name, const std::string& option_name,
|
|
const std::string& value);
|
|
std::string GetKernelCmdline();
|
|
bool IsBlocklisted(const std::string& module_name);
|
|
|
|
bool ParseDepCallback(const std::string& base_path, const std::vector<std::string>& args);
|
|
bool ParseAliasCallback(const std::vector<std::string>& args);
|
|
bool ParseSoftdepCallback(const std::vector<std::string>& args);
|
|
bool ParseLoadCallback(const std::vector<std::string>& args);
|
|
bool ParseOptionsCallback(const std::vector<std::string>& args);
|
|
bool ParseBlocklistCallback(const std::vector<std::string>& args);
|
|
void ParseKernelCmdlineOptions();
|
|
void ParseCfg(const std::string& cfg, std::function<bool(const std::vector<std::string>&)> f);
|
|
|
|
std::vector<std::pair<std::string, std::string>> module_aliases_;
|
|
std::unordered_map<std::string, std::vector<std::string>> module_deps_;
|
|
std::vector<std::pair<std::string, std::string>> module_pre_softdep_;
|
|
std::vector<std::pair<std::string, std::string>> module_post_softdep_;
|
|
std::vector<std::string> module_load_;
|
|
std::unordered_map<std::string, std::string> module_options_;
|
|
std::set<std::string> module_blocklist_;
|
|
std::unordered_set<std::string> module_loaded_;
|
|
int module_count_ = 0;
|
|
bool blocklist_enabled = false;
|
|
};
|