btrfs: allow a generation number to be associated with lru cache entries

This allows an optional generation number to be associated to each entry
of the lru cache. Entries with the same key but different generations, are
stored in the linked list to which the maple tree points to. This is meant
to be used when there's a small number of different generations, so the
impact of searching a linked list is negligible. The goal is to get rid of
the open coded name cache in the send code (which uses a radix tree and
a similar linked list of values/entries) and use instead the lru cache
module. For that particular use case we have at most 2 generations that
are associated to each key (inode number): one generation for the send
root and another generation for the parent root. The actual migration of
the send name cache is done in the next patch in the series.

This patch is part of a larger patchset and the changelog of the last
patch in the series contains a sample performance test and results.
The patches that comprise the patchset are the following:

  btrfs: send: directly return from did_overwrite_ref() and simplify it
  btrfs: send: avoid unnecessary generation search at did_overwrite_ref()
  btrfs: send: directly return from will_overwrite_ref() and simplify it
  btrfs: send: avoid extra b+tree searches when checking reference overrides
  btrfs: send: remove send_progress argument from can_rmdir()
  btrfs: send: avoid duplicated orphan dir allocation and initialization
  btrfs: send: avoid unnecessary orphan dir rbtree search at can_rmdir()
  btrfs: send: reduce searches on parent root when checking if dir can be removed
  btrfs: send: iterate waiting dir move rbtree only once when processing refs
  btrfs: send: initialize all the red black trees earlier
  btrfs: send: genericize the backref cache to allow it to be reused
  btrfs: adapt lru cache to allow for 64 bits keys on 32 bits systems
  btrfs: send: cache information about created directories
  btrfs: allow a generation number to be associated with lru cache entries
  btrfs: add an api to delete a specific entry from the lru cache
  btrfs: send: use the lru cache to implement the name cache
  btrfs: send: update size of roots array for backref cache entries
  btrfs: send: cache utimes operations for directories if possible

Signed-off-by: Filipe Manana <fdmanana@suse.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/fs/btrfs/lru_cache.c b/fs/btrfs/lru_cache.c
index 6012bceedffc344e900dce89b8140bfa87c89d76..01821d66a8a2df759a51cf82d80a25a7f664f4f2 100644 (file)
--- a/fs/btrfs/lru_cache.c
+++ b/fs/btrfs/lru_cache.c
@@ -18,12 +18,13 @@ void btrfs_lru_cache_init(struct btrfs_lru_cache *cache, unsigned int max_size)
        cache->max_size = max_size;
 }
 
