Storage: refactor dump_storage

Bug: 287884851
Test: run bugreport
Change-Id: I126f363b741616690b8e5e3b8fe522da7cd5c2ca
Signed-off-by: Randall Huang <huangrandall@google.com>
This commit is contained in:
Randall Huang 2023-07-13 17:25:08 +08:00
parent 51da07a0ea
commit a5949cd099
6 changed files with 166 additions and 75 deletions

View File

@ -2,9 +2,19 @@ package {
default_applicable_licenses: ["Android-Apache-2.0"],
}
sh_binary {
name: "dump_storage.sh",
src: "dump_storage.sh",
cc_binary {
name: "dump_storage",
srcs: ["dump_storage.cpp"],
cflags: [
"-Wall",
"-Wextra",
"-Werror",
],
shared_libs: [
"libbase",
"libdump",
"liblog",
],
vendor: true,
sub_dir: "dump",
relative_install_path: "dump",
}

150
storage/dump_storage.cpp Normal file
View File

@ -0,0 +1,150 @@
/*
* Copyright 2023 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 <dump/pixel_dump.h>
#include <android-base/file.h>
#include <android-base/properties.h>
#include <string.h>
#include <stdio.h>
#include <log/log.h>
#include <regex>
#include <fstream>
#define F2FS_FSCK_TIME_PROPERTY "ro.boottime.init.fsck.data"
#define F2FS_MNT_TIME_PROPERTY "ro.boottime.init.mount.data"
#define BOOTDEVICE_PROPERTY "ro.boot.bootdevice"
int main() {
//F2FS
dumpFileContent("F2FS status", "/sys/kernel/debug/f2fs/status");
dumpFileContent("F2FS fsck", "/dev/fscklogs/fsck");
int fsck_time = android::base::GetIntProperty(F2FS_FSCK_TIME_PROPERTY, 0);
printf("--- F2FS - fsck time (ms) ---\n%d\n\n", fsck_time);
int mnt_time = android::base::GetIntProperty(F2FS_MNT_TIME_PROPERTY, 0);
printf("--- F2FS - checkpoint=disable time (ms) ---\n%d\n\n", mnt_time);
//UFS
dumpFileContent("UFS model", "/sys/block/sda/device/model");
dumpFileContent("UFS rev", "/sys/block/sda/device/rev");
dumpFileContent("UFS size", "/sys/block/sda/size");
dumpFileContent("UFS Slow IO Read",
"/dev/sys/block/bootdevice/slowio_read_cnt");
dumpFileContent("UFS Slow IO Write",
"/dev/sys/block/bootdevice/slowio_write_cnt");
dumpFileContent("UFS Slow IO Unmap",
"/dev/sys/block/bootdevice/slowio_unmap_cnt");
dumpFileContent("UFS Slow IO Sync",
"/dev/sys/block/bootdevice/slowio_sync_cnt");
printf("------ UFS err_stats ------\n");
const std::string ufs_err_stats_path(
"/dev/sys/block/bootdevice/err_stats/");
std::unique_ptr<DIR, decltype(&closedir)> statdir(
opendir(ufs_err_stats_path.c_str()), closedir);
if (statdir) {
dirent *stat_entry;
while ((stat_entry = readdir(statdir.get())) != nullptr) {
std::string ufs_err_stats_path(stat_entry->d_name);
if (!strcmp(ufs_err_stats_path.c_str(), ".")
|| !strcmp(ufs_err_stats_path.c_str(), ".."))
continue;
std::string bootdevice = android::base::GetProperty(
BOOTDEVICE_PROPERTY, "");
std::string err_stat_path = "/sys/devices/platform/";
err_stat_path.append(bootdevice.c_str());
err_stat_path.append("/err_stats/");
err_stat_path.append(ufs_err_stats_path.c_str());
std::ifstream err_stat_file(err_stat_path);
if (err_stat_file.is_open()) {
std::string err_stat_atom;
err_stat_file >> err_stat_atom;
printf("%s:%s\n", ufs_err_stats_path.c_str(),
err_stat_atom.c_str());
err_stat_file.close();
}
}
}
printf("\n------ UFS io_stats ------\n");
printf("\t\t%-12s %-12s %-12s %-12s %-12s %-12s\n", "ReadCnt", "ReadBytes",
"WriteCnt", "WriteBytes", "RWCnt", "RWBytes");
const std::string ufs_io_stats = "/dev/sys/block/bootdevice/io_stats/";
const std::string iostats_seq[3] = {"_start", "_complete", "_maxdiff"};
const std::string iostats[6] = {"rcnt", "rbyte", "wcnt", "wbyte", "rwcnt",
"rwbyte"};
for (int i = 0; i < 3; i++) {
const std::string header[3] = {"Started: \t", "Completed: \t",
"MaxDiff: \t"};
printf("%s", header[i].c_str());
for (int j = 0; j < 6; j++) {
std::string iostat_path = ufs_io_stats.c_str();
iostat_path.append(iostats[j].c_str());
iostat_path.append(iostats_seq[i].c_str());
std::ifstream io_stats_file(iostat_path.c_str());
unsigned long io_stat_atom = 0;
if (io_stats_file.is_open()) {
io_stats_file >> io_stat_atom;
printf("%-12lu ", io_stat_atom);
io_stats_file.close();
}
}
printf("\n");
}
printf("\n------ UFS req_stats ------\n");
printf("\t%-12s %-12s %-12s %-12s %-12s %-12s\n", "All", "Write", "Read",
"Security", "Flush", "Discard");
const std::string ufs_req_stats = "/dev/sys/block/bootdevice/req_stats/";
const std::string reqstats_seq[4] = {"_min", "_max", "_avg", "_sum"};
const std::string reqstats[6] = {"all", "write", "read", "security",
"flush", "discard"};
for (int i = 0; i < 4; i++) {
const std::string header[4] = {"Min:\t", "Max: \t", "Avg: \t",
"Count: \t"};
printf("%s", header[i].c_str());
for (int j = 0; j < 6; j++) {
std::string reqstat_path = ufs_req_stats.c_str();
reqstat_path.append(reqstats[j].c_str());
reqstat_path.append(reqstats_seq[i].c_str());
std::ifstream req_stats_file(reqstat_path.c_str());
unsigned long req_stat_atom = 0;
if (req_stats_file.is_open()) {
req_stats_file >> req_stat_atom;
printf("%-12lu ", req_stat_atom);
req_stats_file.close();
}
}
printf("\n");
}
printf("\n------ UFS health ------\n");
dumpFileContent(
"",
"/dev/sys/block/bootdevice/health_descriptor/life_time_estimation_a");
dumpFileContent(
"",
"/dev/sys/block/bootdevice/health_descriptor/life_time_estimation_b");
dumpFileContent("", "/dev/sys/block/bootdevice/health_descriptor/eol_info");
dumpFileContent(
"",
"/dev/sys/block/bootdevice/health_descriptor/life_time_estimation_c");
return 0;
}

View File

@ -1,68 +0,0 @@
#!/vendor/bin/sh
# F2FS
echo "--- F2FS status---"
cat "/sys/kernel/debug/f2fs/status"
echo "\n--- F2FS fsck ---"
cat "/dev/fscklogs/fsck"
echo "\n--- F2FS - fsck time (ms) ---"
getprop ro.boottime.init.fsck.data
echo "\n--- F2FS - checkpoint=disable time (ms) ---"
getprop ro.boottime.init.mount.data
# UFS
echo "\n------ UFS model (/sys/block/sda/device/model) ------"
cat "/sys/block/sda/device/model"
echo "\n------ UFS rev (/sys/block/sda/device/rev) ------"
cat "/sys/block/sda/device/rev"
echo "\n------ UFS size (/sys/block/sda/size) ------"
cat "/sys/block/sda/size"
echo "\n------ UFS Slow IO Read (/dev/sys/block/bootdevice/slowio_read_cnt) ------"
cat "/dev/sys/block/bootdevice/slowio_read_cnt"
echo "\n------ UFS Slow IO Write (/dev/sys/block/bootdevice/slowio_write_cnt) ------"
cat "/dev/sys/block/bootdevice/slowio_write_cnt"
echo "\n------ UFS Slow IO Unmap (/dev/sys/block/bootdevice/slowio_unmap_cnt) ------"
cat "/dev/sys/block/bootdevice/slowio_unmap_cnt"
echo "\n------ UFS Slow IO Sync (/dev/sys/block/bootdevice/slowio_sync_cnt) ------"
cat "/dev/sys/block/bootdevice/slowio_sync_cnt"
echo "\n------ UFS err_stats ------"
path="/dev/sys/block/bootdevice/err_stats";
for node in `ls $path/* | grep -v reset_err_status`
do
printf "%s:%d\n" $(basename $node) $(cat $node)
done
echo "\n------ UFS io_stats ------"
path="/dev/sys/block/bootdevice/io_stats"
printf "\t\t%-12s %-12s %-12s %-12s %-12s %-12s\n" ReadCnt ReadBytes WriteCnt WriteBytes RWCnt RWBytes
str=$(cat $path/*_start); arr=($str);
printf "Started: \t%-12s %-12s %-12s %-12s %-12s %-12s\n" ${arr[1]} ${arr[0]} ${arr[5]} ${arr[4]} ${arr[3]} ${arr[2]}
str=$(cat $path/*_complete); arr=($str);
printf "Completed: \t%-12s %-12s %-12s %-12s %-12s %-12s\n" ${arr[1]} ${arr[0]} ${arr[5]} ${arr[4]} ${arr[3]} ${arr[2]}
str=$(cat $path/*_maxdiff); arr=($str);
printf "MaxDiff: \t%-12s %-12s %-12s %-12s %-12s %-12s\n\n" ${arr[1]} ${arr[0]} ${arr[5]} ${arr[4]} ${arr[3]} ${arr[2]}
echo "\n------ UFS req_stats ------"
path="/dev/sys/block/bootdevice/req_stats"
printf "\t%-12s %-12s %-12s %-12s %-12s %-12s\n" All Write Read Security Flush Discard
str=$(cat $path/*_min); arr=($str);
printf "Min:\t%-12s %-12s %-12s %-12s %-12s %-12s\n" ${arr[0]} ${arr[5]} ${arr[3]} ${arr[4]} ${arr[2]} ${arr[1]}
str=$(cat $path/*_max); arr=($str);
printf "Max:\t%-12s %-12s %-12s %-12s %-12s %-12s\n" ${arr[0]} ${arr[5]} ${arr[3]} ${arr[4]} ${arr[2]} ${arr[1]}
str=$(cat $path/*_avg); arr=($str);
printf "Avg.:\t%-12s %-12s %-12s %-12s %-12s %-12s\n" ${arr[0]} ${arr[5]} ${arr[3]} ${arr[4]} ${arr[2]} ${arr[1]}
str=$(cat $path/*_sum); arr=($str);
printf "Count:\t%-12s %-12s %-12s %-12s %-12s %-12s\n\n" ${arr[0]} ${arr[5]} ${arr[3]} ${arr[4]} ${arr[2]} ${arr[1]}
echo "\n------ UFS health ------"
for f in $(find /dev/sys/block/bootdevice/health_descriptor -type f)
do
if [[ -r $f && -f $f ]]; then
echo --- $f
cat $f
echo ''
fi
done

View File

@ -1,6 +1,5 @@
pixel_bugreport(dump_storage)
allow dump_storage vendor_toolbox_exec:file execute_no_trans;
allow dump_storage sysfs_scsi_devices_0000:dir r_dir_perms;
allow dump_storage sysfs_scsi_devices_0000:file r_file_perms;

View File

@ -1 +1 @@
/vendor/bin/dump/dump_storage\.sh u:object_r:dump_storage_exec:s0
/vendor/bin/dump/dump_storage u:object_r:dump_storage_exec:s0

View File

@ -1,6 +1,6 @@
BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs-common/storage/sepolicy
PRODUCT_PACKAGES += dump_storage.sh
PRODUCT_PACKAGES += dump_storage
# Pixel storage tool
PRODUCT_PACKAGES_DEBUG += \