From mboxrd@z Thu Jan 1 00:00:00 1970 From: Matthew Wilcox Subject: [PATCH v11 19/63] page cache: Convert page deletion to XArray Date: Sat, 14 Apr 2018 07:12:32 -0700 Message-ID: <20180414141316.7167-20-willy@infradead.org> References: <20180414141316.7167-1-willy@infradead.org> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; 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=EndsXejdWeXMX8YNPCjPfPzKa1hf7IqrTYdXNWFGzgs=; b=kHqzzGTksoCeM3RDmawU++mhzw fevBfvKtCcXfFrs7iTL7All0qDLcj63PTUp/+VgN8qMp1IwYXeg9Vje2Twg6sRFRUD3IwISHWkdCl OqZ+MIWdejojquBcBRsQZ9RXa038s6IzIva2OFOr4Qgtrpbd7pI6I7bK250DCcC6fPHM=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; 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=EndsXejdWeXMX8YNPCjPfPzKa1hf7IqrTYdXNWFGzgs=; b=T3l4l9FFUUoN0kIT9/B4/lLLMV 1xAnDOlqwS01FnqAEW+wk9U7Nk6Tbins9GHU0j004vhAyr105D5V+/DM2JPQdboxLY8SSRAd+Qm/A 2aKVFrH+jJST1XUQ48KIpfiAPpmlbdGzPJmWmQtFNQZMUTyhvC3dJAZ4C8lU54K5wzlY=; 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=EndsXejdWeXMX8YNPCjPfPzKa1hf7IqrTYdXNWFGzgs=; b=GsQ1dwLCeMWS8yejE3688dkSK ct4gHN+CMJAAevpRbpCcd5e3c0JssVcIm1tDnw6EYukymIjkRzEi6DtXv/typhUxekaY3btgqSQn+ tjqn7u7UG6LD6mO60HicAEzMIgTgVp/uLyW4mmfZpdbuSH76NO64gYV3XWA1Cbh4Z9tUahFmfHhaW caa+jDoaQeYc0nr3SQy9I5tYIinRcNtM0yoS9jiB6bpiXSqNZkvW+VJfn8W9AH8/iseMbbJswHVaP bgq2bK/1RiuIHtg+GeeapO22ug35pK3YQtASLXxQb4pYZy8bgp20mZcLZZ9wIyaoNLnu24vAHtP7g 1Ei3UxBMA==; In-Reply-To: <20180414141316.7167-1-willy@infradead.org> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: linux-f2fs-devel-bounces@lists.sourceforge.net To: linux-mm@kvack.org, linux-fsdevel@vger.kernel.org Cc: linux-nilfs@vger.kernel.org, Jan Kara , Jeff Layton , Matthew Wilcox , James Simmons , Jaegeuk Kim , Andreas Dilger , Nicholas Piggin , linux-f2fs-devel@lists.sourceforge.net, Oleg Drokin , Ryusuke Konishi , Lukas Czerner , Ross Zwisler , Christoph Hellwig , Goldwyn Rodrigues , Mike Kravetz From: Matthew Wilcox The code is slightly shorter and simpler. Signed-off-by: Matthew Wilcox --- mm/filemap.c | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/mm/filemap.c b/mm/filemap.c index 070b5e4527ac..4af06a1a9818 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -111,30 +111,28 @@ * ->tasklist_lock (memory_failure, collect_procs_ao) */ -static void page_cache_tree_delete(struct address_space *mapping, +static void page_cache_delete(struct address_space *mapping, struct page *page, void *shadow) { - int i, nr; + XA_STATE(xas, &mapping->i_pages, page->index); + unsigned int i, nr; - /* hugetlb pages are represented by one entry in the radix tree */ + mapping_set_update(&xas, mapping); + + /* hugetlb pages are represented by a single entry in the xarray */ nr = PageHuge(page) ? 1 : hpage_nr_pages(page); VM_BUG_ON_PAGE(!PageLocked(page), page); VM_BUG_ON_PAGE(PageTail(page), page); VM_BUG_ON_PAGE(nr != 1 && shadow, page); - for (i = 0; i < nr; i++) { - struct radix_tree_node *node; - void **slot; - - __radix_tree_lookup(&mapping->i_pages, page->index + i, - &node, &slot); - - VM_BUG_ON_PAGE(!node && nr != 1, page); - - radix_tree_clear_tags(&mapping->i_pages, node, slot); - __radix_tree_replace(&mapping->i_pages, node, slot, shadow, - workingset_lookup_update(mapping)); + i = nr; +repeat: + xas_store(&xas, shadow); + xas_init_tags(&xas); + if (--i) { + xas_next(&xas); + goto repeat; } page->mapping = NULL; @@ -234,7 +232,7 @@ void __delete_from_page_cache(struct page *page, void *shadow) trace_mm_filemap_delete_from_page_cache(page); unaccount_page_cache_page(mapping, page); - page_cache_tree_delete(mapping, page, shadow); + page_cache_delete(mapping, page, shadow); } static void page_cache_free_page(struct address_space *mapping, -- 2.17.0 ------------------------------------------------------------------------------ Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot