From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-322982-1516220824-2-18299442976940990543 X-Sieve: CMU Sieve 3.0 X-Spam-known-sender: no X-Spam-score: 0.0 X-Spam-hits: BAYES_00 -1.9, HEADER_FROM_DIFFERENT_DOMAINS 0.25, RCVD_IN_DNSWL_HI -5, T_RP_MATCHES_RCVD -0.01, LANGUAGES unknown, BAYES_USED global, SA_VERSION 3.4.0 X-Spam-source: IP='209.132.180.67', Host='vger.kernel.org', Country='US', FromHeader='org', MailFrom='org' X-Spam-charsets: X-Resolved-to: greg@kroah.com X-Delivered-to: greg@kroah.com X-Mail-from: linux-usb-owner@vger.kernel.org ARC-Seal: i=1; a=rsa-sha256; cv=none; d=messagingengine.com; s=arctest; t=1516220823; b=CtnAlOAcGy4NBCWUvupDMUSEKG+v8ezKGoJaG3Zj3jd5HTQ Aut6eK8hOOnAgZXVi1TtsqKV7OyW+pPZte56H5+m2PMCgf8NXUq93NwrwjxgTfkt TJ7vMtx/t6B8PVfdPHXSm3unKRGJyHdAmwnbKSNq4nFnRK+eD3CsJN9+JHSZysy/ 1JyWjq1vYjA3iLIn1/U8ktfMLHNZ+pLtDNdoriFvNUL3opxhxl4xkOS8HoOcjW7C D5qxASl0U5Flq8tTVt/yDoDWEWPXZ1n4zkWdbYubmiO4D7443x9GvebYPH1VoWts f1ZnJXnig0ZFsgb9EiVYisR6tfYGbnVAMAixx4w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=from:to:cc:subject:date:message-id :in-reply-to:references:sender:list-id; s=arctest; t=1516220823; bh=9DBcvXi/+wbhs/Oh7rmWc9+q32M51lh7u29F9qCJxN8=; b=rJ6ZQtPqx++n a+gmr8+yh99ctg628qf4B4CYeXoclZQPZVebxO8M9/DL5XhrcwrZnAOpT3kD8ckv x/dyEqiDSavGgDqtYBydpoDGkGft6uQl0frKut2UudIn4FqhIy2plnf4Pa05qxja bZAGePuQfvC2DSBsaooWu4p7cIlQsw0kIq4nP4bJJ7/YfsoZzyMGdkIYUhdfY+Uf vGiWTQd39XiDE8yYNAKpSqOIANFC75UGFdMfpmEnqvBsJ/zKKEBP/6NZgDB32Zaz aPk99faBYgmaLzNNEzn3M0wU7Tk835brL8xObiGfuSYaqmVZKhw7BkX63OXNKBWM z1cHVkOS7Q== ARC-Authentication-Results: i=1; mx2.messagingengine.com; arc=none (no signatures found); dkim=fail (message has been altered; 2048-bit rsa key sha256) header.d=infradead.org header.i=@infradead.org header.b=efn8fvAU x-bits=2048 x-keytype=rsa x-algorithm=sha256 x-selector=bombadil.20170209; dmarc=none (p=none,has-list-id=yes,d=none) header.from=infradead.org; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=linux-usb-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=infradead.org header.result=pass header_is_org_domain=yes Authentication-Results: mx2.messagingengine.com; arc=none (no signatures found); dkim=fail (message has been altered; 2048-bit rsa key sha256) header.d=infradead.org header.i=@infradead.org header.b=efn8fvAU x-bits=2048 x-keytype=rsa x-algorithm=sha256 x-selector=bombadil.20170209; dmarc=none (p=none,has-list-id=yes,d=none) header.from=infradead.org; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=linux-usb-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=infradead.org header.result=pass header_is_org_domain=yes Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754519AbeAQU06 (ORCPT ); Wed, 17 Jan 2018 15:26:58 -0500 Received: from bombadil.infradead.org ([65.50.211.133]:40135 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753128AbeAQUXG (ORCPT ); Wed, 17 Jan 2018 15:23:06 -0500 From: Matthew Wilcox To: linux-kernel@vger.kernel.org Cc: Matthew Wilcox , linux-mm@kvack.org, linux-fsdevel@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net, linux-nilfs@vger.kernel.org, linux-btrfs@vger.kernel.org, linux-xfs@vger.kernel.org, linux-usb@vger.kernel.org, Bjorn Andersson , Stefano Stabellini , iommu@lists.linux-foundation.org, linux-remoteproc@vger.kernel.org, linux-s390@vger.kernel.org, intel-gfx@lists.freedesktop.org, cgroups@vger.kernel.org, linux-sh@vger.kernel.org, David Howells Subject: [PATCH v6 94/99] f2fs: Convert extent_tree_root to XArray Date: Wed, 17 Jan 2018 12:21:58 -0800 Message-Id: <20180117202203.19756-95-willy@infradead.org> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180117202203.19756-1-willy@infradead.org> References: <20180117202203.19756-1-willy@infradead.org> Sender: linux-usb-owner@vger.kernel.org X-Mailing-List: linux-usb@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-Mailing-List: linux-kernel@vger.kernel.org List-ID: From: Matthew Wilcox Rename it to extent_array and use the xa_lock in place of the extent_tree_lock mutex. Signed-off-by: Matthew Wilcox --- fs/f2fs/extent_cache.c | 59 +++++++++++++++++++++++++------------------------- fs/f2fs/f2fs.h | 3 +-- 2 files changed, 30 insertions(+), 32 deletions(-) diff --git a/fs/f2fs/extent_cache.c b/fs/f2fs/extent_cache.c index ff2352a0ed15..da5f3bd1808d 100644 --- a/fs/f2fs/extent_cache.c +++ b/fs/f2fs/extent_cache.c @@ -250,25 +250,25 @@ static struct extent_tree *__grab_extent_tree(struct inode *inode) struct extent_tree *et; nid_t ino = inode->i_ino; - mutex_lock(&sbi->extent_tree_lock); - et = radix_tree_lookup(&sbi->extent_tree_root, ino); - if (!et) { - et = f2fs_kmem_cache_alloc(extent_tree_slab, GFP_NOFS); - f2fs_radix_tree_insert(&sbi->extent_tree_root, ino, et); - memset(et, 0, sizeof(struct extent_tree)); - et->ino = ino; - et->root = RB_ROOT; - et->cached_en = NULL; - rwlock_init(&et->lock); - INIT_LIST_HEAD(&et->list); - atomic_set(&et->node_cnt, 0); - atomic_inc(&sbi->total_ext_tree); - } else { + et = xa_load(&sbi->extent_array, ino); + if (et) { atomic_dec(&sbi->total_zombie_tree); list_del_init(&et->list); + goto out; } - mutex_unlock(&sbi->extent_tree_lock); + et = f2fs_kmem_cache_alloc(extent_tree_slab, GFP_NOFS | __GFP_ZERO); + et->ino = ino; + et->root = RB_ROOT; + et->cached_en = NULL; + rwlock_init(&et->lock); + INIT_LIST_HEAD(&et->list); + atomic_set(&et->node_cnt, 0); + + xa_store(&sbi->extent_array, ino, et, GFP_NOFS); + atomic_inc(&sbi->total_ext_tree); + +out: /* never died until evict_inode */ F2FS_I(inode)->extent_tree = et; @@ -622,7 +622,7 @@ unsigned int f2fs_shrink_extent_tree(struct f2fs_sb_info *sbi, int nr_shrink) if (!atomic_read(&sbi->total_zombie_tree)) goto free_node; - if (!mutex_trylock(&sbi->extent_tree_lock)) + if (!xa_trylock(&sbi->extent_array)) goto out; /* 1. remove unreferenced extent tree */ @@ -634,7 +634,7 @@ unsigned int f2fs_shrink_extent_tree(struct f2fs_sb_info *sbi, int nr_shrink) } f2fs_bug_on(sbi, atomic_read(&et->node_cnt)); list_del_init(&et->list); - radix_tree_delete(&sbi->extent_tree_root, et->ino); + xa_erase(&sbi->extent_array, et->ino); kmem_cache_free(extent_tree_slab, et); atomic_dec(&sbi->total_ext_tree); atomic_dec(&sbi->total_zombie_tree); @@ -642,13 +642,13 @@ unsigned int f2fs_shrink_extent_tree(struct f2fs_sb_info *sbi, int nr_shrink) if (node_cnt + tree_cnt >= nr_shrink) goto unlock_out; - cond_resched(); + cond_resched_lock(&sbi->extent_array.xa_lock); } - mutex_unlock(&sbi->extent_tree_lock); + xa_unlock(&sbi->extent_array); free_node: /* 2. remove LRU extent entries */ - if (!mutex_trylock(&sbi->extent_tree_lock)) + if (!xa_trylock(&sbi->extent_array)) goto out; remained = nr_shrink - (node_cnt + tree_cnt); @@ -678,7 +678,7 @@ unsigned int f2fs_shrink_extent_tree(struct f2fs_sb_info *sbi, int nr_shrink) spin_unlock(&sbi->extent_lock); unlock_out: - mutex_unlock(&sbi->extent_tree_lock); + xa_unlock(&sbi->extent_array); out: trace_f2fs_shrink_extent_tree(sbi, node_cnt, tree_cnt); @@ -725,23 +725,23 @@ void f2fs_destroy_extent_tree(struct inode *inode) if (inode->i_nlink && !is_bad_inode(inode) && atomic_read(&et->node_cnt)) { - mutex_lock(&sbi->extent_tree_lock); + xa_lock(&sbi->extent_array); list_add_tail(&et->list, &sbi->zombie_list); atomic_inc(&sbi->total_zombie_tree); - mutex_unlock(&sbi->extent_tree_lock); + xa_unlock(&sbi->extent_array); return; } /* free all extent info belong to this extent tree */ node_cnt = f2fs_destroy_extent_node(inode); - /* delete extent tree entry in radix tree */ - mutex_lock(&sbi->extent_tree_lock); + /* delete extent from array */ + xa_lock(&sbi->extent_array); f2fs_bug_on(sbi, atomic_read(&et->node_cnt)); - radix_tree_delete(&sbi->extent_tree_root, inode->i_ino); - kmem_cache_free(extent_tree_slab, et); + __xa_erase(&sbi->extent_array, inode->i_ino); atomic_dec(&sbi->total_ext_tree); - mutex_unlock(&sbi->extent_tree_lock); + xa_unlock(&sbi->extent_array); + kmem_cache_free(extent_tree_slab, et); F2FS_I(inode)->extent_tree = NULL; @@ -787,8 +787,7 @@ void f2fs_update_extent_cache_range(struct dnode_of_data *dn, void init_extent_cache_info(struct f2fs_sb_info *sbi) { - INIT_RADIX_TREE(&sbi->extent_tree_root, GFP_NOIO); - mutex_init(&sbi->extent_tree_lock); + xa_init(&sbi->extent_array); INIT_LIST_HEAD(&sbi->extent_list); spin_lock_init(&sbi->extent_lock); atomic_set(&sbi->total_ext_tree, 0); diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h index b3ee784b49bc..4eacef9c7274 100644 --- a/fs/f2fs/f2fs.h +++ b/fs/f2fs/f2fs.h @@ -1064,8 +1064,7 @@ struct f2fs_sb_info { spinlock_t inode_lock[NR_INODE_TYPE]; /* for dirty inode list lock */ /* for extent tree cache */ - struct radix_tree_root extent_tree_root;/* cache extent cache entries */ - struct mutex extent_tree_lock; /* locking extent radix tree */ + struct xarray extent_array; /* cache extent cache entries */ struct list_head extent_list; /* lru list for shrinker */ spinlock_t extent_lock; /* locking extent lru list */ atomic_t total_ext_tree; /* extent tree count */ -- 2.15.1