[PATCH v2 4/5] erofs-utils: dump: add support for showing file extents.
Guo Xuenan
guoxuenan at huawei.com
Thu Oct 28 21:57:47 AEDT 2021
Add option -e to show file extents info, this option needs
specify nid as well. (eg. dump.erofs --nid # -e erofs.img)
Signed-off-by: Guo Xuenan <guoxuenan at huawei.com>
Signed-off-by: Wang Qi <mpiglet at outlook.com>
---
dump/main.c | 77 ++++++++++++++++++++++++++++++++++------
include/erofs/internal.h | 2 ++
lib/data.c | 4 +--
3 files changed, 71 insertions(+), 12 deletions(-)
diff --git a/dump/main.c b/dump/main.c
index d1aa017..58ecf93 100644
--- a/dump/main.c
+++ b/dump/main.c
@@ -18,6 +18,7 @@
struct erofsdump_cfg {
unsigned int totalshow;
bool show_inode;
+ bool show_extent;
bool show_superblock;
bool show_statistics;
erofs_nid_t nid;
@@ -94,6 +95,7 @@ static void usage(void)
fputs("usage: [options] IMAGE\n\n"
"Dump erofs layout from IMAGE, and [options] are:\n"
" -V print the version number of dump.erofs and exit.\n"
+ " -e show extent info (require --nid #)\n"
" -s show information about superblock\n"
" -S show statistic information of the image\n"
" --nid=# show the target inode info of nid #\n"
@@ -110,9 +112,13 @@ static int erofsdump_parse_options_cfg(int argc, char **argv)
{
int opt;
- while ((opt = getopt_long(argc, argv, "SV:s",
+ while ((opt = getopt_long(argc, argv, "SVes",
long_options, NULL)) != -1) {
switch (opt) {
+ case 'e':
+ dumpcfg.show_extent = true;
+ ++dumpcfg.totalshow;
+ break;
case 's':
dumpcfg.show_superblock = true;
++dumpcfg.totalshow;
@@ -407,7 +413,28 @@ static int erofs_get_pathname(erofs_nid_t nid, erofs_nid_t parent_nid,
return -1;
}
-static void erofsdump_show_fileinfo(void)
+static int erofsdump_map_blocks_helper(struct erofs_inode *inode,
+ struct erofs_map_blocks *map, int flags)
+{
+ int err = 0;
+
+ switch (inode->datalayout) {
+ case EROFS_INODE_FLAT_PLAIN:
+ case EROFS_INODE_FLAT_INLINE:
+ case EROFS_INODE_CHUNK_BASED:
+ err = erofs_map_blocks(inode, map, flags);
+ break;
+ case EROFS_INODE_FLAT_COMPRESSION_LEGACY:
+ case EROFS_INODE_FLAT_COMPRESSION:
+ err = z_erofs_map_blocks_iter(inode, map, flags);
+ break;
+ default:
+ break;
+ }
+ return err;
+}
+
+static void erofsdump_show_fileinfo(bool show_extent)
{
int err;
erofs_off_t size;
@@ -418,6 +445,11 @@ static void erofsdump_show_fileinfo(void)
char path[PATH_MAX + 1] = {0};
char access_mode_str[] = "rwxrwxrwx";
char timebuf[128] = {0};
+ unsigned int extent_count = 0;
+ struct erofs_map_blocks map = {
+ .index = UINT_MAX,
+ .m_la = 0,
+ };
err = erofs_read_inode_from_disk(&inode);
if (err) {
@@ -437,6 +469,14 @@ static void erofsdump_show_fileinfo(void)
return;
}
+ t = inode.i_ctime;
+ strftime(timebuf, sizeof(timebuf),
+ "%Y-%m-%d %H:%M:%S", localtime(&t));
+ access_mode = inode.i_mode & 0777;
+ for (int i = 8; i >= 0; i--) {
+ if (((access_mode >> i) & 1) == 0)
+ access_mode_str[8 - i] = '-';
+ }
fprintf(stdout, "File : %s\n", path);
fprintf(stdout, "Inode: %lu ", inode.nid);
fprintf(stdout, "Links: %u ", inode.i_nlink);
@@ -448,16 +488,28 @@ static void erofsdump_show_fileinfo(void)
fprintf(stdout, "On-disk size: %lu ", size);
fprintf(stdout, "Compression ratio: %.2f%%\n",
(double)(100 * size) / (double)(inode.i_size));
- t = inode.i_ctime;
- strftime(timebuf, sizeof(timebuf),
- "%Y-%m-%d %H:%M:%S", localtime(&t));
- access_mode = inode.i_mode & 0777;
- for (int i = 8; i >= 0; i--)
- if (((access_mode >> i) & 1) == 0)
- access_mode_str[8 - i] = '-';
fprintf(stdout, "Uid: %u Gid: %u ", inode.i_uid, inode.i_gid);
fprintf(stdout, "Access: %04o/%s\n", access_mode, access_mode_str);
fprintf(stdout, "Timestamp: %s\n", timebuf);
+
+ if (!dumpcfg.show_extent)
+ return;
+
+ fprintf(stdout, "\nExt: logical_offset/length: physical_offset/length\n");
+ while (map.m_la < inode.i_size) {
+ err = erofsdump_map_blocks_helper(&inode, &map,
+ EROFS_GET_BLOCKS_FIEMAP);
+ if (err) {
+ erofs_err("get file blocks range failed");
+ return;
+ }
+ fprintf(stdout, "%u: ", extent_count++);
+ fprintf(stdout, "%6lu..%-6lu / %-lu: ",
+ map.m_la, map.m_la + map.m_llen, map.m_llen);
+ fprintf(stdout, "%lu..%lu / %-lu\n",
+ map.m_pa, map.m_pa + map.m_plen, map.m_plen);
+ map.m_la += map.m_llen;
+ }
}
static void erofsdump_print_chart_row(char *col1, unsigned int col2,
@@ -641,8 +693,13 @@ int main(int argc, char **argv)
if (dumpcfg.show_statistics)
erofsdump_print_statistic();
+ if (dumpcfg.show_extent && !dumpcfg.show_inode) {
+ usage();
+ goto exit;
+ }
+
if (dumpcfg.show_inode)
- erofsdump_show_fileinfo();
+ erofsdump_show_fileinfo(dumpcfg.show_extent);
exit:
erofs_exit_configure();
diff --git a/include/erofs/internal.h b/include/erofs/internal.h
index 139656c..8282f03 100644
--- a/include/erofs/internal.h
+++ b/include/erofs/internal.h
@@ -275,6 +275,8 @@ int erofs_ilookup(const char *path, struct erofs_inode *vi);
/* data.c */
int erofs_pread(struct erofs_inode *inode, char *buf,
erofs_off_t count, erofs_off_t offset);
+int erofs_map_blocks(struct erofs_inode *inode,
+ struct erofs_map_blocks *map, int flags);
/* zmap.c */
int z_erofs_fill_inode(struct erofs_inode *vi);
int z_erofs_map_blocks_iter(struct erofs_inode *vi,
diff --git a/lib/data.c b/lib/data.c
index 30e7312..9048707 100644
--- a/lib/data.c
+++ b/lib/data.c
@@ -61,8 +61,8 @@ err_out:
return err;
}
-static int erofs_map_blocks(struct erofs_inode *inode,
- struct erofs_map_blocks *map, int flags)
+int erofs_map_blocks(struct erofs_inode *inode,
+ struct erofs_map_blocks *map, int flags)
{
struct erofs_inode *vi = inode;
struct erofs_inode_chunk_index *idx;
--
2.31.1
More information about the Linux-erofs
mailing list