From patchwork Fri Oct 9 02:11:23 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Qu Wenruo X-Patchwork-Id: 7358651 Return-Path: X-Original-To: patchwork-linux-btrfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id EC4CC9F4DC for ; Fri, 9 Oct 2015 02:13:48 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id F02F520809 for ; Fri, 9 Oct 2015 02:13:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CF49A20810 for ; Fri, 9 Oct 2015 02:13:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756279AbbJICNn (ORCPT ); Thu, 8 Oct 2015 22:13:43 -0400 Received: from [59.151.112.132] ([59.151.112.132]:47522 "EHLO heian.cn.fujitsu.com" rhost-flags-FAIL-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1753612AbbJICNm (ORCPT ); Thu, 8 Oct 2015 22:13:42 -0400 X-IronPort-AV: E=Sophos;i="5.15,520,1432569600"; d="scan'208";a="101504115" Received: from unknown (HELO edo.cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 09 Oct 2015 10:15:57 +0800 Received: from G08CNEXCHPEKD01.g08.fujitsu.local (localhost.localdomain [127.0.0.1]) by edo.cn.fujitsu.com (8.14.3/8.13.1) with ESMTP id t992D1lX022439 for ; Fri, 9 Oct 2015 10:13:01 +0800 Received: from localhost.localdomain (10.167.226.33) by G08CNEXCHPEKD01.g08.fujitsu.local (10.167.33.89) with Microsoft SMTP Server (TLS) id 14.3.181.6; Fri, 9 Oct 2015 10:13:26 +0800 From: Qu Wenruo To: Subject: [PATCH v2 01/23] btrfs: qgroup: New function declaration for new reserve implement Date: Fri, 9 Oct 2015 10:11:23 +0800 Message-ID: <1444356684-30162-2-git-send-email-quwenruo@cn.fujitsu.com> X-Mailer: git-send-email 2.6.1 In-Reply-To: <1444356684-30162-1-git-send-email-quwenruo@cn.fujitsu.com> References: <1444356684-30162-1-git-send-email-quwenruo@cn.fujitsu.com> MIME-Version: 1.0 X-Originating-IP: [10.167.226.33] Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Add new structures and functions for new qgroup reserve implement dirty phase. Which will focus on avoiding over-reserve as in that case, which means for already reserved dirty space range, we won't reserve space again. This patch adds the needed structure declaration and comments. Signed-off-by: Qu Wenruo --- v2: Fix some comment spell --- fs/btrfs/btrfs_inode.h | 4 ++++ fs/btrfs/qgroup.c | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++ fs/btrfs/qgroup.h | 3 +++ 3 files changed, 65 insertions(+) diff --git a/fs/btrfs/btrfs_inode.h b/fs/btrfs/btrfs_inode.h index 0ef5cc1..6d799b8 100644 --- a/fs/btrfs/btrfs_inode.h +++ b/fs/btrfs/btrfs_inode.h @@ -24,6 +24,7 @@ #include "extent_io.h" #include "ordered-data.h" #include "delayed-inode.h" +#include "qgroup.h" /* * ordered_data_close is set by truncate when a file that used @@ -193,6 +194,9 @@ struct btrfs_inode { struct timespec i_otime; struct inode vfs_inode; + + /* qgroup dirty map for data space reserve */ + struct btrfs_qgroup_data_rsv_map *qgroup_rsv_map; }; extern unsigned char btrfs_filetype_table[]; diff --git a/fs/btrfs/qgroup.c b/fs/btrfs/qgroup.c index e9ace09..607ace8 100644 --- a/fs/btrfs/qgroup.c +++ b/fs/btrfs/qgroup.c @@ -91,6 +91,64 @@ struct btrfs_qgroup { u64 new_refcnt; }; +/* + * Record one range of reserved space. + */ +struct data_rsv_range { + struct rb_node node; + u64 start; + u64 len; +}; + +/* + * Record per inode reserved range. + * This is mainly used to resolve reserved space leaking problem. + * One of the cause is the mismatch with reserve and free. + * + * New qgroup will handle reserve in two phase. + * 1) Dirty phase. + * Pages are just marked dirty, but not written to disk. + * 2) Flushed phase + * Pages are written to disk, but transaction is not committed yet. + * + * At Dirty phase, we only need to focus on avoiding over-reserve. + * + * The idea is like below. + * 1) Write [0,8K) + * 0 4K 8K 12K 16K + * |////////////| + * Reserve +8K, total reserved: 8K + * + * 2) Write [0,4K) + * 0 4K 8K 12K 16K + * |////////////| + * Reserve 0, total reserved 8K + * + * 3) Write [12K,16K) + * 0 4K 8K 12K 16K + * |////////////| |///////| + * Reserve +4K, total reserved 12K + * + * 4) Flush [0,8K) + * Can happen without commit transaction, like fallocate will trigger the + * write. + * 0 4K 8K 12K 16K + * |///////| + * Reserve 0, total reserved 12K + * As the extent is written to disk, not dirty any longer, the range get + * removed. + * But as its delayed_refs is not run, its reserved space will not be freed. + * And things continue to Flushed phase. + * + * By this method, we can avoid over-reserve, which will lead to reserved + * space leak. + */ +struct btrfs_qgroup_data_rsv_map { + struct rb_root root; + u64 reserved; + spinlock_t lock; +}; + static void btrfs_qgroup_update_old_refcnt(struct btrfs_qgroup *qg, u64 seq, int mod) { diff --git a/fs/btrfs/qgroup.h b/fs/btrfs/qgroup.h index 6387dcf..2f863a4 100644 --- a/fs/btrfs/qgroup.h +++ b/fs/btrfs/qgroup.h @@ -33,6 +33,9 @@ struct btrfs_qgroup_extent_record { struct ulist *old_roots; }; +/* For per-inode dirty range reserve */ +struct btrfs_qgroup_data_rsv_map; + int btrfs_quota_enable(struct btrfs_trans_handle *trans, struct btrfs_fs_info *fs_info); int btrfs_quota_disable(struct btrfs_trans_handle *trans,