From patchwork Tue Sep 1 19:05:55 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Omar Sandoval X-Patchwork-Id: 7106501 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 8629A9F36E for ; Tue, 1 Sep 2015 19:06:17 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 8453420531 for ; Tue, 1 Sep 2015 19:06:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 789F02052C for ; Tue, 1 Sep 2015 19:06:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753903AbbIATGJ (ORCPT ); Tue, 1 Sep 2015 15:06:09 -0400 Received: from mail-pa0-f47.google.com ([209.85.220.47]:35688 "EHLO mail-pa0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751611AbbIATGH (ORCPT ); Tue, 1 Sep 2015 15:06:07 -0400 Received: by pacfv12 with SMTP id fv12so4664507pac.2 for ; Tue, 01 Sep 2015 12:06:06 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=tP7/yrKAM1N3gfdZ3crVc55ywoqmbhRFtVu5WLosVds=; b=LIrQPAdioNHWh/2+vxLyFgisx6Pl+Uuhs0ELolihHm4BGkgMmgtBCz2Xo1LI5yUH8x 8tFkg3SbAwzcIsalOh9PeNZ/eWnQV9FDQvaYkhUhHcIu/CQel7Ady5+KalZjLVMINTj0 EAEdOMjtY/xSSsncymFOE9/0ifKpfxNrZEsYK7tX5xLsMQj//G6ZBXM2LKc4KBXZLkSB 30lx/agbAkp7xEbfm8+vIV4AIO+qIjs2PDD01XNb6tVSJqP3Bo7DhwMyw5TtfrpXUWl0 B2er3vDbaYtj6rQLAvLwNg8I8iDmpfd1G1t0o9fp1I3LPnf0dvQq0bUZ5XFIFNX1F4tM FdHA== X-Gm-Message-State: ALoCoQlRrEtp+uG+yFLBixTFj0nALIIBnHNxcqeI0GEdn6uxQkmJJ2jyha6zSn66NBYNiO6Ns93R X-Received: by 10.67.12.166 with SMTP id er6mr49524223pad.40.1441134366251; Tue, 01 Sep 2015 12:06:06 -0700 (PDT) Received: from huxley.thefacebook.com ([2620:10d:c090:200::4:58ae]) by smtp.gmail.com with ESMTPSA id c4sm19022475pdl.16.2015.09.01.12.06.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 01 Sep 2015 12:06:05 -0700 (PDT) From: Omar Sandoval To: linux-btrfs@vger.kernel.org Cc: Omar Sandoval Subject: [PATCH 5/6] Btrfs: wire up the free space tree to the extent tree Date: Tue, 1 Sep 2015 12:05:55 -0700 Message-Id: <5354d2ad80625f36be4032664a7d39f4c4874119.1441131625.git.osandov@fb.com> X-Mailer: git-send-email 2.5.1 In-Reply-To: References: Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Omar Sandoval The free space tree is updated in tandem with the extent tree. There are only a handful of places where we need to hook in: 1. Block group creation 2. Block group deletion 3. Delayed refs (extent creation and deletion) 4. Block group caching Signed-off-by: Omar Sandoval --- fs/btrfs/extent-tree.c | 73 +++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 70 insertions(+), 3 deletions(-) diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c index 37179a569f40..3f10df3932f0 100644 --- a/fs/btrfs/extent-tree.c +++ b/fs/btrfs/extent-tree.c @@ -33,6 +33,7 @@ #include "raid56.h" #include "locking.h" #include "free-space-cache.h" +#include "free-space-tree.h" #include "math.h" #include "sysfs.h" #include "qgroup.h" @@ -589,7 +590,41 @@ static int cache_block_group(struct btrfs_block_group_cache *cache, cache->cached = BTRFS_CACHE_FAST; spin_unlock(&cache->lock); - if (fs_info->mount_opt & BTRFS_MOUNT_SPACE_CACHE) { + if (btrfs_fs_compat_ro(fs_info, FREE_SPACE_TREE)) { + if (load_cache_only) { + spin_lock(&cache->lock); + cache->caching_ctl = NULL; + cache->cached = BTRFS_CACHE_NO; + spin_unlock(&cache->lock); + wake_up(&caching_ctl->wait); + } else { + mutex_lock(&caching_ctl->mutex); + ret = load_free_space_tree(fs_info, cache); + if (ret) { + btrfs_warn(fs_info, "failed to load free space tree for %llu: %d", + cache->key.objectid, ret); + spin_lock(&cache->lock); + cache->caching_ctl = NULL; + cache->cached = BTRFS_CACHE_ERROR; + spin_unlock(&cache->lock); + goto tree_out; + } + + spin_lock(&cache->lock); + cache->caching_ctl = NULL; + cache->cached = BTRFS_CACHE_FINISHED; + cache->last_byte_to_unpin = (u64)-1; + caching_ctl->progress = (u64)-1; + spin_unlock(&cache->lock); + mutex_unlock(&caching_ctl->mutex); + +tree_out: + wake_up(&caching_ctl->wait); + put_caching_control(caching_ctl); + free_excluded_extents(fs_info->extent_root, cache); + return 0; + } + } else if (fs_info->mount_opt & BTRFS_MOUNT_SPACE_CACHE) { mutex_lock(&caching_ctl->mutex); ret = load_free_space_cache(fs_info, cache); @@ -619,8 +654,10 @@ static int cache_block_group(struct btrfs_block_group_cache *cache, } } else { /* - * We are not going to do the fast caching, set cached to the - * appropriate value and wakeup any waiters. + * We're here either because we're not using the space cache or + * free space tree, or because we're currently building the free + * space tree. Set cached to the appropriate value and wakeup + * any waiters. */ spin_lock(&cache->lock); if (load_cache_only) { @@ -6378,6 +6415,13 @@ static int __btrfs_free_extent(struct btrfs_trans_handle *trans, } } + ret = add_to_free_space_tree(trans, root->fs_info, bytenr, + num_bytes); + if (ret) { + btrfs_abort_transaction(trans, extent_root, ret); + goto out; + } + ret = update_block_group(trans, root, bytenr, num_bytes, 0); if (ret) { btrfs_abort_transaction(trans, extent_root, ret); @@ -7321,6 +7365,11 @@ static int alloc_reserved_file_extent(struct btrfs_trans_handle *trans, btrfs_mark_buffer_dirty(path->nodes[0]); btrfs_free_path(path); + ret = remove_from_free_space_tree(trans, fs_info, ins->objectid, + ins->offset); + if (ret) + return ret; + ret = update_block_group(trans, root, ins->objectid, ins->offset, 1); if (ret) { /* -ENOENT, logic error */ btrfs_err(fs_info, "update block group failed for %llu %llu", @@ -7402,6 +7451,11 @@ static int alloc_reserved_tree_block(struct btrfs_trans_handle *trans, btrfs_mark_buffer_dirty(leaf); btrfs_free_path(path); + ret = remove_from_free_space_tree(trans, fs_info, ins->objectid, + num_bytes); + if (ret) + return ret; + ret = update_block_group(trans, root, ins->objectid, root->nodesize, 1); if (ret) { /* -ENOENT, logic error */ @@ -9272,6 +9326,8 @@ btrfs_create_block_group_cache(struct btrfs_root *root, u64 start, u64 size) cache->full_stripe_len = btrfs_full_stripe_len(root, &root->fs_info->mapping_tree, start); + set_free_space_tree_thresholds(cache); + atomic_set(&cache->count, 1); spin_lock_init(&cache->lock); init_rwsem(&cache->data_rwsem); @@ -9535,6 +9591,13 @@ int btrfs_make_block_group(struct btrfs_trans_handle *trans, add_new_free_space(cache, root->fs_info, chunk_offset, chunk_offset + size); + ret = add_block_group_free_space(trans, root->fs_info, cache); + if (ret) { + btrfs_remove_free_space_cache(cache); + btrfs_put_block_group(cache); + return ret; + } + free_excluded_extents(root, cache); /* @@ -9878,6 +9941,10 @@ int btrfs_remove_block_group(struct btrfs_trans_handle *trans, unlock_chunks(root); + ret = remove_block_group_free_space(trans, root->fs_info, block_group); + if (ret) + goto out; + btrfs_put_block_group(block_group); btrfs_put_block_group(block_group);