From mboxrd@z Thu Jan 1 00:00:00 1970 From: Matthew Wilcox Subject: [PATCH v4 47/73] shmem: Convert shmem_alloc_hugepage to XArray Date: Tue, 5 Dec 2017 16:41:33 -0800 Message-ID: <20171206004159.3755-48-willy@infradead.org> References: <20171206004159.3755-1-willy@infradead.org> Return-path: DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20170209; h=References:In-Reply-To:Message-Id: Date:Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=jOp0cAp7FRbgqcXsFrzqZhKLJclMKQAGJCZajBv/3OY=; b=tCknt83OEqsFXF7r3jzuxZV+I yc/omh+vOLx4MYNUQaKhivkCPf++zwKjjEkWOVRHOD/3fpBJU8+oIKw9AJTXgsTITwFz2i+74Aipg nP7tHzx2r/9mCv+yVJp5lX5FZ9vxSv8wt05773BiGlUPlOhKz6dm0jUyOCd5WIEhGwfETHwjvPZ8C b2AtWlSwaygeMvIUqXHuoNeHJ+ctF2zSqcs19zRcolTOi4FBPb1GxFQW9zLSdXNwS7Q80DxyHArez nUy1CKlIgN0/EEgPabRQdXL0cpncx2R2tF1FtgYe54ziiBZEeoZtK29d4PloEF9gsUVDF7nCOYU6d In-Reply-To: <20171206004159.3755-1-willy@infradead.org> Sender: linux-fsdevel-owner@vger.kernel.org List-ID: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: Cc: Matthew Wilcox , Ross Zwisler , Jens Axboe , Rehas Sachdeva , 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, linux-kernel@vger.kernel.org From: Matthew Wilcox xa_find() is a slightly easier API to use than radix_tree_gang_lookup_slot() because it contains its own RCU locking. Signed-off-by: Matthew Wilcox --- mm/shmem.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/mm/shmem.c b/mm/shmem.c index 54fbfc2c6c09..768d470a03da 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -1413,23 +1413,16 @@ static struct page *shmem_alloc_hugepage(gfp_t gfp, struct shmem_inode_info *info, pgoff_t index) { struct vm_area_struct pvma; - struct inode *inode = &info->vfs_inode; - struct address_space *mapping = inode->i_mapping; - pgoff_t idx, hindex; - void __rcu **results; + struct address_space *mapping = info->vfs_inode.i_mapping; + pgoff_t hindex; struct page *page; if (!IS_ENABLED(CONFIG_TRANSPARENT_HUGE_PAGECACHE)) return NULL; hindex = round_down(index, HPAGE_PMD_NR); - rcu_read_lock(); - if (radix_tree_gang_lookup_slot(&mapping->pages, &results, &idx, - hindex, 1) && idx < hindex + HPAGE_PMD_NR) { - rcu_read_unlock(); + if (xa_find(&mapping->pages, &hindex, hindex + HPAGE_PMD_NR - 1)) return NULL; - } - rcu_read_unlock(); shmem_pseudo_vma_init(&pvma, info, hindex); page = alloc_pages_vma(gfp | __GFP_COMP | __GFP_NORETRY | __GFP_NOWARN, -- 2.15.0