From patchwork Thu Aug 30 17:42:03 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josef Bacik X-Patchwork-Id: 10582449 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B1C7017DE for ; Thu, 30 Aug 2018 17:42:54 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9FF1A284DA for ; Thu, 30 Aug 2018 17:42:54 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 92C6428676; Thu, 30 Aug 2018 17:42:54 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2ECD9284DA for ; Thu, 30 Aug 2018 17:42:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727552AbeH3VqH (ORCPT ); Thu, 30 Aug 2018 17:46:07 -0400 Received: from mail-qt0-f193.google.com ([209.85.216.193]:33843 "EHLO mail-qt0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727067AbeH3VqH (ORCPT ); Thu, 30 Aug 2018 17:46:07 -0400 Received: by mail-qt0-f193.google.com with SMTP id m13-v6so11333170qth.1 for ; Thu, 30 Aug 2018 10:42:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=toxicpanda-com.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:in-reply-to:references; bh=8E5OuvZ7AaYb8DpVhuhicVW4rDtNpOHtUOUobLOXJHU=; b=2EH9NM7gZC77fH2ttjxeB9AwptS1Yra1DE+Z5CHTASu+RJjzQ+LpE40LnoSFknCnJ4 +pJYiQdLBqTAOoteeE+svVvBhJQiU0P3r+V02EhH61M0cTT2bhsvQ/sika68zLD7MQ2I THphCS1XIs64YIUNb/Ikyqir6SODZxI0pQazQljBTb3K4aYWT3FkAJMGTvz4NGQWsfdW xY4bCjyQ+rZHd8/zBhndxs1T4+gKRhx5nThYgEWVDMovhIJvbM0S6niXJkYOe46jPwbb umqvN4A20fNEE28gB6/0RIl6leAISM/WwDzuRC5/bWkVog/7HcuQ0q0C3CyM6sW9bgMB m25g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=8E5OuvZ7AaYb8DpVhuhicVW4rDtNpOHtUOUobLOXJHU=; b=FXvdHtZvzr91YzTeGPRR3/KYJiKozd4rlFmF3bNtzHvpYguPbyEn7NVys8fImiLp44 jxyurYU48Y7HSdgLAM5MB6Vmzkjz+JdgttumgpVZRtVhWsESxs3n6+awBnZNfqZH/z2M Yc7HNVZicjuSenY/gKjtdqgTkAYf2/Keh72LraDQf5sXUVo9pMMBScJTA8jTv1VVAVNV y19zChT71i9lV5ZiwHwrPtBJQm1DByV8/0OESMX27u+fPR2sOTHkKxVpDaHFQ4RETfae MoLMno/Y3XVP7bg7z28WzSQieFcoak4zGildtMg+sUb2X6NfN3KSL8tel2hlys++8DeV aFqA== X-Gm-Message-State: APzg51CJnzQ1TwHK2cudZ0Xf4LGSPZn2VE7yeHJZyrmqLZyRsuY2ZLfy fU+U07Y9O2elYFZQ2vx8wbcbiJEcWwdcHQ== X-Google-Smtp-Source: ANB0VdYNUVYYj9p+tMCOFBoEYtQO9uRl2wENlnpilX0MVKcrYhzQ0/4nZmVx8Outqw2gEaZX4iPK/g== X-Received: by 2002:a37:ad03:: with SMTP id f3-v6mr4436717qkm.140.1535650971883; Thu, 30 Aug 2018 10:42:51 -0700 (PDT) Received: from localhost ([107.15.81.208]) by smtp.gmail.com with ESMTPSA id k21-v6sm3963986qtj.11.2018.08.30.10.42.50 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 30 Aug 2018 10:42:51 -0700 (PDT) From: Josef Bacik To: linux-btrfs@vger.kernel.org Subject: [PATCH 13/35] btrfs: reset max_extent_size properly Date: Thu, 30 Aug 2018 13:42:03 -0400 Message-Id: <20180830174225.2200-14-josef@toxicpanda.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180830174225.2200-1-josef@toxicpanda.com> References: <20180830174225.2200-1-josef@toxicpanda.com> Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP If we use up our block group before allocating a new one we'll easily get a max_extent_size that's set really really low, which will result in a lot of fragmentation. We need to make sure we're resetting the max_extent_size when we add a new chunk or add new space. Signed-off-by: Josef Bacik --- fs/btrfs/extent-tree.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c index 22e1f9f55f4f..f4e7caf37d6c 100644 --- a/fs/btrfs/extent-tree.c +++ b/fs/btrfs/extent-tree.c @@ -4565,6 +4565,7 @@ static int do_chunk_alloc(struct btrfs_trans_handle *trans, u64 flags, goto out; } else { ret = 1; + space_info->max_extent_size = 0; } space_info->force_alloc = CHUNK_ALLOC_NO_FORCE; @@ -8064,11 +8065,17 @@ static int __btrfs_free_reserved_extent(struct btrfs_fs_info *fs_info, if (pin) pin_down_extent(fs_info, cache, start, len, 1); else { + struct btrfs_space_info *space_info = cache->space_info; + if (btrfs_test_opt(fs_info, DISCARD)) ret = btrfs_discard_extent(fs_info, start, len, NULL, BTRFS_CLEAR_OP_DISCARD); btrfs_add_free_space(cache, start, len); btrfs_free_reserved_bytes(cache, len, delalloc); + + spin_lock(&space_info->lock); + space_info->max_extent_size = 0; + spin_unlock(&space_info->lock); trace_btrfs_reserved_extent_free(fs_info, start, len); }