From patchwork Thu Aug 30 17:42:00 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josef Bacik X-Patchwork-Id: 10582443 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 0BD8617DE for ; Thu, 30 Aug 2018 17:42:50 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EDD6D2C34B for ; Thu, 30 Aug 2018 17:42:49 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E0AC52C35E; Thu, 30 Aug 2018 17:42:49 +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 7214A2C342 for ; Thu, 30 Aug 2018 17:42:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727271AbeH3VqD (ORCPT ); Thu, 30 Aug 2018 17:46:03 -0400 Received: from mail-qt0-f172.google.com ([209.85.216.172]:34040 "EHLO mail-qt0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727067AbeH3VqC (ORCPT ); Thu, 30 Aug 2018 17:46:02 -0400 Received: by mail-qt0-f172.google.com with SMTP id m13-v6so11332704qth.1 for ; Thu, 30 Aug 2018 10:42:47 -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=mF05QDPtkYklFH9N7AHCrveKet6hlcBDmcpEwQiI+8E=; b=veLW4agFKggLnBcxJrCYUQXaml/ABD3ZimDw+Vdq+a3O52toTj5W+kafri903oVQ8Y JVwm9mmWZPhgTTUgG9G3EzM2IGL2MF7KjJUWkEn5z7i2LCx92UqTBKoy16a7/ply7Uje 0XDB8gaNgQyrC/OPxlOwlkjeVOUoW5ozVuZ2/9pOmynVZ2x2vJoO3EPSrTfRq6VBv50w y2jn6w5nA1UpiSA6dolbmO06G/LHBv1E9Z8I35oDdLVU9B8Cp7LbECB0bjaMn8+Sr48B hQV2gWZFZlDy6PjVxQL5g4XEKT92C9WO9aPHkysb8pJX6cI6u57Pqf7WdANcPotnsF9u ZESg== 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=mF05QDPtkYklFH9N7AHCrveKet6hlcBDmcpEwQiI+8E=; b=j5XEjAVPEsqFBOLZX0kdmEOxdsPGgTbVJKYno8KdBuYGX2vVjmqXFlHy28l/ogutil 7OcfnrZvzvc1yya45rGPIYBNpgCSX4tZ4gHLEXMBASCTl8c081L+LG0jkhnEAc41d1/F zgN7ROUUuM74Zuilq1CN6FxA6rqjanRy+kIOg1xVspP8y5thiU31W8IcL6f+nmYzBUcY BDqVvh892z3CuxsGMEJESfKB8YzIwtcrDZpzIbqSF/UdFOD+MESKkB75vqP7ui9GMJAI +GhfyU5V6JIa7+MguA0RrtweKMRcSInpmlfIm2Uw+KcMoy3UZqHgAFFrxSfFKFBCcFD/ audQ== X-Gm-Message-State: APzg51Cz+A9N06eUCHVTU5ckqV2gn70Lv+hgIP5c1biAkqkt9zrWBBRA H++cfwcYCAP8ntuR716XLd7e6pB8xUIERg== X-Google-Smtp-Source: ANB0Vdb371x/hKi+W6DGIHc8RQvCYzFVadGWX21UkF/BJbaqCgmTkm8DtDNkn5HoCzKfydOKFR8xzw== X-Received: by 2002:ac8:5210:: with SMTP id r16-v6mr12901007qtn.11.1535650966602; Thu, 30 Aug 2018 10:42:46 -0700 (PDT) Received: from localhost ([107.15.81.208]) by smtp.gmail.com with ESMTPSA id c15-v6sm4129624qkm.42.2018.08.30.10.42.45 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 30 Aug 2018 10:42:45 -0700 (PDT) From: Josef Bacik To: linux-btrfs@vger.kernel.org Subject: [PATCH 10/35] btrfs: fix truncate throttling Date: Thu, 30 Aug 2018 13:42:00 -0400 Message-Id: <20180830174225.2200-11-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 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 212fa71317d6..10455d0aa71c 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -4493,31 +4493,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. @@ -4562,7 +4537,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); @@ -4775,15 +4749,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; @@ -4795,7 +4761,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, @@ -4807,23 +4773,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_refs_rsv(fs_info, + BTRFS_RESERVE_FLUSH_LIMIT); + if (ret) { + ret = -EAGAIN; + break; + } } goto search_again; } else { @@ -4849,18 +4815,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; }