From patchwork Thu Aug 30 17:42:02 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josef Bacik X-Patchwork-Id: 10582447 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 2140417DE for ; Thu, 30 Aug 2018 17:42:53 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0B05E27CEE for ; Thu, 30 Aug 2018 17:42:53 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id F34B22C35F; Thu, 30 Aug 2018 17:42:52 +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 92FB02C363 for ; Thu, 30 Aug 2018 17:42:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727536AbeH3VqG (ORCPT ); Thu, 30 Aug 2018 17:46:06 -0400 Received: from mail-qt0-f177.google.com ([209.85.216.177]:45819 "EHLO mail-qt0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727067AbeH3VqG (ORCPT ); Thu, 30 Aug 2018 17:46:06 -0400 Received: by mail-qt0-f177.google.com with SMTP id g44-v6so11257305qtb.12 for ; Thu, 30 Aug 2018 10:42:50 -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=5NmhNwD7gQYYw449r9Kp/13F/zzYmanGbb7uHn9UesE=; b=OEoSy9BtEQJMfZIaHGxPZhMOQo4uDR2a/PIveZG5voFyxhq0VM4FHLMZV4pfYCjlzk Q9OOb9jDp6uSVGVQWtisKCG/XorCLjc7r+BmxgqRMmD+3DprvBCGh6AEbckDJFFkxSKz I6O9aYO6/R6e7TJs4SuGfK4RhtXyRdPg3/CD1M7s3zoKkTn2L+AlzuUBYWWthRFDDsrI nL7K2FSJnRFMh3GmOIWp7sZ60Bh27L7AL+L9VOIb2P0uIRyFRNOTgAo6fkEPxT6rY43l hvz8iWhs+Ahqx5ceXD9K+crFjAdemYXAA0JjB9EVd4Lm6fRAbcw52u/m/75SG+FGFacv wF9g== 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=5NmhNwD7gQYYw449r9Kp/13F/zzYmanGbb7uHn9UesE=; b=An3zdgOxjUz14cOGW0vUDiSCaPgihUaDUWAshHqYds7fdT4HDpO3QVXdJTrnpxsE5k 0Ym9LuZ1LRp1XnrOcxjo2V9q6AwCx7EdOycgGFFWML1pkc7/BgpEuWUbJ372R4LtA0us 7oZC6GZLbkyJTSqUQJIbABqNm3vvdn8NGerxL9hwY/qbVMLTUhKu5GMSmyzfrBvDTWIL j0gYai1v6MpcwtP2UX4K8WFT+cBOmy5Ugij4E5rwDjdnoz7+ZUJ5Sl1hQjJ/vMiU74Yv jm0V8Av4S5TXMgDEIZx4e0nAP31fCJ7h1o5VUKShcRFmci7IxHcGd5vBh5eC6tSMwHUM G57Q== X-Gm-Message-State: APzg51BoJ8f3FHXsxfr5zWDhYPZl4OVCDPu4XYrLs4FQY5ztDjuTxsix aZHH0mPiaMoY7GqAzhFojUtUimEJTZ+0cg== X-Google-Smtp-Source: ANB0VdaoZfqT/1d94lQp7NYvccX2tPDNaQTVkOiSdYR8MMxJMLQ5H2UvVi3jUpaXamO7ccwNkN9Ytw== X-Received: by 2002:ac8:1019:: with SMTP id z25-v6mr13251063qti.25.1535650970152; Thu, 30 Aug 2018 10:42:50 -0700 (PDT) Received: from localhost ([107.15.81.208]) by smtp.gmail.com with ESMTPSA id w9-v6sm5170148qta.13.2018.08.30.10.42.49 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 30 Aug 2018 10:42:49 -0700 (PDT) From: Josef Bacik To: linux-btrfs@vger.kernel.org Subject: [PATCH 12/35] btrfs: add ALLOC_CHUNK_FORCE to the flushing code Date: Thu, 30 Aug 2018 13:42:02 -0400 Message-Id: <20180830174225.2200-13-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 With my change to no longer take into account the global reserve for metadata allocation chunks we have this side-effect for mixed block group fs'es where we are no longer allocating enough chunks for the data/metadata requirements. To deal with this add a ALLOC_CHUNK_FORCE step to the flushing state machine. This will only get used if we've already made a full loop through the flushing machinery and tried committing the transaction. If we have then we can try and force a chunk allocation since we likely need it to make progress. This resolves the issues I was seeing with the mixed bg tests in xfstests with my previous patch. Signed-off-by: Josef Bacik --- fs/btrfs/ctree.h | 3 ++- fs/btrfs/extent-tree.c | 7 ++++++- include/trace/events/btrfs.h | 1 + 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h index 0a4e55703d48..791e287c2292 100644 --- a/fs/btrfs/ctree.h +++ b/fs/btrfs/ctree.h @@ -2731,7 +2731,8 @@ enum btrfs_flush_state { FLUSH_DELALLOC = 5, FLUSH_DELALLOC_WAIT = 6, ALLOC_CHUNK = 7, - COMMIT_TRANS = 8, + ALLOC_CHUNK_FORCE = 8, + COMMIT_TRANS = 9, }; int btrfs_alloc_data_chunk_ondemand(struct btrfs_inode *inode, u64 bytes); diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c index 783341e3653e..22e1f9f55f4f 100644 --- a/fs/btrfs/extent-tree.c +++ b/fs/btrfs/extent-tree.c @@ -4907,6 +4907,7 @@ static void flush_space(struct btrfs_fs_info *fs_info, btrfs_end_transaction(trans); break; case ALLOC_CHUNK: + case ALLOC_CHUNK_FORCE: trans = btrfs_join_transaction(root); if (IS_ERR(trans)) { ret = PTR_ERR(trans); @@ -4914,7 +4915,9 @@ static void flush_space(struct btrfs_fs_info *fs_info, } ret = do_chunk_alloc(trans, btrfs_metadata_alloc_profile(fs_info), - CHUNK_ALLOC_NO_FORCE); + (state == ALLOC_CHUNK) ? + CHUNK_ALLOC_NO_FORCE : + CHUNK_ALLOC_FORCE); btrfs_end_transaction(trans); if (ret > 0 || ret == -ENOSPC) ret = 0; @@ -5060,6 +5063,8 @@ static void btrfs_async_reclaim_metadata_space(struct work_struct *work) } } spin_unlock(&space_info->lock); + if (flush_state == ALLOC_CHUNK_FORCE && !commit_cycles) + flush_state++; } while (flush_state <= COMMIT_TRANS); } diff --git a/include/trace/events/btrfs.h b/include/trace/events/btrfs.h index 7d205e50b09c..fdb23181b5b7 100644 --- a/include/trace/events/btrfs.h +++ b/include/trace/events/btrfs.h @@ -1051,6 +1051,7 @@ TRACE_EVENT(btrfs_trigger_flush, { FLUSH_DELAYED_REFS_NR, "FLUSH_DELAYED_REFS_NR"}, \ { FLUSH_DELAYED_REFS, "FLUSH_ELAYED_REFS"}, \ { ALLOC_CHUNK, "ALLOC_CHUNK"}, \ + { ALLOC_CHUNK_FORCE, "ALLOC_CHUNK_FORCE"}, \ { COMMIT_TRANS, "COMMIT_TRANS"}) TRACE_EVENT(btrfs_flush_space,