From patchwork Tue May 15 08:51:56 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lu Fengqi X-Patchwork-Id: 10400415 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 69CEA600F4 for ; Tue, 15 May 2018 08:56:05 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4918328668 for ; Tue, 15 May 2018 08:56:05 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3DB59286AD; Tue, 15 May 2018 08:56:05 +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, 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 9A5F628668 for ; Tue, 15 May 2018 08:56:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752510AbeEOIwV (ORCPT ); Tue, 15 May 2018 04:52:21 -0400 Received: from mail.cn.fujitsu.com ([183.91.158.132]:33943 "EHLO heian.cn.fujitsu.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752474AbeEOIwS (ORCPT ); Tue, 15 May 2018 04:52:18 -0400 X-IronPort-AV: E=Sophos;i="5.43,368,1503331200"; d="scan'208";a="39939021" Received: from localhost (HELO cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 15 May 2018 16:52:16 +0800 Received: from G08CNEXCHPEKD01.g08.fujitsu.local (unknown [10.167.33.80]) by cn.fujitsu.com (Postfix) with ESMTP id 6D6E24B3EF11; Tue, 15 May 2018 16:52:14 +0800 (CST) Received: from fnst.localdomain (10.167.226.155) by G08CNEXCHPEKD01.g08.fujitsu.local (10.167.33.89) with Microsoft SMTP Server (TLS) id 14.3.399.0; Tue, 15 May 2018 16:52:18 +0800 From: Lu Fengqi To: CC: Qu Wenruo Subject: [PATCH v14.6 07/14] btrfs: delayed-ref: Add support for increasing data ref under spinlock Date: Tue, 15 May 2018 16:51:56 +0800 Message-ID: <20180515085203.17470-8-lufq.fnst@cn.fujitsu.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180515085203.17470-1-lufq.fnst@cn.fujitsu.com> References: <20180515085203.17470-1-lufq.fnst@cn.fujitsu.com> MIME-Version: 1.0 X-Originating-IP: [10.167.226.155] X-yoursite-MailScanner-ID: 6D6E24B3EF11.AD2A9 X-yoursite-MailScanner: Found to be clean X-yoursite-MailScanner-From: lufq.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 From: Qu Wenruo For in-band dedupe, btrfs needs to increase data ref with delayed_ref locked, so add a new function btrfs_add_delayed_data_ref_lock() to increase extent ref with delayed_refs already locked. Signed-off-by: Qu Wenruo Reviewed-by: Josef Bacik Signed-off-by: Lu Fengqi --- fs/btrfs/delayed-ref.c | 37 +++++++++++++++++++++++++++++-------- fs/btrfs/delayed-ref.h | 10 ++++++++++ 2 files changed, 39 insertions(+), 8 deletions(-) diff --git a/fs/btrfs/delayed-ref.c b/fs/btrfs/delayed-ref.c index e1b0651686f7..58a64448d777 100644 --- a/fs/btrfs/delayed-ref.c +++ b/fs/btrfs/delayed-ref.c @@ -824,6 +824,31 @@ int btrfs_add_delayed_tree_ref(struct btrfs_fs_info *fs_info, return -ENOMEM; } +/* + * Do real delayed data ref insert. + * Caller must hold delayed_refs->lock and allocation memory + * for dref,head_ref and record. + */ +void btrfs_add_delayed_data_ref_locked(struct btrfs_fs_info *fs_info, + struct btrfs_trans_handle *trans, + struct btrfs_delayed_data_ref *dref, + struct btrfs_delayed_ref_head *head_ref, + struct btrfs_qgroup_extent_record *qrecord, + u64 bytenr, u64 num_bytes, u64 parent, u64 ref_root, + u64 owner, u64 offset, u64 reserved, int action, + int *qrecord_inserted_ret, int *old_ref_mod, + int *new_ref_mod) +{ + head_ref = add_delayed_ref_head(fs_info, trans, head_ref, qrecord, + bytenr, num_bytes, ref_root, reserved, + action, 1, 0, qrecord_inserted_ret, + old_ref_mod, new_ref_mod); + + add_delayed_data_ref(fs_info, trans, head_ref, &dref->node, bytenr, + num_bytes, parent, ref_root, owner, offset, + action); +} + /* * add a delayed data ref. it's similar to btrfs_add_delayed_tree_ref. */ @@ -870,14 +895,10 @@ int btrfs_add_delayed_data_ref(struct btrfs_fs_info *fs_info, * insert both the head node and the new ref without dropping * the spin lock */ - head_ref = add_delayed_ref_head(fs_info, trans, head_ref, record, - bytenr, num_bytes, ref_root, reserved, - action, 1, 0, &qrecord_inserted, - old_ref_mod, new_ref_mod); - - add_delayed_data_ref(fs_info, trans, head_ref, &ref->node, bytenr, - num_bytes, parent, ref_root, owner, offset, - action); + btrfs_add_delayed_data_ref_locked(fs_info, trans, ref, head_ref, record, + bytenr, num_bytes, parent, ref_root, owner, offset, + reserved, action, &qrecord_inserted, old_ref_mod, + new_ref_mod); spin_unlock(&delayed_refs->lock); if (qrecord_inserted) diff --git a/fs/btrfs/delayed-ref.h b/fs/btrfs/delayed-ref.h index 7f00db50bd24..ad6c5dceea38 100644 --- a/fs/btrfs/delayed-ref.h +++ b/fs/btrfs/delayed-ref.h @@ -234,12 +234,22 @@ static inline void btrfs_put_delayed_ref_head(struct btrfs_delayed_ref_head *hea kmem_cache_free(btrfs_delayed_ref_head_cachep, head); } +struct btrfs_qgroup_extent_record; int btrfs_add_delayed_tree_ref(struct btrfs_fs_info *fs_info, struct btrfs_trans_handle *trans, u64 bytenr, u64 num_bytes, u64 parent, u64 ref_root, int level, int action, struct btrfs_delayed_extent_op *extent_op, int *old_ref_mod, int *new_ref_mod); +void btrfs_add_delayed_data_ref_locked(struct btrfs_fs_info *fs_info, + struct btrfs_trans_handle *trans, + struct btrfs_delayed_data_ref *dref, + struct btrfs_delayed_ref_head *head_ref, + struct btrfs_qgroup_extent_record *qrecord, + u64 bytenr, u64 num_bytes, u64 parent, u64 ref_root, + u64 owner, u64 offset, u64 reserved, int action, + int *qrecord_inserted_ret, int *old_ref_mod, + int *new_ref_mod); int btrfs_add_delayed_data_ref(struct btrfs_fs_info *fs_info, struct btrfs_trans_handle *trans, u64 bytenr, u64 num_bytes,