5a6bfca163
Now that we're offering to store private app data on adopted storage devices, the performance of those devices is much more important to overall user experience. To help set user expectations, this change offers to execute a real-world benchmark on a storage device, returning a metric that can be used to compare internal and external storage. The benchmark is generated from the strace-instrumented storage access patterns of typical apps. A typical device completes the benchmark in under two seconds on internal storage, a UHS-3 SD card is even faster (!), but a very slow Class 4 SD card takes about 30 seconds to complete, giving us a clear signal. The measured benchmark numbers are logged along with information about the storage device, such as manufacturer, model, etc. Card serial numbers are scrubbed from output. Bug: 21172095 Change-Id: I9b2713dafdfdfcf5d97bf1bc21841f39409a7e54
215 lines
6.5 KiB
C++
215 lines
6.5 KiB
C++
/*
|
|
* Copyright (C) 2008 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.
|
|
*/
|
|
|
|
#ifndef ANDROID_VOLD_VOLUME_MANAGER_H
|
|
#define ANDROID_VOLD_VOLUME_MANAGER_H
|
|
|
|
#include <pthread.h>
|
|
#include <fnmatch.h>
|
|
#include <stdlib.h>
|
|
|
|
#ifdef __cplusplus
|
|
|
|
#include <list>
|
|
#include <mutex>
|
|
#include <string>
|
|
|
|
#include <cutils/multiuser.h>
|
|
#include <utils/List.h>
|
|
#include <utils/Timers.h>
|
|
#include <sysutils/SocketListener.h>
|
|
#include <sysutils/NetlinkEvent.h>
|
|
|
|
#include "Disk.h"
|
|
#include "VolumeBase.h"
|
|
|
|
/* The length of an MD5 hash when encoded into ASCII hex characters */
|
|
#define MD5_ASCII_LENGTH_PLUS_NULL ((MD5_DIGEST_LENGTH*2)+1)
|
|
|
|
typedef enum { ASEC, OBB } container_type_t;
|
|
|
|
class ContainerData {
|
|
public:
|
|
ContainerData(char* _id, container_type_t _type)
|
|
: id(_id)
|
|
, type(_type)
|
|
{}
|
|
|
|
~ContainerData() {
|
|
if (id != NULL) {
|
|
free(id);
|
|
id = NULL;
|
|
}
|
|
}
|
|
|
|
char *id;
|
|
container_type_t type;
|
|
};
|
|
|
|
typedef android::List<ContainerData*> AsecIdCollection;
|
|
|
|
class VolumeManager {
|
|
public:
|
|
static const char *SEC_ASECDIR_EXT;
|
|
static const char *SEC_ASECDIR_INT;
|
|
static const char *ASECDIR;
|
|
static const char *LOOPDIR;
|
|
|
|
private:
|
|
static VolumeManager *sInstance;
|
|
|
|
SocketListener *mBroadcaster;
|
|
|
|
AsecIdCollection *mActiveContainers;
|
|
bool mDebug;
|
|
|
|
// for adjusting /proc/sys/vm/dirty_ratio when UMS is active
|
|
int mUmsSharingCount;
|
|
int mSavedDirtyRatio;
|
|
int mUmsDirtyRatio;
|
|
|
|
public:
|
|
virtual ~VolumeManager();
|
|
|
|
// TODO: pipe all requests through VM to avoid exposing this lock
|
|
std::mutex& getLock() { return mLock; }
|
|
|
|
int start();
|
|
int stop();
|
|
|
|
void handleBlockEvent(NetlinkEvent *evt);
|
|
|
|
class DiskSource {
|
|
public:
|
|
DiskSource(const std::string& sysPattern, const std::string& nickname, int flags) :
|
|
mSysPattern(sysPattern), mNickname(nickname), mFlags(flags) {
|
|
}
|
|
|
|
bool matches(const std::string& sysPath) {
|
|
return !fnmatch(mSysPattern.c_str(), sysPath.c_str(), 0);
|
|
}
|
|
|
|
const std::string& getNickname() { return mNickname; }
|
|
int getFlags() { return mFlags; }
|
|
|
|
private:
|
|
std::string mSysPattern;
|
|
std::string mNickname;
|
|
int mFlags;
|
|
};
|
|
|
|
void addDiskSource(const std::shared_ptr<DiskSource>& diskSource);
|
|
|
|
std::shared_ptr<android::vold::Disk> findDisk(const std::string& id);
|
|
std::shared_ptr<android::vold::VolumeBase> findVolume(const std::string& id);
|
|
|
|
nsecs_t benchmarkVolume(const std::string& id);
|
|
|
|
int startUser(userid_t userId);
|
|
int cleanupUser(userid_t userId);
|
|
|
|
int setPrimary(const std::shared_ptr<android::vold::VolumeBase>& vol);
|
|
|
|
/* Reset all internal state, typically during framework boot */
|
|
int reset();
|
|
/* Prepare for device shutdown, safely unmounting all devices */
|
|
int shutdown();
|
|
/* Unmount all volumes, usually for encryption */
|
|
int unmountAll();
|
|
|
|
/* ASEC */
|
|
int findAsec(const char *id, char *asecPath = NULL, size_t asecPathLen = 0,
|
|
const char **directory = NULL) const;
|
|
int createAsec(const char *id, unsigned numSectors, const char *fstype,
|
|
const char *key, const int ownerUid, bool isExternal);
|
|
int resizeAsec(const char *id, unsigned numSectors, const char *key);
|
|
int finalizeAsec(const char *id);
|
|
|
|
/**
|
|
* Fixes ASEC permissions on a filesystem that has owners and permissions.
|
|
* This currently means EXT4-based ASEC containers.
|
|
*
|
|
* There is a single file that can be marked as "private" and will not have
|
|
* world-readable permission. The group for that file will be set to the gid
|
|
* supplied.
|
|
*
|
|
* Returns 0 on success.
|
|
*/
|
|
int fixupAsecPermissions(const char *id, gid_t gid, const char* privateFilename);
|
|
int destroyAsec(const char *id, bool force);
|
|
int mountAsec(const char *id, const char *key, int ownerUid, bool readOnly);
|
|
int unmountAsec(const char *id, bool force);
|
|
int renameAsec(const char *id1, const char *id2);
|
|
int getAsecMountPath(const char *id, char *buffer, int maxlen);
|
|
int getAsecFilesystemPath(const char *id, char *buffer, int maxlen);
|
|
|
|
/* Loopback images */
|
|
int listMountedObbs(SocketClient* cli);
|
|
int mountObb(const char *fileName, const char *key, int ownerUid);
|
|
int unmountObb(const char *fileName, bool force);
|
|
int getObbMountPath(const char *id, char *buffer, int maxlen);
|
|
|
|
/* Shared between ASEC and Loopback images */
|
|
int unmountLoopImage(const char *containerId, const char *loopId,
|
|
const char *fileName, const char *mountPoint, bool force);
|
|
|
|
int setDebug(bool enable);
|
|
|
|
void setBroadcaster(SocketListener *sl) { mBroadcaster = sl; }
|
|
SocketListener *getBroadcaster() { return mBroadcaster; }
|
|
|
|
static VolumeManager *Instance();
|
|
|
|
static char *asecHash(const char *id, char *buffer, size_t len);
|
|
|
|
/*
|
|
* Ensure that all directories along given path exist, creating parent
|
|
* directories as needed. Validates that given path is absolute and that
|
|
* it contains no relative "." or ".." paths or symlinks. Last path segment
|
|
* is treated as filename and ignored, unless the path ends with "/". Also
|
|
* ensures that path belongs to a volume managed by vold.
|
|
*/
|
|
int mkdirs(char* path);
|
|
|
|
private:
|
|
VolumeManager();
|
|
void readInitialState();
|
|
bool isMountpointMounted(const char *mp);
|
|
bool isAsecInDirectory(const char *dir, const char *asec) const;
|
|
bool isLegalAsecId(const char *id) const;
|
|
|
|
int linkPrimary(userid_t userId);
|
|
|
|
std::mutex mLock;
|
|
|
|
std::list<std::shared_ptr<DiskSource>> mDiskSources;
|
|
std::list<std::shared_ptr<android::vold::Disk>> mDisks;
|
|
|
|
std::list<userid_t> mUsers;
|
|
|
|
std::shared_ptr<android::vold::VolumeBase> mInternalEmulated;
|
|
std::shared_ptr<android::vold::VolumeBase> mPrimary;
|
|
};
|
|
|
|
extern "C" {
|
|
#endif /* __cplusplus */
|
|
#define UNMOUNT_NOT_MOUNTED_ERR -2
|
|
int vold_unmountAll(void);
|
|
#ifdef __cplusplus
|
|
}
|
|
#endif
|
|
|
|
#endif
|