All of lore.kernel.org
 help / color / mirror / Atom feed
From: Qu Wenruo <quwenruo@cn.fujitsu.com>
To: linux-btrfs@vger.kernel.org, clm@fb.com
Cc: Wang Xiaoguang <wangxg.fnst@cn.fujitsu.com>
Subject: [PATCH v7 08/20] btrfs: ordered-extent: Add support for dedup
Date: Thu, 18 Feb 2016 13:42:46 +0800	[thread overview]
Message-ID: <1455774178-3595-9-git-send-email-quwenruo@cn.fujitsu.com> (raw)
In-Reply-To: <1455774178-3595-1-git-send-email-quwenruo@cn.fujitsu.com>

From: Wang Xiaoguang <wangxg.fnst@cn.fujitsu.com>

Add ordered-extent support for dedup.

Note, current ordered-extent support only supports non-compressed source
extent.
Support for compressed source extent will be added later.

Signed-off-by: Qu Wenruo <quwenruo@cn.fujitsu.com>
Signed-off-by: Wang Xiaoguang <wangxg.fnst@cn.fujitsu.com>
---
 fs/btrfs/ordered-data.c | 43 +++++++++++++++++++++++++++++++++++++++----
 fs/btrfs/ordered-data.h | 13 +++++++++++++
 2 files changed, 52 insertions(+), 4 deletions(-)

diff --git a/fs/btrfs/ordered-data.c b/fs/btrfs/ordered-data.c
index 8c27292..973014b 100644
--- a/fs/btrfs/ordered-data.c
+++ b/fs/btrfs/ordered-data.c
@@ -25,6 +25,7 @@
 #include "btrfs_inode.h"
 #include "extent_io.h"
 #include "disk-io.h"
+#include "dedup.h"
 
 static struct kmem_cache *btrfs_ordered_extent_cache;
 
