From patchwork Mon Feb 19 19:45:23 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Wilcox X-Patchwork-Id: 10228713 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id ADB19602B7 for ; Mon, 19 Feb 2018 19:58:58 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A07DF28B80 for ; Mon, 19 Feb 2018 19:58:58 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 957F828B83; Mon, 19 Feb 2018 19:58:58 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0A53128B80 for ; Mon, 19 Feb 2018 19:58:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754014AbeBST5F (ORCPT ); Mon, 19 Feb 2018 14:57:05 -0500 Received: from bombadil.infradead.org ([198.137.202.133]:44734 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753707AbeBSTqR (ORCPT ); Mon, 19 Feb 2018 14:46:17 -0500 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=QfKFRXukDmgYx/TbG9YzW9GnWpGtqfdMvGxnrzGJMOI=; b=LBsrQFR7u3Z51DxJjaFj6oTkx R5Ka2dWmlSyoBu4uRkPjsE9AY6al7kQ6x81GFTwPeljyUmlzKwFhDnD0y61aT1FZiKZXUQ9wPExzK FiK6oU7feZ1l4Z0NqXID62P8QHu00rtIlPlS9J7mgR9uyJ9o8NdpEXA8A2ZdVAuUTIBzkk5KYuTq1 IEW9GLzcWH7GV+AsZ6AbeGuP7ALcGktIXEP6MN/BzXDjz1FjPArJKSn1zAczJovWzJ9jS0yCX1YJV /205RURxnDN1k33WpTPIxYx4UICU0gSdToSZNehzt+XNWJJ09OH9Glc9N/1mbbTiFBqORN128WzHw Lu0kJylWA==; Received: from willy by bombadil.infradead.org with local (Exim 4.89 #1 (Red Hat Linux)) id 1enrOB-0001oT-CH; Mon, 19 Feb 2018 19:46:15 +0000 From: Matthew Wilcox To: Andrew Morton Cc: Matthew Wilcox , linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-fsdevel@vger.kernel.org Subject: [PATCH v7 28/61] page cache: Convert page deletion to XArray Date: Mon, 19 Feb 2018 11:45:23 -0800 Message-Id: <20180219194556.6575-29-willy@infradead.org> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180219194556.6575-1-willy@infradead.org> References: <20180219194556.6575-1-willy@infradead.org> Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 fcfdc146591b..0223f8054e3a 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->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->pages, page->index + i, - &node, &slot); - - VM_BUG_ON_PAGE(!node && nr != 1, page); - - radix_tree_clear_tags(&mapping->pages, node, slot); - __radix_tree_replace(&mapping->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,