From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id EF3F3C43334 for ; Fri, 17 Jun 2022 14:41:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1382809AbiFQOlo (ORCPT ); Fri, 17 Jun 2022 10:41:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45252 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1382808AbiFQOln (ORCPT ); Fri, 17 Jun 2022 10:41:43 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A3A724AE19 for ; Fri, 17 Jun 2022 07:41:42 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 579D3B82AC1 for ; Fri, 17 Jun 2022 14:41:41 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 88077C3411B; Fri, 17 Jun 2022 14:41:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1655476900; bh=afaGdpuedtFFcULR+CRcjkF2mWG0oK/AIvWBo8g1HF0=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=n1bXfmWuxIxF+4Y5ZNjkjmNAfnPhCeBtJnHyCz0fn1gFyqDyVKUZ8Kiy4gDs2BWxk n/MMnL3kgMEKfehqtM2W6QXJAZiEhgaiRaCOtTqo+3vC2uZHvZXKtsghuapEQTmtPI fCheuh+6lwpbn40WD70iXzP7ZefrxCysaLCwDpTiz8yVfkI7Ma/qW+TJH49uJtfcBf Wy1PdQbGhkrV8eM8rOcx57hLyfl1PpXJgYhbThgzv737+iSsc9eIp7MCceJSwoF8w4 fYjI+iuy1ZjZzLyni/1aiOroHuNVnPy+Otb5L28CXybvP42unQCuYESbxzqnJ/KwBX +Whg45JeTQiaA== Date: Fri, 17 Jun 2022 15:41:36 +0100 From: Filipe Manana To: Nikolay Borisov Cc: linux-btrfs@vger.kernel.org Subject: Re: [PATCH v3] btrfs: Batch up release of reserved metadata for delayed items used for deletion Message-ID: <20220617144136.GA4066269@falcondesktop> References: <20220617125334.1067259-1-nborisov@suse.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20220617125334.1067259-1-nborisov@suse.com> Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org On Fri, Jun 17, 2022 at 03:53:34PM +0300, Nikolay Borisov wrote: > With Filipe's recent rework of the delayed inode code one aspect which > isn't batched is the release of the reserved metadata of delayed inode's > delete items. With this patch on top of Filipe's rework and running the > same test as provided in the description of a patch titled > "btrfs: improve batch deletion of delayed dir index items" I observe > the following change of the number of calls to btrfs_block_rsv_release: > > Before this change: > @block_rsv_release: 1004 > @btrfs_delete_delayed_items_total_time: 14602 > @delete_batches: 505 > > After: > @block_rsv_release: 510 > @btrfs_delete_delayed_items_total_time: 13643 > @delete_batches: 507 > > Signed-off-by: Nikolay Borisov Looks good now, thanks. Reviewed-by: Filipe Manana > --- > V3: > * Print the inode number in the tracepoint (this time for real) > > * Ensure batch release is called iff total_reserve_size is a positive number, > this implies space is released from non log recover context. > > V2: > * Improved subject wording to make it more clear (Filipe) > > * Print the inode number in the tracepoint (Filipe) > > * More explicit referal to the test case in Filipe's initial patch to make it > more clear how those numbers are derived. > fs/btrfs/delayed-inode.c | 17 ++++++++++++++++- > 1 file changed, 16 insertions(+), 1 deletion(-) > > diff --git a/fs/btrfs/delayed-inode.c b/fs/btrfs/delayed-inode.c > index e1e856436ad5..9d618226005b 100644 > --- a/fs/btrfs/delayed-inode.c > +++ b/fs/btrfs/delayed-inode.c > @@ -800,11 +800,13 @@ static int btrfs_batch_delete_items(struct btrfs_trans_handle *trans, > struct btrfs_path *path, > struct btrfs_delayed_item *item) > { > + struct btrfs_fs_info *fs_info = root->fs_info; > struct btrfs_delayed_item *curr, *next; > struct extent_buffer *leaf = path->nodes[0]; > LIST_HEAD(batch_list); > int nitems, slot, last_slot; > int ret; > + u64 total_reserved_size = item->bytes_reserved; > > ASSERT(leaf != NULL); > > @@ -841,14 +843,27 @@ static int btrfs_batch_delete_items(struct btrfs_trans_handle *trans, > nitems++; > curr = next; > list_add_tail(&curr->tree_list, &batch_list); > + total_reserved_size += curr->bytes_reserved; > } > > ret = btrfs_del_items(trans, root, path, path->slots[0], nitems); > if (ret) > return ret; > > + /* In case of BTRFS_FS_LOG_RECOVERING items won't have reserved space */ > + if (total_reserved_size > 0) { > + /* > + * Check btrfs_delayed_item_reserve_metadata() to see why we don't need > + * to release/reserve qgroup space. > + */ > + trace_btrfs_space_reservation(fs_info, "delayed_item", > + item->key.objectid, total_reserved_size, > + 0); > + btrfs_block_rsv_release(fs_info, &fs_info->delayed_block_rsv, > + total_reserved_size, NULL); > + } > + > list_for_each_entry_safe(curr, next, &batch_list, tree_list) { > - btrfs_delayed_item_release_metadata(root, curr); > list_del(&curr->tree_list); > btrfs_release_delayed_item(curr); > } > -- > 2.25.1 >