@@ -183,7 +184,8 @@ static inline struct rb_node *tree_search(struct btrfs_ordered_inode_tree *tree,
  */
 static int __btrfs_add_ordered_extent(struct inode *inode, u64 file_offset,
 				      u64 start, u64 len, u64 disk_len,
-				      int type, int dio, int compress_type)
+				      int type, int dio, int compress_type,
+				      struct btrfs_dedup_hash *hash)
 {
 	struct btrfs_root *root = BTRFS_I(inode)->root;
 	struct btrfs_ordered_inode_tree *tree;
@@ -203,6 +205,30 @@ static int __btrfs_add_ordered_extent(struct inode *inode, u64 file_offset,
 	entry->inode = igrab(inode);
 	entry->compress_type = compress_type;
 	entry->truncated_len = (u64)-1;
+	entry->hash = NULL;
+	/*
+	 * Hash hit must go through dedup routine or we will screw
+	 * delayed refs
+	 */
+	if (hash && (hash->bytenr || root->fs_info->dedup_enabled)) {
+		struct btrfs_dedup_info *dedup_info = root->fs_info->dedup_info;
+
+		if (WARN_ON(dedup_info == NULL)) {
+			kmem_cache_free(btrfs_ordered_extent_cache,
+					entry);
+			return -EINVAL;
+		}
+		entry->hash = btrfs_dedup_alloc_hash(dedup_info->hash_type);
+		if (!entry->hash) {
+			kmem_cache_free(btrfs_ordered_extent_cache, entry);
+			return -ENOMEM;
+		}
+		entry->hash->bytenr = hash->bytenr;
+		entry->hash->num_bytes = hash->num_bytes;
+		memcpy(entry->hash->hash, hash->hash,
+		       btrfs_dedup_sizes[dedup_info->hash_type]);
+	}
+
 	if (type != BTRFS_ORDERED_IO_DONE && type != BTRFS_ORDERED_COMPLETE)
 		set_bit(type, &entry->flags);
 
@@ -249,15 +275,23 @@ int btrfs_add_ordered_extent(struct inode *inode, u64 file_offset,
 {
 	return __btrfs_add_ordered_extent(inode, file_offset, start, len,
 					  disk_len, type, 0,
-					  BTRFS_COMPRESS_NONE);
+					  BTRFS_COMPRESS_NONE, NULL);
 }
 
+int btrfs_add_ordered_extent_dedup(struct inode *inode, u64 file_offset,
+				   u64 start, u64 len, u64 disk_len, int type,
+				   struct btrfs_dedup_hash *hash)
+{
+	return __btrfs_add_ordered_extent(inode, file_offset, start, len,
+					  disk_len, type, 0,
+					  BTRFS_COMPRESS_NONE, hash);
+}
 int btrfs_add_ordered_extent_dio(struct inode *inode, u64 file_offset,
 				 u64 start, u64 len, u64 disk_len, int type)
 {
 	return __btrfs_add_ordered_extent(inode, file_offset, start, len,
 					  disk_len, type, 1,
-					  BTRFS_COMPRESS_NONE);
+					  BTRFS_COMPRESS_NONE, NULL);
 }
 
 int btrfs_add_ordered_extent_compress(struct inode *inode, u64 file_offset,
@@ -266,7 +300,7 @@ int btrfs_add_ordered_extent_compress(struct inode *inode, u64 file_offset,
 {
 	return __btrfs_add_ordered_extent(inode, file_offset, start, len,
 					  disk_len, type, 0,
-					  compress_type);
+					  compress_type, NULL);
 }
 
 /*
@@ -576,6 +610,7 @@ void btrfs_put_ordered_extent(struct btrfs_ordered_extent *entry)
 			list_del(&sum->list);
 			kfree(sum);
 		}
+		kfree(entry->hash);
 		kmem_cache_free(btrfs_ordered_extent_cache, entry);
 	}
 }
diff --git a/fs/btrfs/ordered-data.h b/fs/btrfs/ordered-data.h
index 23c9605..58519ce 100644
--- a/fs/btrfs/ordered-data.h
+++ b/fs/btrfs/ordered-data.h
@@ -139,6 +139,16 @@ struct btrfs_ordered_extent {
 	struct completion completion;
 	struct btrfs_work flush_work;
 	struct list_head work_list;
+
+	/*
+	 * For inband deduplication
+	 * If hash is NULL, no deduplication.
+	 * If hash->bytenr is zero, means this is a dedup miss, hash will
+	 * be added into dedup tree.
+	 * If hash->bytenr is non-zero, this is a dedup hit. Extent ref is
+	 * *ALREADY* increased.
+	 */
+	struct btrfs_dedup_hash *hash;
 };
 
 /*
@@ -172,6 +182,9 @@ int btrfs_dec_test_first_ordered_pending(struct inode *inode,
 				   int uptodate);
 int btrfs_add_ordered_extent(struct inode *inode, u64 file_offset,
 			     u64 start, u64 len, u64 disk_len, int type);
+int btrfs_add_ordered_extent_dedup(struct inode *inode, u64 file_offset,
+				   u64 start, u64 len, u64 disk_len, int type,
+				   struct btrfs_dedup_hash *hash);
 int btrfs_add_ordered_extent_dio(struct inode *inode, u64 file_offset,
 				 u64 start, u64 len, u64 disk_len, int type);
 int btrfs_add_ordered_extent_compress(struct inode *inode, u64 file_offset,
-- 
2.7.1




  parent reply	other threads:[~2016-02-18  5:45 UTC|newest]

Thread overview: 30+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-02-18  5:42 [GIT PULL][PATCH v7 00/19][For 4.6] Btrfs: Add inband (write time) de-duplication framework Qu Wenruo
2016-02-18  5:42 ` [PATCH v7 01/20] btrfs: dedup: Introduce dedup framework and its header Qu Wenruo
2016-03-09 21:27   ` NeilBrown
2016-03-10  0:57     ` Qu Wenruo
2016-03-11 11:43       ` David Sterba
2016-03-12  8:16         ` Qu Wenruo
2016-03-13  5:16           ` Qu Wenruo
2016-03-13 11:33             ` NeilBrown
2016-03-13 16:55               ` Duncan
2016-03-15 22:08                 ` Nicholas D Steeves
2016-03-15 23:19                   ` Duncan
2016-02-18  5:42 ` [PATCH v7 02/20] btrfs: dedup: Introduce function to initialize dedup info Qu Wenruo
2016-02-18  5:42 ` [PATCH v7 03/20] btrfs: dedup: Introduce function to add hash into in-memory tree Qu Wenruo
2016-02-18  5:42 ` [PATCH v7 04/20] btrfs: dedup: Introduce function to remove hash from " Qu Wenruo
2016-02-18  5:42 ` [PATCH v7 05/20] btrfs: delayed-ref: Add support for increasing data ref under spinlock Qu Wenruo
2016-02-18  5:42 ` [PATCH v7 06/20] btrfs: dedup: Introduce function to search for an existing hash Qu Wenruo
2016-02-18  5:42 ` [PATCH v7 07/20] btrfs: dedup: Implement btrfs_dedup_calc_hash interface Qu Wenruo
2016-02-18  5:42 ` Qu Wenruo [this message]
2016-02-18  5:42 ` [PATCH v7 09/20] btrfs: dedup: Inband in-memory only de-duplication implement Qu Wenruo
2016-02-18  5:42 ` [PATCH v7 10/20] btrfs: dedup: Add basic tree structure for on-disk dedup method Qu Wenruo
2016-02-18  5:42 ` [PATCH v7 11/20] btrfs: dedup: Introduce interfaces to resume and cleanup dedup info Qu Wenruo
2016-02-18  5:42 ` [PATCH v7 12/20] btrfs: dedup: Add support for on-disk hash search Qu Wenruo
2016-02-18  5:42 ` [PATCH v7 13/20] btrfs: dedup: Add support to delete hash for on-disk backend Qu Wenruo
2016-02-18  5:42 ` [PATCH v7 14/20] btrfs: dedup: Add support for adding " Qu Wenruo
2016-02-18  5:42 ` [PATCH v7 15/20] btrfs: dedup: Add ioctl for inband deduplication Qu Wenruo
2016-02-18  5:42 ` [PATCH v7 16/20] btrfs: dedup: add an inode nodedup flag Qu Wenruo
2016-02-18  5:42 ` [PATCH v7 17/20] btrfs: dedup: add a property handler for online dedup Qu Wenruo
2016-02-18  5:42 ` [PATCH v7 18/20] btrfs: dedup: add per-file online dedup control Qu Wenruo
2016-02-18  5:42 ` [PATCH v7 19/20] btrfs: try more times to alloc metadata reserve space Qu Wenruo
2016-02-18  5:42 ` [PATCH v7 20/20] btrfs: dedup: Fix a bug when running inband dedup with balance Qu Wenruo

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1455774178-3595-9-git-send-email-quwenruo@cn.fujitsu.com \
    --to=quwenruo@cn.fujitsu.com \
    --cc=clm@fb.com \
    --cc=linux-btrfs@vger.kernel.org \
    --cc=wangxg.fnst@cn.fujitsu.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.