btrfs-progs: optimize btrfs_scan_lblkid() for multiple calls

btrfs_scan_lblikd() is called by most the device related command functions.
And btrfs_scan_lblkid() is most expensive function and it becomes more expensive
as number of devices in the system increase. Further some threads call this
function more than once for absolutely no extra benefit and the real waste of
resources. Below list of threads and number of times btrfs_scan_lblkid()
is called in that thread.

  btrfs-find-root            1
  btrfs rescue super-recover 2
  btrfs-debug-tree           1
  btrfs-image -r             2
  btrfs check                2
  btrfs restore              2
  calc-size                  NC
  btrfs-corrupt-block        NC
  btrfs-image                NC
  btrfs-map-logical          1
  btrfs-select-super         NC
  btrfstune                  2
  btrfs-zero-log             NC
  tester                     NC
  quick-test.c               NC
  btrfs-convert              0
  mkfs                       #number of devices to be mkfs
  btrfs label set unmounted  2
  btrfs get label unmounted  2

This patch will:
  move out calling register_one_device with in btrfs_scan_lblkid()
  and so function setting the BTRFS_UPDATE_KERNEL to yes will
  call btrfs_register_all_devices() separately.

  introduce a global variable scan_done, which is set when scan is
  done succssfully per thread. So that following calls to this function
  will just return success.

  Further if any function needs to force scan after scan_done is set,
  then it can be done when there is such a requirement, but as of now there
  isn't any such requirement.

Signed-off-by: Anand Jain <anand.jain@oracle.com>
Signed-off-by: David Sterba <dsterba@suse.cz>

diff --git a/cmds-device.c b/cmds-device.c
index 8a33634..9323986 100644 (file)
--- a/cmds-device.c
+++ b/cmds-device.c
@@ -235,9 +235,12 @@ static int cmd_scan_dev(int argc, char **argv)
 
        if (all || argc == 1) {
                printf("Scanning for Btrfs filesystems\n");
-               ret = btrfs_scan_lblkid(BTRFS_UPDATE_KERNEL);
+               ret = btrfs_scan_lblkid();
                if (ret)
                        fprintf(stderr, "ERROR: error %d while scanning\n", ret);
+               ret = btrfs_register_all_devices();
+               if (ret)
+                       fprintf(stderr, "ERROR: error %d while registering\n", ret);
                goto out;
        }
 

diff --git a/cmds-filesystem.c b/cmds-filesystem.c
index b1fb402..af56fbe 100644 (file)
--- a/cmds-filesystem.c
+++ b/cmds-filesystem.c
@@ -948,7 +948,7 @@ static int cmd_show(int argc, char **argv)
                goto out;
 
 devs_only:
-       ret = btrfs_scan_lblkid(!BTRFS_UPDATE_KERNEL);
+       ret = btrfs_scan_lblkid();
 
        if (ret) {
                fprintf(stderr, "ERROR: %d while scanning\n", ret);

diff --git a/disk-io.c b/disk-io.c
index d2d29e1..bade5f0 100644 (file)
--- a/disk-io.c
+++ b/disk-io.c
@@ -1019,7 +1019,7 @@ int btrfs_scan_fs_devices(int fd, const char *path,
        }
 
        if (total_devs != 1) {
-               ret = btrfs_scan_lblkid(!BTRFS_UPDATE_KERNEL);
+               ret = btrfs_scan_lblkid();
                if (ret)
                        return ret;
        }

diff --git a/utils.c b/utils.c
index 5a12517..f51bc56 100644 (file)
--- a/utils.c
+++ b/utils.c
@@ -52,6 +52,8 @@
 #define BLKDISCARD     _IO(0x12,119)
 #endif
 
+static int btrfs_scan_done = 0;
+
 static char argv0_buf[ARGV0_BUF_SIZE] = "btrfs";
 
 void fixup_argv0(char **argv, const char *token)
@@ -1186,7 +1188,7 @@ int check_mounted_where(int fd, const char *file, char *where, int size,
 
        /* scan other devices */
        if (is_btrfs && total_devs > 1) {
-               ret = btrfs_scan_lblkid(!BTRFS_UPDATE_KERNEL);
+               ret = btrfs_scan_lblkid();
                if (ret)
                        return ret;
        }
@@ -2179,7 +2181,7 @@ int test_dev_for_mkfs(char *file, int force_overwrite, char *estr)
        return 0;
 }
 
-int btrfs_scan_lblkid(int update_kernel)
+int btrfs_scan_lblkid()
 {
        int fd = -1;
        int ret;
@@ -2190,6 +2192,9 @@ int btrfs_scan_lblkid(int update_kernel)
        blkid_cache cache = NULL;
        char path[PATH_MAX];
 
+       if (btrfs_scan_done)
+               return 0;
+
        if (blkid_get_cache(&cache, 0) < 0) {
                printf("ERROR: lblkid cache get failed\n");
                return 1;
@@ -2218,11 +2223,12 @@ int btrfs_scan_lblkid(int update_kernel)
                }
 
                close(fd);
-               if (update_kernel)
-                       btrfs_register_one_device(path);
        }
        blkid_dev_iterate_end(iter);
        blkid_put_cache(cache);
+
+       btrfs_scan_done = 1;
+
        return 0;
 }
 

diff --git a/utils.h b/utils.h
index 09af46a..8c94624 100644 (file)
--- a/utils.h
+++ b/utils.h
@@ -128,7 +128,7 @@ int csum_tree_block(struct btrfs_root *root, struct extent_buffer *buf,
                           int verify);
 int ask_user(char *question);
 int lookup_ino_rootid(int fd, u64 *rootid);
-int btrfs_scan_lblkid(int update_kernel);
+int btrfs_scan_lblkid(void);
 int get_btrfs_mount(const char *dev, char *mp, size_t mp_size);
 int find_mount_root(const char *path, char **mount_root);
 int get_device_info(int fd, u64 devid,