From patchwork Wed Oct 12 09:03:49 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xiaoguang Wang X-Patchwork-Id: 9372295 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 5024860487 for ; Wed, 12 Oct 2016 09:11:06 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3F465293B4 for ; Wed, 12 Oct 2016 09:11:06 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 33C34293E5; Wed, 12 Oct 2016 09:11:06 +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=-6.9 required=2.0 tests=BAYES_00,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 9888F293B4 for ; Wed, 12 Oct 2016 09:11:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932666AbcJLJKg (ORCPT ); Wed, 12 Oct 2016 05:10:36 -0400 Received: from cn.fujitsu.com ([222.73.24.84]:20144 "EHLO song.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S932105AbcJLJKW (ORCPT ); Wed, 12 Oct 2016 05:10:22 -0400 X-IronPort-AV: E=Sophos;i="5.20,367,1444665600"; d="scan'208";a="893096" Received: from unknown (HELO cn.fujitsu.com) ([10.167.250.3]) by song.cn.fujitsu.com with ESMTP; 12 Oct 2016 17:10:10 +0800 Received: from localhost.localdomain (unknown [10.167.226.107]) by cn.fujitsu.com (Postfix) with ESMTP id B1EFB4010D1A; Wed, 12 Oct 2016 17:10:05 +0800 (CST) From: Wang Xiaoguang To: linux-btrfs@vger.kernel.org Cc: jbacik@fb.com Subject: [PATCH 2/2] btrfs: try to satisfy metadata requests if wen can overcommit Date: Wed, 12 Oct 2016 17:03:49 +0800 Message-Id: <1476263029-11879-2-git-send-email-wangxg.fnst@cn.fujitsu.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1476263029-11879-1-git-send-email-wangxg.fnst@cn.fujitsu.com> References: <1476263029-11879-1-git-send-email-wangxg.fnst@cn.fujitsu.com> MIME-Version: 1.0 X-yoursite-MailScanner-ID: B1EFB4010D1A.A313B X-yoursite-MailScanner: Found to be clean X-yoursite-MailScanner-From: wangxg.fnst@cn.fujitsu.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 In shrink_delalloc(), if can_overcommit() returns true, shrink_delalloc() will give up shrinking delalloc bytes, in this case we should check whether some tickcts' requests can overcommit, if some can, we can satisfy them timely and directly. Signed-off-by: Wang Xiaoguang Reviewed-by: Josef Bacik --- fs/btrfs/extent-tree.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c index 661f039..c2e6871 100644 --- a/fs/btrfs/extent-tree.c +++ b/fs/btrfs/extent-tree.c @@ -4971,6 +4971,47 @@ static void wake_all_tickets(struct list_head *head) } /* + * This function must be protected by btrfs_space_info's lock. + * In shrink_delalloc(), if can_overcommit() returns true, shrink_delalloc() + * will not shrink delalloc bytes any more, in this case we should check + * whether some tickcts' requests can overcommit, if some can, we can satisfy + * them timely and directly. + */ +static void try_to_wake_tickets(struct btrfs_root *root, + struct btrfs_space_info *space_info) +{ + struct reserve_ticket *ticket; + struct list_head *head = &space_info->priority_tickets; + enum btrfs_reserve_flush_enum flush = BTRFS_RESERVE_NO_FLUSH; + u64 used; + +again: + while (!list_empty(head)) { + ticket = list_first_entry(head, struct reserve_ticket, + list); + used = space_info->bytes_used + + space_info->bytes_reserved + space_info->bytes_pinned + + space_info->bytes_readonly + space_info->bytes_may_use; + + if (used + ticket->bytes <= space_info->total_bytes || + can_overcommit(root, space_info, ticket->bytes, flush)) { + space_info->bytes_may_use += ticket->bytes; + list_del_init(&ticket->list); + ticket->bytes = 0; + space_info->tickets_id++; + wake_up(&ticket->wait); + } else + return; + } + + if (head == &space_info->priority_tickets) { + head = &space_info->tickets; + flush = BTRFS_RESERVE_FLUSH_ALL; + goto again; + } +} + +/* * This is for normal flushers, we can wait all goddamned day if we want to. We * will loop and continuously try to flush as long as we are making progress. * We count progress as clearing off tickets each time we have to loop. @@ -5006,6 +5047,8 @@ static void btrfs_async_reclaim_metadata_space(struct work_struct *work) ret = flush_space(fs_info->fs_root, space_info, to_reclaim, flush_state, reclaim_priority); spin_lock(&space_info->lock); + if (!ret) + try_to_wake_tickets(fs_info->fs_root, space_info); if (list_empty(&space_info->tickets)) { space_info->flush = 0; spin_unlock(&space_info->lock);