-static struct btrfs_lru_cache_entry *match_entry(struct list_head *head, u64 key)
+static struct btrfs_lru_cache_entry *match_entry(struct list_head *head, u64 key,
+                                                u64 gen)
 {
        struct btrfs_lru_cache_entry *entry;
 
        list_for_each_entry(entry, head, list) {
-               if (entry->key == key)
+               if (entry->key == key && entry->gen == gen)
                        return entry;
        }
 
@@ -35,11 +36,12 @@ static struct btrfs_lru_cache_entry *match_entry(struct list_head *head, u64 key
  *
  * @cache:      The cache.
  * @key:        The key of the entry we are looking for.
+ * @gen:        Generation associated to the key.
  *
  * Returns the entry associated with the key or NULL if none found.
  */
 struct btrfs_lru_cache_entry *btrfs_lru_cache_lookup(struct btrfs_lru_cache *cache,
-                                                    u64 key)
+                                                    u64 key, u64 gen)
 {
        struct list_head *head;
        struct btrfs_lru_cache_entry *entry;
@@ -48,7 +50,7 @@ struct btrfs_lru_cache_entry *btrfs_lru_cache_lookup(struct btrfs_lru_cache *cac
        if (!head)
                return NULL;
 
-       entry = match_entry(head, key);
+       entry = match_entry(head, key, gen);
        if (entry)
                list_move_tail(&entry->lru_list, &cache->lru_list);
 
@@ -111,7 +113,7 @@ int btrfs_lru_cache_store(struct btrfs_lru_cache *cache,
                kfree(head);
                head = mtree_load(&cache->entries, key);
                ASSERT(head != NULL);
-               if (match_entry(head, key) != NULL)
+               if (match_entry(head, key, new_entry->gen) != NULL)
                        return -EEXIST;
                list_add_tail(&new_entry->list, head);
        } else if (ret < 0) {

diff --git a/fs/btrfs/lru_cache.h b/fs/btrfs/lru_cache.h
index 7a255cd2958e85af88aa38029f98ea9de0fc4510..c1f20f4b70380516855ffac63be6b8e4d95dbdb9 100644 (file)
--- a/fs/btrfs/lru_cache.h
+++ b/fs/btrfs/lru_cache.h
@@ -17,6 +17,13 @@
 struct btrfs_lru_cache_entry {
        struct list_head lru_list;
        u64 key;
+       /*
+        * Optional generation associated to a key. Use 0 if not needed/used.
+        * Entries with the same key and different generations are stored in a
+        * linked list, so use this only for cases where there's a small number
+        * of different generations.
+        */
+       u64 gen;
        /*
         * The maple tree uses unsigned long type for the keys, which is 32 bits
         * on 32 bits systems, and 64 bits on 64 bits systems. So if we want to
@@ -47,7 +54,7 @@ static inline unsigned int btrfs_lru_cache_size(const struct btrfs_lru_cache *ca
 
 void btrfs_lru_cache_init(struct btrfs_lru_cache *cache, unsigned int max_size);
 struct btrfs_lru_cache_entry *btrfs_lru_cache_lookup(struct btrfs_lru_cache *cache,
-                                                    u64 key);
+                                                    u64 key, u64 gen);
 int btrfs_lru_cache_store(struct btrfs_lru_cache *cache,
                          struct btrfs_lru_cache_entry *new_entry,
                          gfp_t gfp);

diff --git a/fs/btrfs/send.c b/fs/btrfs/send.c
index 1cde7463893975f87ad83013568eb6d6f92080c6..8a7d8979bf579708436bb1a66514da61c7166daa 100644 (file)
--- a/fs/btrfs/send.c
+++ b/fs/btrfs/send.c
@@ -120,7 +120,7 @@ static_assert(offsetof(struct backref_cache_entry, entry) == 0);
 /*
  * Max number of entries in the cache that stores directories that were already
  * created. The cache uses raw struct btrfs_lru_cache_entry entries, so it uses
- * at most 4096 bytes - sizeof(struct btrfs_lru_cache_entry) is 40 bytes, but
+ * at most 4096 bytes - sizeof(struct btrfs_lru_cache_entry) is 48 bytes, but
  * the kmalloc-64 slab is used, so we get 4096 bytes (64 bytes * 64).
  */
 #define SEND_MAX_DIR_CREATED_CACHE_SIZE                        64
@@ -1422,7 +1422,7 @@ static bool lookup_backref_cache(u64 leaf_bytenr, void *ctx,
                return false;
        }
 
-       raw_entry = btrfs_lru_cache_lookup(&sctx->backref_cache, key);
+       raw_entry = btrfs_lru_cache_lookup(&sctx->backref_cache, key, 0);
        if (!raw_entry)
                return false;
 
@@ -1455,6 +1455,7 @@ static void store_backref_cache(u64 leaf_bytenr, const struct ulist *root_ids,
                return;
 
        new_entry->entry.key = leaf_bytenr >> fs_info->sectorsize_bits;
+       new_entry->entry.gen = 0;
        new_entry->num_roots = 0;
        ULIST_ITER_INIT(&uiter);
        while ((node = ulist_next(root_ids, &uiter)) != NULL) {
@@ -2957,6 +2958,7 @@ static void cache_dir_created(struct send_ctx *sctx, u64 dir)
                return;
 
        entry->key = dir;
+       entry->gen = 0;
        ret = btrfs_lru_cache_store(&sctx->dir_created_cache, entry, GFP_KERNEL);
        if (ret < 0)
                kfree(entry);
@@ -2977,7 +2979,7 @@ static int did_create_dir(struct send_ctx *sctx, u64 dir)
        struct btrfs_key di_key;
        struct btrfs_dir_item *di;
 
-       if (btrfs_lru_cache_lookup(&sctx->dir_created_cache, dir))
+       if (btrfs_lru_cache_lookup(&sctx->dir_created_cache, dir, 0))
                return 1;
 
        path = alloc_path_for_send();