From patchwork Thu Jul 19 14:49:55 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josef Bacik X-Patchwork-Id: 10534685 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id E0C1E601D2 for ; Thu, 19 Jul 2018 14:50:25 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E6C0229CB7 for ; Thu, 19 Jul 2018 14:50:25 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DB3C829CC6; Thu, 19 Jul 2018 14:50:25 +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.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI, T_DKIM_INVALID 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 6C76429CB7 for ; Thu, 19 Jul 2018 14:50:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731884AbeGSPdy (ORCPT ); Thu, 19 Jul 2018 11:33:54 -0400 Received: from mail-qk0-f177.google.com ([209.85.220.177]:42438 "EHLO mail-qk0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731656AbeGSPdy (ORCPT ); Thu, 19 Jul 2018 11:33:54 -0400 Received: by mail-qk0-f177.google.com with SMTP id 26-v6so4395008qks.9 for ; Thu, 19 Jul 2018 07:50:23 -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=GAbHmADEOrcqbrYpDpxxO3dKDDY1XXyFgAUROMakPQw=; b=gDGBvvmanXVDRelE3iglIZZv6vwhZuIR/kzm+LTrGYx6qLBlamLjWRA+5qlOhCCjM8 vxBIIvkZN3RkUElYZcU37+G+O1uLgtHf+o3TJqF0jITIZQg7kaeqLpn7L/W1iNPQr/MC uEFjY6MpVU351iiQQ01zg+b5whyTb0PeuSrs4XvoXhsSU5uUVO11b8CjnOSgj8Ofpnmz ECCtcomX8IHiIgkZsotFSn+Cml5Z33xl7aBOgnS7eqpwdDjwGpBh9YBWM74O/bkpNXKY vFolFD7J2n4+/YUYqj1MhcOmP4BPpMQwJYf/KkHOwXXvk2vqD+rEDFPZHAvqAfNrupAk AaCA== 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=GAbHmADEOrcqbrYpDpxxO3dKDDY1XXyFgAUROMakPQw=; b=iXHzcc0HyCpkqMNuL2HTS5efh1rspKES/s9tv9ntYEDjRcrEhrHbn6oyHL2ZHphL/V 2GcoH7Egn3ybDP7L61B67xPQSXroWEbo0Urcpda5pDgskQWLSQVAJLxetNKnRQmbu4Wv +MQdSsc+wD5vp5sKO1HX3xAM1Hj3uD0XBYo7qlNFxMBG0E3cdbt8OlqA58Ei17JoHzZK BUP+WOG67LEX+AlaTU5v/rQAMBagafrQoR6nhrOkMbnCbtzkbVFUeLKLRV5L4Y19fVBF Ue5n4qDn4YXMaqZOeM8MpEVM35CcsyOL+C2hiuI2huJy+IBgjCH734fca0igVFy7LhL6 q3xg== X-Gm-Message-State: AOUpUlHjaWpCIeHy3jQmobicnVKfABGY9unFqulq8aaDSpSJNXXY23JT ho9Xo+RLfuprwG51IPi76yo8hXJtFZI= X-Google-Smtp-Source: AAOMgpdMtMYI8FRElpIOC1csHscWEYFf7x1RMyR+iz5WoxNmtSwVCF60LVIVWZxN91suEK6IY28XuQ== X-Received: by 2002:a37:4ecb:: with SMTP id c194-v6mr9191843qkb.345.1532011822939; Thu, 19 Jul 2018 07:50:22 -0700 (PDT) Received: from localhost ([107.15.81.208]) by smtp.gmail.com with ESMTPSA id r13-v6sm5073944qti.70.2018.07.19.07.50.21 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 19 Jul 2018 07:50:22 -0700 (PDT) From: Josef Bacik To: linux-btrfs@vger.kernel.org, kernel-team@fb.com Subject: [PATCH 11/22] btrfs: fix truncate throttling Date: Thu, 19 Jul 2018 10:49:55 -0400 Message-Id: <20180719145006.17532-11-josef@toxicpanda.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180719145006.17532-1-josef@toxicpanda.com> References: <20180719145006.17532-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 We have a bunch of magic to make sure we're throttling delayed refs when truncating a file. Now that we have a delayed refs rsv and a mechanism for refilling that reserve simply use that instead of all of this magic. Signed-off-by: Josef Bacik --- fs/btrfs/inode.c | 78 ++++++++++++-------------------------------------------- 1 file changed, 16 insertions(+), 62 deletions(-) diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 14ecfe5d6110..062807baf2ed 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -4481,31 +4481,6 @@ static int btrfs_rmdir(struct inode *dir, struct dentry *dentry) return err; } -static int truncate_space_check(struct btrfs_trans_handle *trans, - struct btrfs_root *root, - u64 bytes_deleted) -{ - struct btrfs_fs_info *fs_info = root->fs_info; - int ret; - - /* - * This is only used to apply pressure to the enospc system, we don't - * intend to use this reservation at all. - */ - bytes_deleted = btrfs_csum_bytes_to_leaves(fs_info, bytes_deleted); - bytes_deleted *= fs_info->nodesize; - ret = btrfs_block_rsv_add(root, &fs_info->trans_block_rsv, - bytes_deleted, BTRFS_RESERVE_NO_FLUSH); - if (!ret) { - trace_btrfs_space_reservation(fs_info, "transaction", - trans->transid, - bytes_deleted, 1); - trans->bytes_reserved += bytes_deleted; - } - return ret; - -} - /* * Return this if we need to call truncate_block for the last bit of the * truncate. @@ -4550,7 +4525,6 @@ int btrfs_truncate_inode_items(struct btrfs_trans_handle *trans, u64 bytes_deleted = 0; bool be_nice = false; bool should_throttle = false; - bool should_end = false; BUG_ON(new_size > 0 && min_type != BTRFS_EXTENT_DATA_KEY); @@ -4763,15 +4737,7 @@ int btrfs_truncate_inode_items(struct btrfs_trans_handle *trans, btrfs_abort_transaction(trans, ret); break; } - if (btrfs_should_throttle_delayed_refs(trans, fs_info)) - btrfs_async_run_delayed_refs(fs_info, - trans->delayed_ref_updates * 2, - trans->transid, 0); if (be_nice) { - if (truncate_space_check(trans, root, - extent_num_bytes)) { - should_end = true; - } if (btrfs_should_throttle_delayed_refs(trans, fs_info)) should_throttle = true; @@ -4783,7 +4749,7 @@ int btrfs_truncate_inode_items(struct btrfs_trans_handle *trans, if (path->slots[0] == 0 || path->slots[0] != pending_del_slot || - should_throttle || should_end) { + should_throttle) { if (pending_del_nr) { ret = btrfs_del_items(trans, root, path, pending_del_slot, @@ -4795,23 +4761,23 @@ int btrfs_truncate_inode_items(struct btrfs_trans_handle *trans, pending_del_nr = 0; } btrfs_release_path(path); - if (should_throttle) { - unsigned long updates = trans->delayed_ref_updates; - if (updates) { - trans->delayed_ref_updates = 0; - ret = btrfs_run_delayed_refs(trans, - updates * 2); - if (ret) - break; - } - } + /* - * if we failed to refill our space rsv, bail out - * and let the transaction restart + * We can generate a lot of delayed refs, so we need to + * throttle every once and a while and make sure we're + * adding enough space to keep up with the work we are + * generating. Since we hold a transaction here we can + * only FLUSH_LIMIT, if this fails we just return EAGAIN + * and let the normal space allocation stuff do it's + * work. */ - if (should_end) { - ret = -EAGAIN; - break; + if (should_throttle) { + ret = btrfs_refill_delayed_block_rsv(fs_info, + BTRFS_RESERVE_FLUSH_LIMIT); + if (ret) { + ret = -EAGAIN; + break; + } } goto search_again; } else { @@ -4837,18 +4803,6 @@ int btrfs_truncate_inode_items(struct btrfs_trans_handle *trans, } btrfs_free_path(path); - - if (be_nice && bytes_deleted > SZ_32M && (ret >= 0 || ret == -EAGAIN)) { - unsigned long updates = trans->delayed_ref_updates; - int err; - - if (updates) { - trans->delayed_ref_updates = 0; - err = btrfs_run_delayed_refs(trans, updates * 2); - if (err) - ret = err; - } - } return ret; }