lib: fs: ext2: Optimize to load multiple contiguous blocks in one dma…

… call Signed-off-by: Nikita Travkin <[email protected]> (cherry picked from commit 9c6734c) [Fix an length check in block copying] (cherry picked from commit 6d5ddb4)
msm8916-mainline · Sep 20, 2023 · 1e91f52 · 1e91f52
1 parent 7217f26
commit 1e91f52
Showing 1 changed file with 10 additions and 5 deletions.
diff --git a/lib/fs/ext2/io.c b/lib/fs/ext2/io.c
@@ -229,17 +229,22 @@ ssize_t ext2_read_inode(ext2_t *ext2, struct ext2_inode *inode, void *_buf, off_
     while (len >= EXT2_BLOCK_SIZE(ext2->sb)) {
         /* calculate the block and read it */
         blocknum_t phys_block = file_block_to_fs_block(ext2, inode, file_block);
+        blocknum_t count_cont_blks = 1;
+        blocknum_t max_blocks = len / EXT2_BLOCK_SIZE(ext2->sb);
         if (phys_block == 0) {
             memset(buf, 0, EXT2_BLOCK_SIZE(ext2->sb));
         } else {
-            ext2_read_block(ext2, buf, phys_block);
+            while (count_cont_blks < max_blocks && file_block_to_fs_block(ext2, inode, file_block + count_cont_blks) == phys_block + count_cont_blks) {
+                count_cont_blks++;
+            }
+            bio_read(ext2->dev, buf, EXT2_BLOCK_SIZE(ext2->sb) * phys_block, EXT2_BLOCK_SIZE(ext2->sb) * count_cont_blks);
         }
 
         /* increment our stuff */
-        file_block++;
-        len -= EXT2_BLOCK_SIZE(ext2->sb);
-        bytes_read += EXT2_BLOCK_SIZE(ext2->sb);
-        buf += EXT2_BLOCK_SIZE(ext2->sb);
+        file_block += count_cont_blks;
+        len -= EXT2_BLOCK_SIZE(ext2->sb) * count_cont_blks;
+        bytes_read += EXT2_BLOCK_SIZE(ext2->sb) * count_cont_blks;
+        buf += EXT2_BLOCK_SIZE(ext2->sb) * count_cont_blks;
     }
 
     /* handle partial last block */