793f4b503e
On marlin, dev.mnt.blk.root is empty. Issue is shared for all devices that are system-as-root. /dev/root /proc/mounts entry exists before the associated block device is instantiated by ueventd. As a result when the device shows up the root mount is updated late when the next mount inotify trigger occurs, delay which we will accept. But the property entries are added before removed in the loop which causes the ultimate property entry for root to report empty. Add /dev/block/dm-0, remove /dev/root, for property dev.mnt.blk.root. Fix is to change to Remove before Adding. Remove /dev/root, then add /dev/block/dm-0. On system-as-root as well, can not just use fstab. Determine if a dm-verity reference is wrapped around system and use that instead. Add some additional filtration of loop and APEX mounts to reduce property noise. Fix issue with creating the std:string line holder from getline(3). Test: manual on marlin Bug: 124072565 Change-Id: Ief2e1a6f559cbcbc87273fc2db35c675bb972f43
154 lines
5.5 KiB
C++
154 lines
5.5 KiB
C++
/*
|
|
* Copyright (C) 2019 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.
|
|
*/
|
|
|
|
#include "mount_handler.h"
|
|
|
|
#include <ctype.h>
|
|
#include <fcntl.h>
|
|
#include <stdio.h>
|
|
#include <string.h>
|
|
#include <sys/epoll.h>
|
|
#include <sys/types.h>
|
|
#include <unistd.h>
|
|
|
|
#include <algorithm>
|
|
#include <string>
|
|
#include <utility>
|
|
#include <vector>
|
|
|
|
#include <android-base/file.h>
|
|
#include <android-base/logging.h>
|
|
#include <android-base/properties.h>
|
|
#include <android-base/strings.h>
|
|
#include <fs_mgr.h>
|
|
#include <fstab/fstab.h>
|
|
#include <libdm/dm.h>
|
|
|
|
#include "epoll.h"
|
|
#include "property_service.h"
|
|
|
|
namespace android {
|
|
namespace init {
|
|
|
|
namespace {
|
|
|
|
MountHandlerEntry ParseMount(const std::string& line) {
|
|
auto fields = android::base::Split(line, " ");
|
|
while (fields.size() < 3) fields.emplace_back("");
|
|
if (fields[0] == "/dev/root") {
|
|
auto& dm = dm::DeviceMapper::Instance();
|
|
std::string path;
|
|
if (dm.GetDmDevicePathByName("system", &path) || dm.GetDmDevicePathByName("vroot", &path)) {
|
|
fields[0] = path;
|
|
} else if (android::fs_mgr::Fstab fstab; android::fs_mgr::ReadDefaultFstab(&fstab)) {
|
|
auto entry = GetEntryForMountPoint(&fstab, "/");
|
|
if (entry || (entry = GetEntryForMountPoint(&fstab, "/system"))) {
|
|
fields[0] = entry->blk_device;
|
|
}
|
|
}
|
|
}
|
|
if (android::base::StartsWith(fields[0], "/dev/")) {
|
|
if (std::string link; android::base::Readlink(fields[0], &link)) {
|
|
fields[0] = link;
|
|
}
|
|
}
|
|
return MountHandlerEntry(fields[0], fields[1], fields[2]);
|
|
}
|
|
|
|
void SetMountProperty(const MountHandlerEntry& entry, bool add) {
|
|
static constexpr char devblock[] = "/dev/block/";
|
|
if (!android::base::StartsWith(entry.blk_device, devblock)) return;
|
|
std::string value;
|
|
if (add) {
|
|
value = entry.blk_device.substr(strlen(devblock));
|
|
if (android::base::StartsWith(value, "sd")) {
|
|
// All sd partitions inherit their queue characteristics
|
|
// from the whole device reference. Strip partition number.
|
|
auto it = std::find_if(value.begin(), value.end(), [](char c) { return isdigit(c); });
|
|
if (it != value.end()) value.erase(it, value.end());
|
|
}
|
|
auto queue = "/sys/block/" + value + "/queue";
|
|
struct stat sb;
|
|
if (stat(queue.c_str(), &sb) || !S_ISDIR(sb.st_mode)) value = "";
|
|
if (stat(entry.mount_point.c_str(), &sb) || !S_ISDIR(sb.st_mode)) value = "";
|
|
// Clear the noise associated with loopback and APEX.
|
|
if (android::base::StartsWith(value, "loop")) value = "";
|
|
if (android::base::StartsWith(entry.mount_point, "/apex/")) value = "";
|
|
}
|
|
auto mount_prop = entry.mount_point;
|
|
if (mount_prop == "/") mount_prop = "/root";
|
|
std::replace(mount_prop.begin(), mount_prop.end(), '/', '.');
|
|
mount_prop = "dev.mnt.blk" + mount_prop;
|
|
// Set property even if its value does not change to trigger 'on property:'
|
|
// handling, except for clearing non-existent or already clear property.
|
|
// Goal is reduction of empty properties and associated triggers.
|
|
if (value.empty() && android::base::GetProperty(mount_prop, "").empty()) return;
|
|
property_set(mount_prop, value);
|
|
}
|
|
|
|
} // namespace
|
|
|
|
MountHandlerEntry::MountHandlerEntry(const std::string& blk_device, const std::string& mount_point,
|
|
const std::string& fs_type)
|
|
: blk_device(blk_device), mount_point(mount_point), fs_type(fs_type) {}
|
|
|
|
bool MountHandlerEntry::operator<(const MountHandlerEntry& r) const {
|
|
if (blk_device < r.blk_device) return true;
|
|
if (blk_device > r.blk_device) return false;
|
|
if (mount_point < r.mount_point) return true;
|
|
if (mount_point > r.mount_point) return false;
|
|
return fs_type < r.fs_type;
|
|
}
|
|
|
|
MountHandler::MountHandler(Epoll* epoll) : epoll_(epoll), fp_(fopen("/proc/mounts", "re"), fclose) {
|
|
if (!fp_) PLOG(FATAL) << "Could not open /proc/mounts";
|
|
auto result = epoll->RegisterHandler(
|
|
fileno(fp_.get()), [this]() { this->MountHandlerFunction(); }, EPOLLERR | EPOLLPRI);
|
|
if (!result) LOG(FATAL) << result.error();
|
|
}
|
|
|
|
MountHandler::~MountHandler() {
|
|
if (fp_) epoll_->UnregisterHandler(fileno(fp_.get())).IgnoreError();
|
|
}
|
|
|
|
void MountHandler::MountHandlerFunction() {
|
|
rewind(fp_.get());
|
|
std::vector<MountHandlerEntry> touched;
|
|
auto untouched = mounts_;
|
|
char* buf = nullptr;
|
|
size_t len = 0;
|
|
while (getline(&buf, &len, fp_.get()) != -1) {
|
|
auto entry = ParseMount(std::string(buf));
|
|
auto match = untouched.find(entry);
|
|
if (match == untouched.end()) {
|
|
touched.emplace_back(std::move(entry));
|
|
} else {
|
|
untouched.erase(match);
|
|
}
|
|
}
|
|
free(buf);
|
|
for (auto entry : untouched) {
|
|
SetMountProperty(entry, false);
|
|
mounts_.erase(entry);
|
|
}
|
|
for (auto entry : touched) {
|
|
SetMountProperty(entry, true);
|
|
mounts_.emplace(std::move(entry));
|
|
}
|
|
}
|
|
|
|
} // namespace init
|
|
} // namespace android
|