From patchwork Wed Mar 30 07:56:13 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Qu Wenruo X-Patchwork-Id: 8693461 Return-Path: X-Original-To: patchwork-linux-btrfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 85A329F39A for ; Wed, 30 Mar 2016 07:57:45 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9C0BF201CE for ; Wed, 30 Mar 2016 07:57:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 81536202EB for ; Wed, 30 Mar 2016 07:57:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932596AbcC3H5k (ORCPT ); Wed, 30 Mar 2016 03:57:40 -0400 Received: from cn.fujitsu.com ([222.73.24.84]:29930 "EHLO song.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1753137AbcC3H4s (ORCPT ); Wed, 30 Mar 2016 03:56:48 -0400 X-IronPort-AV: E=Sophos;i="5.20,367,1444665600"; d="scan'208";a="416533" Received: from unknown (HELO cn.fujitsu.com) ([10.167.250.3]) by song.cn.fujitsu.com with ESMTP; 30 Mar 2016 15:56:16 +0800 Received: from localhost.localdomain (unknown [10.167.226.34]) by cn.fujitsu.com (Postfix) with ESMTP id CB5BC4056424; Wed, 30 Mar 2016 15:56:15 +0800 (CST) From: Qu Wenruo To: linux-btrfs@vger.kernel.org Cc: Wang Xiaoguang Subject: [PATCH v9 18/19] btrfs: dedupe: Add support for adding hash for on-disk backend Date: Wed, 30 Mar 2016 15:56:13 +0800 Message-Id: <1459324574-28063-19-git-send-email-quwenruo@cn.fujitsu.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1459324574-28063-1-git-send-email-quwenruo@cn.fujitsu.com> References: <1459324574-28063-1-git-send-email-quwenruo@cn.fujitsu.com> MIME-Version: 1.0 X-yoursite-MailScanner-ID: CB5BC4056424.AE262 X-yoursite-MailScanner: Found to be clean X-yoursite-MailScanner-From: quwenruo@cn.fujitsu.com X-Spam-Status: No, score=-7.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Now on-disk backend can add hash now. Since all needed on-disk backend functions are added, also allow on-disk backend to be used, by changing DEDUPE_BACKEND_COUNT from 1(inmemory only) to 2 (inmemory + ondisk). Signed-off-by: Wang Xiaoguang Signed-off-by: Qu Wenruo --- fs/btrfs/dedupe.c | 83 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ fs/btrfs/dedupe.h | 3 +- 2 files changed, 84 insertions(+), 2 deletions(-) diff --git a/fs/btrfs/dedupe.c b/fs/btrfs/dedupe.c index 19fe5ee..f1d1255 100644 --- a/fs/btrfs/dedupe.c +++ b/fs/btrfs/dedupe.c @@ -437,6 +437,87 @@ out: return 0; } +static int ondisk_search_bytenr(struct btrfs_trans_handle *trans, + struct btrfs_dedupe_info *dedupe_info, + struct btrfs_path *path, u64 bytenr, + int prepare_del); +static int ondisk_search_hash(struct btrfs_dedupe_info *dedupe_info, u8 *hash, + u64 *bytenr_ret, u32 *num_bytes_ret); +static int ondisk_add(struct btrfs_trans_handle *trans, + struct btrfs_dedupe_info *dedupe_info, + struct btrfs_dedupe_hash *hash) +{ + struct btrfs_path *path; + struct btrfs_root *dedupe_root = dedupe_info->dedupe_root; + struct btrfs_key key; + struct btrfs_dedupe_hash_item *hash_item; + u64 bytenr; + u32 num_bytes; + int hash_len = btrfs_dedupe_sizes[dedupe_info->hash_type]; + int ret; + + path = btrfs_alloc_path(); + if (!path) + return -ENOMEM; + + mutex_lock(&dedupe_info->lock); + + ret = ondisk_search_bytenr(NULL, dedupe_info, path, hash->bytenr, 0); + if (ret < 0) + goto out; + if (ret > 0) { + ret = 0; + goto out; + } + btrfs_release_path(path); + + ret = ondisk_search_hash(dedupe_info, hash->hash, &bytenr, &num_bytes); + if (ret < 0) + goto out; + /* Same hash found, don't re-add to save dedupe tree space */ + if (ret > 0) { + ret = 0; + goto out; + } + + /* Insert hash->bytenr item */ + memcpy(&key.objectid, hash->hash + hash_len - 8, 8); + key.type = BTRFS_DEDUPE_HASH_ITEM_KEY; + key.offset = hash->bytenr; + + ret = btrfs_insert_empty_item(trans, dedupe_root, path, &key, + sizeof(*hash_item) + hash_len); + WARN_ON(ret == -EEXIST); + if (ret < 0) + goto out; + hash_item = btrfs_item_ptr(path->nodes[0], path->slots[0], + struct btrfs_dedupe_hash_item); + btrfs_set_dedupe_hash_len(path->nodes[0], hash_item, hash->num_bytes); + write_extent_buffer(path->nodes[0], hash->hash, + (unsigned long)(hash_item + 1), hash_len); + btrfs_mark_buffer_dirty(path->nodes[0]); + btrfs_release_path(path); + + /* Then bytenr->hash item */ + key.objectid = hash->bytenr; + key.type = BTRFS_DEDUPE_BYTENR_ITEM_KEY; + memcpy(&key.offset, hash->hash + hash_len - 8, 8); + + ret = btrfs_insert_empty_item(trans, dedupe_root, path, &key, hash_len); + WARN_ON(ret == -EEXIST); + if (ret < 0) + goto out; + write_extent_buffer(path->nodes[0], hash->hash, + btrfs_item_ptr_offset(path->nodes[0], path->slots[0]), + hash_len); + btrfs_mark_buffer_dirty(path->nodes[0]); + +out: + mutex_unlock(&dedupe_info->lock); + btrfs_free_path(path); + return ret; +} + int btrfs_dedupe_add(struct btrfs_trans_handle *trans, struct btrfs_fs_info *fs_info, struct btrfs_dedupe_hash *hash) @@ -458,6 +539,8 @@ int btrfs_dedupe_add(struct btrfs_trans_handle *trans, if (dedupe_info->backend == BTRFS_DEDUPE_BACKEND_INMEMORY) return inmem_add(dedupe_info, hash); + if (dedupe_info->backend == BTRFS_DEDUPE_BACKEND_ONDISK) + return ondisk_add(trans, dedupe_info, hash); return -EINVAL; } diff --git a/fs/btrfs/dedupe.h b/fs/btrfs/dedupe.h index bfcacd7..1573456 100644 --- a/fs/btrfs/dedupe.h +++ b/fs/btrfs/dedupe.h @@ -31,8 +31,7 @@ #define BTRFS_DEDUPE_BACKEND_INMEMORY 0 #define BTRFS_DEDUPE_BACKEND_ONDISK 1 -/* Only support inmemory yet, so count is still only 1 */ -#define BTRFS_DEDUPE_BACKEND_COUNT 1 +#define BTRFS_DEDUPE_BACKEND_COUNT 2 /* Dedup block size limit and default value */ #define BTRFS_DEDUPE_BLOCKSIZE_MAX (8 * 1024 * 1024)