Merge changes I09b11db0,I774b1a44

                                              "system/bin/run-as" },

    { 00700, AID_SYSTEM,    AID_SHELL,     CAP_MASK_LONG(CAP_BLOCK_SUSPEND),

                                              "system/bin/inputflinger" },

    { 00750, AID_SYSTEM,    AID_SHELL,     CAP_MASK_LONG(CAP_SETUID) |

                                           CAP_MASK_LONG(CAP_SETGID) |

                                           CAP_MASK_LONG(CAP_SYS_PTRACE),

                                              "system/bin/storaged" },

    /* Support FIFO scheduling mode in SurfaceFlinger. */

    { 00755, AID_SYSTEM,    AID_GRAPHICS,  CAP_MASK_LONG(CAP_SYS_NICE),

# Copyright 2016 The Android Open Source Project

LOCAL_PATH := $(call my-dir)

LIBSTORAGED_SHARED_LIBRARIES := libbinder libbase libutils libcutils liblog libsysutils libcap

include $(CLEAR_VARS)

LOCAL_SRC_FILES := storaged.cpp \

                  storaged_service.cpp \

                  storaged_utils.cpp \

                  EventLogTags.logtags

LOCAL_MODULE := libstoraged

LOCAL_CFLAGS := -Werror

LOCAL_C_INCLUDES := $(LOCAL_PATH)/include external/googletest/googletest/include

LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include

LOCAL_SHARED_LIBRARIES := $(LIBSTORAGED_SHARED_LIBRARIES)

include $(BUILD_STATIC_LIBRARY)

include $(CLEAR_VARS)

LOCAL_MODULE := storaged

LOCAL_INIT_RC := storaged.rc

LOCAL_SRC_FILES := main.cpp

# libstoraged is an internal static library, only main.cpp and storaged_test.cpp should be using it

LOCAL_STATIC_LIBRARIES := libstoraged

LOCAL_SHARED_LIBRARIES := $(LIBSTORAGED_SHARED_LIBRARIES)

LOCAL_CFLAGS := -Wall -Werror -Wno-unused-parameter

LOCAL_C_INCLUDES := external/googletest/googletest/include

include $(BUILD_EXECUTABLE)

include $(call first-makefiles-under,$(LOCAL_PATH))

# The entries in this file map a sparse set of log tag numbers to tag names.

# This is installed on the device, in /system/etc, and parsed by logcat.

#

# Tag numbers are decimal integers, from 0 to 2^31.  (Let's leave the

# negative values alone for now.)

#

# Tag names are one or more ASCII letters and numbers or underscores, i.e.

# "[A-Z][a-z][0-9]_".  Do not include spaces or punctuation (the former

# impacts log readability, the latter makes regex searches more annoying).

#

# Tag numbers and names are separated by whitespace.  Blank lines and lines

# starting with '#' are ignored.

#

# Optionally, after the tag names can be put a description for the value(s)

# of the tag. Description are in the format

#    (<name>|data type[|data unit])

# Multiple values are separated by commas.

#

# The data type is a number from the following values:

# 1: int

# 2: long

# 3: string

# 4: list

# 5: float

#

# The data unit is a number taken from the following list:

# 1: Number of objects

# 2: Number of bytes

# 3: Number of milliseconds

# 4: Number of allocations

# 5: Id

# 6: Percent

# Default value for data of type int/long is 2 (bytes).

#

# TODO: generate ".java" and ".h" files with integer constants from this file.

2732 storaged_disk_stats (type|3),(start_time|2|3),(end_time|2|3),(read_ios|2|1),(read_merges|2|1),(read_sectors|2|1),(read_ticks|2|3),(write_ios|2|1),(write_merges|2|1),(write_sectors|2|1),(write_ticks|2|3),(o_in_flight|2|1),(io_ticks|2|3),(io_in_queue|2|1)

2733 storaged_emmc_info (mmc_ver|3),(eol|1),(lifetime_a|1),(lifetime_b|1)

 No newline at end of file

/*

 * Copyright (C) 2016 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 _STORAGED_H_

#define _STORAGED_H_

#define DEBUG

#include <queue>

#include <semaphore.h>

#include <stdint.h>

#include <string>

#include <syslog.h>

#include <unordered_map>

#include <vector>

#define FRIEND_TEST(test_case_name, test_name) \

friend class test_case_name##_##test_name##_Test

/* For debug */

#ifdef DEBUG

#define debuginfo(fmt, ...) \

 do {printf("%s():\t" fmt "\t[%s:%d]\n", __FUNCTION__, ##__VA_ARGS__, __FILE__, __LINE__);} \

 while(0)

#else

#define debuginfo(...)

#endif

#define KMSG_PRIORITY(PRI)                            \

    '<',                                              \

    '0' + LOG_MAKEPRI(LOG_DAEMON, LOG_PRI(PRI)) / 10, \

    '0' + LOG_MAKEPRI(LOG_DAEMON, LOG_PRI(PRI)) % 10, \

    '>'

static char kmsg_error_prefix[] = { KMSG_PRIORITY(LOG_ERR),

    's', 't', 'o', 'r', 'a', 'g', 'e', 'd', ':', '\0' };

static char kmsg_info_prefix[] = { KMSG_PRIORITY(LOG_INFO),

    's', 't', 'o', 'r', 'a', 'g', 'e', 'd', ':', '\0' };

static char kmsg_warning_prefix[] = { KMSG_PRIORITY(LOG_WARNING),

    's', 't', 'o', 'r', 'a', 'g', 'e', 'd', ':', '\0' };

// number of attributes diskstats has

#define DISK_STATS_SIZE ( 11 )

// maximum size limit of a stats file

#define DISK_STATS_FILE_MAX_SIZE ( 256 )

#define DISK_STATS_IO_IN_FLIGHT_IDX ( 8 )

struct disk_stats {

    /* It will be extremely unlikely for any of the following entries to overflow.

     * For read_bytes(which will be greater than any of the following entries), it

     * will take 27 years to overflow uint64_t at the reading rate of 20GB/s, which

     * is the peak memory transfer rate for current memory.

     * The diskstats entries (first 11) need to be at top in this structure _after_

     * compiler's optimization.

     */

    uint64_t read_ios;       // number of read I/Os processed

    uint64_t read_merges;    // number of read I/Os merged with in-queue I/Os

    uint64_t read_sectors;   // number of sectors read

    uint64_t read_ticks;     // total wait time for read requests

    uint64_t write_ios;      // number of write I/Os processed

    uint64_t write_merges;   // number of write I/Os merged with in-queue I/Os

    uint64_t write_sectors;  // number of sectors written

    uint64_t write_ticks;    // total wait time for write requests

    uint64_t io_in_flight;   // number of I/Os currently in flight

    uint64_t io_ticks;       // total time this block device has been active

    uint64_t io_in_queue;    // total wait time for all requests

    uint64_t start_time;     // monotonic time accounting starts

    uint64_t end_time;       // monotonic time accounting ends

    uint32_t counter;        // private counter for accumulate calculations

    double   io_avg;         // average io_in_flight for accumulate calculations

};

#define MMC_VER_STR_LEN ( 8 )   // maximum length of the MMC version string

// minimum size of a ext_csd file

#define EXT_CSD_FILE_MIN_SIZE ( 1024 )

struct emmc_info {

    int eol;                        // pre-eol (end of life) information

    int lifetime_a;                 // device life time estimation (type A)

    int lifetime_b;                 // device life time estimation (type B)

    char mmc_ver[MMC_VER_STR_LEN];  // device version string

};

struct disk_perf {

    uint32_t read_perf;         // read speed (kbytes/s)

    uint32_t read_ios;          // read I/Os per second

    uint32_t write_perf;        // write speed (kbytes/s)

    uint32_t write_ios;         // write I/Os per second

    uint32_t queue;             // I/Os in queue

};

#define CMD_MAX_LEN ( 64 )

struct task_info {

    uint32_t pid;                   // task id

    uint64_t rchar;                 // characters read

    uint64_t wchar;                 // characters written

    uint64_t syscr;                 // read syscalls

    uint64_t syscw;                 // write syscalls

    uint64_t read_bytes;            // bytes read (from storage layer)

    uint64_t write_bytes;           // bytes written (to storage layer)

    uint64_t cancelled_write_bytes; // cancelled write byte by truncate

    uint64_t starttime;             // start time of task

    char cmd[CMD_MAX_LEN];          // filename of the executable

};

class lock_t {

    sem_t* mSem;

public:

    lock_t(sem_t* sem) {

        mSem = sem;

        sem_wait(mSem);

    }

    ~lock_t() {

        sem_post(mSem);

    }

};

class tasks_t {

private:

    FRIEND_TEST(storaged_test, tasks_t);

    sem_t mSem;

    // hashmap for all running tasks w/ pid as key

    std::unordered_map<uint32_t, struct task_info> mRunning;

    // hashmap for all tasks that have been killed (categorized by cmd) w/ cmd as key

    std::unordered_map<std::string, struct task_info> mOld;

    std::unordered_map<std::uint32_t, struct task_info> get_running_tasks();

public:

    tasks_t() {

        sem_init(&mSem, 0, 1); // TODO: constructor don't have a return value, what if sem_init fails

    }

    ~tasks_t() {

        sem_destroy(&mSem);

    }

    void update_running_tasks(void);

    std::vector<struct task_info> get_tasks(void);

};

class stream_stats {

private:

    double mSum;

    double mSquareSum;

    uint32_t mCnt;

public:

    stream_stats() : mSum(0), mSquareSum(0), mCnt(0) {};

    ~stream_stats() {};

    double get_mean() {

        return mSum / mCnt;

    }

    double get_std() {

        return sqrt(mSquareSum / mCnt - mSum * mSum / (mCnt * mCnt));

    }

    void add(uint32_t num) {

        mSum += (double)num;

        mSquareSum += (double)num * (double)num;

        mCnt++;

    }

    void evict(uint32_t num) {

        if (mSum < num || mSquareSum < (double)num * (double)num) return;

        mSum -= (double)num;

        mSquareSum -= (double)num * (double)num;

        mCnt--;

    }

};

#define MMC_DISK_STATS_PATH "/sys/block/mmcblk0/stat"

#define SDA_DISK_STATS_PATH "/sys/block/sda/stat"

#define EMMC_ECSD_PATH "/d/mmc0/mmc0:0001/ext_csd"

class disk_stats_monitor {

private:

    FRIEND_TEST(storaged_test, disk_stats_monitor);

    const char* DISK_STATS_PATH;

    struct disk_stats mPrevious;

    struct disk_stats mAccumulate;

    bool mStall;

    std::queue<struct disk_perf> mBuffer;

    struct {

        stream_stats read_perf;           // read speed (bytes/s)

        stream_stats read_ios;            // read I/Os per second

        stream_stats write_perf;          // write speed (bytes/s)

        stream_stats write_ios;           // write I/O per second

        stream_stats queue;               // I/Os in queue

    } mStats;

    bool mValid;

    const uint32_t mWindow;

    const double mSigma;

    struct disk_perf mMean;

    struct disk_perf mStd;

    void update_mean();

    void update_std();

    void add(struct disk_perf* perf);

    void evict(struct disk_perf* perf);

    bool detect(struct disk_perf* perf);

    void update(struct disk_stats* stats);

public:

    disk_stats_monitor(uint32_t window_size = 5, double sigma = 1.0) :

            mStall(false),

            mValid(false),

            mWindow(window_size),

            mSigma(sigma) {

        memset(&mPrevious, 0, sizeof(mPrevious));

        memset(&mMean, 0, sizeof(mMean));

        memset(&mStd, 0, sizeof(mStd));

        if (access(MMC_DISK_STATS_PATH, R_OK) >= 0) {

            DISK_STATS_PATH = MMC_DISK_STATS_PATH;

        } else {

            DISK_STATS_PATH = SDA_DISK_STATS_PATH;

        }

    }

    void update(void);

};

class disk_stats_publisher {

private:

    FRIEND_TEST(storaged_test, disk_stats_publisher);

    const char* DISK_STATS_PATH;

    struct disk_stats mAccumulate;

    struct disk_stats mPrevious;

public:

    disk_stats_publisher(void) {

        memset(&mAccumulate, 0, sizeof(struct disk_stats));

        memset(&mPrevious, 0, sizeof(struct disk_stats));

        if (access(MMC_DISK_STATS_PATH, R_OK) >= 0) {

            DISK_STATS_PATH = MMC_DISK_STATS_PATH;

        } else {

            DISK_STATS_PATH = SDA_DISK_STATS_PATH;

        }

    }

    ~disk_stats_publisher(void) {}

    void publish(void);

    void update(void);

};

class emmc_info_t {

private:

    struct emmc_info mInfo;

    bool mValid;

    int mFdEmmc;

public:

    emmc_info_t(void) :

            mValid(false),

            mFdEmmc(-1) {

        memset(&mInfo, 0, sizeof(struct emmc_info));

    }

    ~emmc_info_t(void) {}

    void publish(void);

    void update(void);

    void set_emmc_fd(int fd) {

        mFdEmmc = fd;

    }

};

// Periodic chores intervals in seconds

#define DEFAULT_PERIODIC_CHORES_INTERVAL_UNIT ( 20 )

#define DEFAULT_PERIODIC_CHORES_INTERVAL_DISK_STATS_PUBLISH ( 60 )

#define DEFAULT_PERIODIC_CHORES_INTERVAL_EMMC_INFO_PUBLISH ( 60 * 2 )

struct storaged_config {

    int periodic_chores_interval_unit;

    int periodic_chores_interval_disk_stats_publish;

    int periodic_chores_interval_emmc_info_publish;

    bool proc_taskio_readable;  // are /proc/[pid]/{io, comm, cmdline, stat} all readable

    bool emmc_available;        // whether eMMC est_csd file is readable

    bool diskstats_available;   // whether diskstats is accessible

};

class storaged_t {

private:

    time_t mTimer;

    storaged_config mConfig;

    disk_stats_publisher mDiskStats;

    disk_stats_monitor mDsm;

    emmc_info_t mEmmcInfo;

    tasks_t mTasks;

    time_t mStarttime;

public:

    storaged_t(void);

    ~storaged_t() {}

    void event(void);

    void pause(void) {

        sleep(mConfig.periodic_chores_interval_unit);

    }

    void set_unit_interval(int unit) {

        mConfig.periodic_chores_interval_unit = unit;

    }

    void set_diskstats_interval(int disk_stats) {

        mConfig.periodic_chores_interval_disk_stats_publish = disk_stats;

    }

    void set_emmc_interval(int emmc_info) {

        mConfig.periodic_chores_interval_emmc_info_publish = emmc_info;

    }

    std::vector<struct task_info> get_tasks(void) {

        // There could be a race when get_tasks() and the main thread is updating at the same time

        // While update_running_tasks() is updating the critical sections at the end of the function

        // all together atomically, the final state of task_t can only be either the main thread's

        // update or this update. Since the race can only occur when both threads are updating

        // "simultaneously", either final state is acceptable.

        mTasks.update_running_tasks();

        return mTasks.get_tasks();

    }

    void set_privileged_fds(int fd_emmc) {

        mEmmcInfo.set_emmc_fd(fd_emmc);

    }

    time_t get_starttime(void) {

        return mStarttime;

    }

};

// Eventlog tag

// The content must match the definition in EventLogTags.logtags

#define EVENTLOGTAG_DISKSTATS ( 2732 )

#define EVENTLOGTAG_EMMCINFO ( 2733 )

#endif /* _STORAGED_H_ */

/*

 * Copyright (C) 2016 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 _STORAGED_SERVICE_H_

#define _STORAGED_SERVICE_H_

#include <vector>

#include <binder/IInterface.h>

#include <binder/IBinder.h>

#include "storaged.h"

using namespace android;

// Interface

class IStoraged : public IInterface {

public:

    enum {

        DUMPTASKS = IBinder::FIRST_CALL_TRANSACTION,

    };

    // Request the service to run the test function

    virtual std::vector<struct task_info> dump_tasks(const char* option) = 0;

    DECLARE_META_INTERFACE(Storaged);

};

// Client

class BpStoraged : public BpInterface<IStoraged> {

public:

    BpStoraged(const sp<IBinder>& impl) : BpInterface<IStoraged>(impl){};

    virtual std::vector<struct task_info> dump_tasks(const char* option);

};

// Server

class BnStoraged : public BnInterface<IStoraged> {

    virtual status_t onTransact(uint32_t code, const Parcel& data, Parcel* reply, uint32_t flags = 0);

};

class Storaged : public BnStoraged {

    virtual std::vector<struct task_info> dump_tasks(const char* option);

};

sp<IStoraged> get_storaged_service();

#endif /* _STORAGED_SERVICE_H_ */

 No newline at end of file