ext2fs: add readahead method to improve scanning

Add a readahead method for prefetching ranges of disk blocks.
This is useful for inode table scanning, and other large
contiguous ranges of blocks, and may also prove useful for
random block prefetch, since it will allow reordering of the
IO without waiting synchronously for the reads to complete.

It is currently using the posix_fadvise(POSIX_FADV_WILLNEED)
interface, as this proved most efficient during our testing

Signed-off-by: Andreas Dilger <andreas.dilger@intel.com>

diff --git a/lib/ext2fs/ext2_io.h b/lib/ext2fs/ext2_io.h
index 1894fb8..4c5a5c5 100644 (file)
--- a/lib/ext2fs/ext2_io.h
+++ b/lib/ext2fs/ext2_io.h
@@ -90,7 +90,10 @@ struct struct_io_manager {
                                        int count, const void *data);
        errcode_t (*discard)(io_channel channel, unsigned long long block,
                             unsigned long long count);
-       long    reserved[16];
+       errcode_t (*cache_readahead)(io_channel channel,
+                                    unsigned long long block,
+                                    unsigned long long count);
+       long    reserved[15];
 };
 
 #define IO_FLAG_RW             0x0001
@@ -124,6 +127,9 @@ extern errcode_t io_channel_discard(io_channel channel,
                                    unsigned long long count);
 extern errcode_t io_channel_alloc_buf(io_channel channel,
                                      int count, void *ptr);
+extern errcode_t io_channel_cache_readahead(io_channel io,
+                                           unsigned long long block,
+                                           unsigned long long count);
 
 /* unix_io.c */
 extern io_manager unix_io_manager;

diff --git a/lib/ext2fs/io_manager.c b/lib/ext2fs/io_manager.c
index 34e4859..dc5888d 100644 (file)
--- a/lib/ext2fs/io_manager.c
+++ b/lib/ext2fs/io_manager.c
@@ -128,3 +128,12 @@ errcode_t io_channel_alloc_buf(io_channel io, int count, void *ptr)
        else
                return ext2fs_get_mem(size, ptr);
 }
+
+errcode_t io_channel_cache_readahead(io_channel io, unsigned long long block,
+                                    unsigned long long count)
+{
+       if (!io->manager->cache_readahead)
+               return EXT2_ET_OP_NOT_SUPPORTED;
+
+       return io->manager->cache_readahead(io, block, count);
+}

diff --git a/lib/ext2fs/unix_io.c b/lib/ext2fs/unix_io.c
index 23f22e3..841c193 100644 (file)
--- a/lib/ext2fs/unix_io.c
+++ b/lib/ext2fs/unix_io.c
@@ -15,6 +15,9 @@
  * %End-Header%
  */
 
+#define _XOPEN_SOURCE 600
+#define _DARWIN_C_SOURCE
+#define _FILE_OFFSET_BITS 64
 #define _LARGEFILE_SOURCE
 #define _LARGEFILE64_SOURCE
 #ifndef _GNU_SOURCE
@@ -35,6 +38,9 @@
 #ifdef __linux__
 #include <sys/utsname.h>
 #endif
+#if HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
 #ifdef HAVE_SYS_IOCTL_H
 #include <sys/ioctl.h>
 #endif
@@ -44,9 +50,6 @@
 #if HAVE_SYS_STAT_H
 #include <sys/stat.h>
 #endif
-#if HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
 #if HAVE_SYS_RESOURCE_H
 #include <sys/resource.h>
 #endif
@@ -831,6 +834,23 @@ static errcode_t unix_write_blk64(io_channel channel, unsigned long long block,
 #endif /* NO_IO_CACHE */
 }
 
+static errcode_t unix_cache_readahead(io_channel channel,
+                                     unsigned long long block,
+                                     unsigned long long count)
+{
+#ifdef POSIX_FADV_WILLNEED
+       struct unix_private_data *data;
+
+       data = (struct unix_private_data *)channel->private_data;
+       return posix_fadvise(data->dev,
+                            (ext2_loff_t)block * channel->block_size,
+                            (ext2_loff_t)count * channel->block_size,
+                            POSIX_FADV_WILLNEED);
+#else
+       return EXT2_ET_OP_NOT_SUPPORTED;
+#endif
+}
+
 static errcode_t unix_write_blk(io_channel channel, unsigned long block,
                                int count, const void *buf)
 {
@@ -982,6 +1002,7 @@ static struct struct_io_manager struct_unix_manager = {
        .read_blk64     = unix_read_blk64,
        .write_blk64    = unix_write_blk64,
        .discard        = unix_discard,
+       .cache_readahead = unix_cache_readahead,
 };
 
 io_manager unix_io_manager = &struct_unix_manager;