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 2D5A0C433F5 for ; Tue, 26 Apr 2022 14:32:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346156AbiDZOfG (ORCPT ); Tue, 26 Apr 2022 10:35:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52990 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237151AbiDZOfF (ORCPT ); Tue, 26 Apr 2022 10:35:05 -0400 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C5234888D3 for ; Tue, 26 Apr 2022 07:31:57 -0700 (PDT) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 7FB991F38D; Tue, 26 Apr 2022 14:31:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1650983516; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=IT/CUggWQU94x0z31HrPNO8NqwKDNj1+F3ql1NL7DgE=; b=YoAQElyufoBpca4AEqsX9jASgWOSWgzrqSgbCwIYuFeT9FwLW4kU3BuriNY3bXxNMi2C6W Nhmtq1av0eNRUrVr7tXFmX9I9lUgdY/xKqOJ5vLchUQ80ml0qSH6gOQAlEk/uOZP3hh8dO akUriadsCrniKlnwo4vIT3EfWnexRYc= Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 5735013223; Tue, 26 Apr 2022 14:31:56 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id ItOqE1wCaGLwTAAAMHmgww (envelope-from ); Tue, 26 Apr 2022 14:31:56 +0000 Message-ID: Date: Tue, 26 Apr 2022 16:31:55 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.7.0 Subject: Re: [PATCH v6] btrfs: Turn delayed_nodes_tree into an XArray Content-Language: en-US To: Nikolay Borisov , linux-btrfs@vger.kernel.org Cc: dsterba@suse.com References: <20220426094304.7952-1-gniebler@suse.com> <8878c000-a9f2-477f-8996-08381d1fecc5@suse.com> From: Gabriel Niebler In-Reply-To: <8878c000-a9f2-477f-8996-08381d1fecc5@suse.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org Am 26.04.22 um 13:11 schrieb Nikolay Borisov: > On 26.04.22 г. 12:43 ч., Gabriel Niebler wrote: >> … in the btrfs_root struct and adjust all usages of this object to use >> the >> XArray API, because it is notionally easier to use and unserstand, as it >> provides array semantics, and also takes care of locking for us, further >> simplifying the code. >> >> Also use the opportunity to do some light refactoring. >> >> Signed-off-by: Gabriel Niebler > > > >> @@ -1870,32 +1863,36 @@ void btrfs_kill_delayed_inode_items(struct >> btrfs_inode *inode) >>   void btrfs_kill_all_delayed_nodes(struct btrfs_root *root) >>   { >> -    u64 inode_id = 0; >> +    unsigned long index = 0; >> +    struct btrfs_delayed_node *delayed_node; >>       struct btrfs_delayed_node *delayed_nodes[8]; >> -    int i, n; >>       while (1) { >> +        int n = 0; >> + >>           spin_lock(&root->inode_lock); >> -        n = radix_tree_gang_lookup(&root->delayed_nodes_tree, >> -                       (void **)delayed_nodes, inode_id, >> -                       ARRAY_SIZE(delayed_nodes)); >> -        if (!n) { >> +        if (xa_empty(&root->delayed_nodes)) { >>               spin_unlock(&root->inode_lock); >> -            break; >> +            return; >>           } >> -        inode_id = delayed_nodes[n - 1]->inode_id + 1; >> -        for (i = 0; i < n; i++) { >> +        xa_for_each_start(&root->delayed_nodes, index, >> +                  delayed_node, index) { >>               /* >>                * Don't increase refs in case the node is dead and >>                * about to be removed from the tree in the loop below >>                */ >> -            if (!refcount_inc_not_zero(&delayed_nodes[i]->refs)) >> -                delayed_nodes[i] = NULL; >> +            if (refcount_inc_not_zero(&delayed_node->refs)) { >> +                delayed_nodes[n] = delayed_node; >> +                n++; >> +            } >> +            if (n >= ARRAY_SIZE(delayed_nodes)) >> +                break; >>           } >> +        index++; >>           spin_unlock(&root->inode_lock); >> -        for (i = 0; i < n; i++) { >> +        for (int i = 0; i < n; i++) { >>               if (!delayed_nodes[i]) >>                   continue; > > nit: This check now becomes redundant right, because the way n is > modified we are guaranteed that everything from 0..n will actually be > populated. You're right, these last two lines can now safely be removed like this: diff --git a/fs/btrfs/delayed-inode.c b/fs/btrfs/delayed-inode.c index 8d302f6a0557..ea9f808bce2a 100644 --- a/fs/btrfs/delayed-inode.c +++ b/fs/btrfs/delayed-inode.c @@ -1893,8 +1893,6 @@ void btrfs_kill_all_delayed_nodes(struct btrfs_root *root) spin_unlock(&root->inode_lock); for (int i = 0; i < n; i++) { - if (!delayed_nodes[i]) - continue; __btrfs_kill_delayed_node(delayed_nodes[i]); btrfs_release_delayed_node(delayed_nodes[i]); }