From patchwork Tue Aug 6 08:22:01 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Qu Wenruo X-Patchwork-Id: 11078435 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 E933113AC for ; Tue, 6 Aug 2019 08:22:09 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D71F3287C6 for ; Tue, 6 Aug 2019 08:22:09 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CADB728832; Tue, 6 Aug 2019 08:22:09 +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 617C4287C6 for ; Tue, 6 Aug 2019 08:22:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732160AbfHFIWI (ORCPT ); Tue, 6 Aug 2019 04:22:08 -0400 Received: from mx2.suse.de ([195.135.220.15]:53194 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1731735AbfHFIWH (ORCPT ); Tue, 6 Aug 2019 04:22:07 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id 0036CAF1D for ; Tue, 6 Aug 2019 08:22:05 +0000 (UTC) From: Qu Wenruo To: linux-btrfs@vger.kernel.org Subject: [PATCH] btrfs: transaction: Commit transaction more frequently for BPF Date: Tue, 6 Aug 2019 16:22:01 +0800 Message-Id: <20190806082201.22683-1-wqu@suse.com> X-Mailer: git-send-email 2.22.0 MIME-Version: 1.0 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 Btrfs has btrfs_end_transaction_throttle() which could try to commit transaction when needed. However under most cases btrfs_end_transaction_throttle() won't really commit transaction, due to the hard timing requirement. Now introduce a new error injection point, btrfs_need_trans_pressure(), to allow btrfs_should_end_transaction() to return 1 and btrfs_end_transaction_throttle() to fallback to btrfs_commit_transaction(). With such more aggressive transaction commit, we can dig deeper into cases like snapshot drop. Now each reference drop of btrfs_drop_snapshot() will lead to a transaction commit, allowing dm-logwrites to catch more details, other than one big transaction dropping everything. Signed-off-by: Qu Wenruo --- fs/btrfs/transaction.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/fs/btrfs/transaction.c b/fs/btrfs/transaction.c index 248d535bb14d..2e758957126e 100644 --- a/fs/btrfs/transaction.c +++ b/fs/btrfs/transaction.c @@ -10,6 +10,7 @@ #include #include #include +#include #include "ctree.h" #include "disk-io.h" #include "transaction.h" @@ -781,10 +782,18 @@ void btrfs_throttle(struct btrfs_fs_info *fs_info) wait_current_trans(fs_info); } +static noinline bool btrfs_need_trans_pressure(struct btrfs_trans_handle *trans) +{ + return false; +} +ALLOW_ERROR_INJECTION(btrfs_need_trans_pressure, TRUE); + static int should_end_transaction(struct btrfs_trans_handle *trans) { struct btrfs_fs_info *fs_info = trans->fs_info; + if (btrfs_need_trans_pressure(trans)) + return 1; if (btrfs_check_space_for_delayed_refs(fs_info)) return 1; @@ -845,6 +854,8 @@ static int __btrfs_end_transaction(struct btrfs_trans_handle *trans, btrfs_trans_release_chunk_metadata(trans); + if (throttle && btrfs_need_trans_pressure(trans)) + return btrfs_commit_transaction(trans); if (lock && READ_ONCE(cur_trans->state) == TRANS_STATE_BLOCKED) { if (throttle) return btrfs_commit_transaction(trans);