From patchwork Sun Jun 17 02:00:21 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Wilcox X-Patchwork-Id: 10468245 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 97A12600CC for ; Sun, 17 Jun 2018 02:02:24 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8721928BE2 for ; Sun, 17 Jun 2018 02:02:24 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7BFCC28BF4; Sun, 17 Jun 2018 02:02:24 +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=-2.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B0FAC28BE2 for ; Sun, 17 Jun 2018 02:02:23 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5F04E6B027A; Sat, 16 Jun 2018 22:01:09 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 54E4B6B027C; Sat, 16 Jun 2018 22:01:09 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 37DFD6B027A; Sat, 16 Jun 2018 22:01:09 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pf0-f199.google.com (mail-pf0-f199.google.com [209.85.192.199]) by kanga.kvack.org (Postfix) with ESMTP id D8A386B0279 for ; Sat, 16 Jun 2018 22:01:08 -0400 (EDT) Received: by mail-pf0-f199.google.com with SMTP id s7-v6so6683239pfm.4 for ; Sat, 16 Jun 2018 19:01:08 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:dkim-signature:from:to:cc:subject:date :message-id:in-reply-to:references; bh=EfWb78+lY/amxkkVC2MGGQorEW4wxVNB31XfpKnUteU=; b=o/p3YFz5d6XKHJiDqNtvb5KgR2Zwr1+HCJ/pkclehG8eFSDdR6VwDaXFKuYxVkzVjz r5yuT7/VfrCn5u/9Td3f81qaQC97AybX0/Ppr3jozadkOiyzVkguJvM6mxjzwXxEamYE kl0qA2jrdIcn3tPl1XN6QG9nnmvXzupkg513OLQPzPWqGdwyxQrTnq1F+4FMzk1jrw3R l4FeqejTtUd98NPDEt94NgRiWJv1BCjnFUwtCmA3qxsF1n07GkNgqydAKJQU1UZRSEJw Lm8f1dIAZHHO6AdAlkdMsj8tLEHKblrZMpPNWgHvQlttZGI1K6AdcfmxDGT2idmxjIjW YjFw== X-Gm-Message-State: APt69E0rAN+bHWVQvNhCqLq/nPTozsnBNeE5ff/yrMKtNctRrw6HV84o bn+hVTzeJM2L1Q3tae5AV4f+x/2SO9EiY+6NmFa6W/Vg/+QJ6iZb/7C6+Nrh5xKRDB0/Wdcu8Bz PVgkVgDktIoG7AZSJeQNJTxM8GFexkZ+Jt6TQOuMwuijNYD93M6rkDBZ7X26pbWikPA== X-Received: by 2002:a63:6f8a:: with SMTP id k132-v6mr6672855pgc.153.1529200868482; Sat, 16 Jun 2018 19:01:08 -0700 (PDT) X-Google-Smtp-Source: ADUXVKJWWXjKBn4MRUvAHCFlL+tuj+9qsZ306TkEE9H4nxY2tNi0FPq3W57GCwB9slFx2e0Scyka X-Received: by 2002:a63:6f8a:: with SMTP id k132-v6mr6672811pgc.153.1529200867208; Sat, 16 Jun 2018 19:01:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529200867; cv=none; d=google.com; s=arc-20160816; b=0Sv1Hg5nVnTkpGjZzVf2XaYJSFSXw03tBIy88ND5v0wRDxI2DkzMSOwt8ZlAJ+E0Zq OVJLXlNXm/aPRMsszDrj1jEA15SP1zCw6k+0cRt3OakocX31h9nhG9M7m4NZJvnej66C ap8Y34jRKnWITp3Uv+h3Nes5gOlUvajOdY4NTL82YQT0Z2X/2GEBvlPnGrspetHgKvYP Bi0OGYpPi4IadctAcK81HoCPIV3/QDNAGJ97ljFaKVtfN+fzVWluUOP7ruRxHrlTUB7m CNK/g8yCg5s2JaZbHr75C84C16UdSfXeqiQridsItNDpckAgwPDuaNOvZBSQ/m9goDGn kepg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:arc-authentication-results; bh=EfWb78+lY/amxkkVC2MGGQorEW4wxVNB31XfpKnUteU=; b=Kh/sWRfSyo/2e7vo7TbLJmSJFJ3tpJu5F4my1ESZC25uYhbt1/NakrZc+IL0TvdDDt y20pCVFyhVQBcKZRJ7qUAftUY2YRowz7Z10cNkECnBEn+ZAefLLoFhTpor8E5qO45VAE YrgklNsM7GTLZ25Oi21VSe7oKY3KHPOAiKv3yOyx6ZRwliGcjQ4LI5IDzm5wZZFTZznY mE2iQDwfevnCRu0SB8fWT8hexZJCYa6OIC7rss+kygc2NKJXaC0fidZtD+TlDXYO4gIu Mo4OWect0wFKgxYcfKUENVHT+7HlPYCKxorhcSE7b5pzpaOCA33cuABQgvV0pBee/ZP3 GIFQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20170209 header.b="tYei/KCa"; spf=pass (google.com: best guess record for domain of willy@infradead.org designates 2607:7c80:54:e::133 as permitted sender) smtp.mailfrom=willy@infradead.org Received: from bombadil.infradead.org (bombadil.infradead.org. [2607:7c80:54:e::133]) by mx.google.com with ESMTPS id w2-v6si11913395ply.395.2018.06.16.19.01.07 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 16 Jun 2018 19:01:07 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of willy@infradead.org designates 2607:7c80:54:e::133 as permitted sender) client-ip=2607:7c80:54:e::133; Authentication-Results: mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20170209 header.b="tYei/KCa"; spf=pass (google.com: best guess record for domain of willy@infradead.org designates 2607:7c80:54:e::133 as permitted sender) smtp.mailfrom=willy@infradead.org 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=EfWb78+lY/amxkkVC2MGGQorEW4wxVNB31XfpKnUteU=; b=tYei/KCarY7BjyZB9oVTi94E9 0821zJbbPF1Op8yjo8hoecO3vGYC6jc0MP+r1ZQtZkYRO1peUyq23QFAi1abubTbSng+jDHyMD+ZE unaNoWhuBwk42fJyjJrTU0k/RoSnwPIj5fcisdO/PNXKrfVy0/00NVTaAsHLUI3suVsG3TiXtOd+E B1ANz95PRq9juuRtypXNPxHFUSd/AFcQZN5A1ZQZvMAUHxgrYb6fAn+BzaiPtiHVCtMN+eyYYEFMg nqXUmmDF0aECRfOT1hiAfYe+5QpBj9HHuVVqEsa6Il8I3ZNoIvBW6+kCtmF4wirumue/5iC82svZQ nj7sDAnAQ==; Received: from willy by bombadil.infradead.org with local (Exim 4.90_1 #2 (Red Hat Linux)) id 1fUN06-0001Me-94; Sun, 17 Jun 2018 02:01:06 +0000 From: Matthew Wilcox To: linux-mm@kvack.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Matthew Wilcox , Jan Kara , Jeff Layton , Lukas Czerner , Ross Zwisler , Christoph Hellwig , Goldwyn Rodrigues , Nicholas Piggin , Ryusuke Konishi , linux-nilfs@vger.kernel.org, Jaegeuk Kim , Chao Yu , linux-f2fs-devel@lists.sourceforge.net Subject: [PATCH v14 43/74] mm: Convert collapse_shmem to XArray Date: Sat, 16 Jun 2018 19:00:21 -0700 Message-Id: <20180617020052.4759-44-willy@infradead.org> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180617020052.4759-1-willy@infradead.org> References: <20180617020052.4759-1-willy@infradead.org> X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: X-Virus-Scanned: ClamAV using ClamSMTP I found another victim of the radix tree being hard to use. Because there was no call to radix_tree_preload(), khugepaged was allocating radix_tree_nodes using GFP_ATOMIC. I also converted a local_irq_save()/restore() pair to disable()/enable(). Signed-off-by: Matthew Wilcox --- mm/khugepaged.c | 158 ++++++++++++++++++++---------------------------- 1 file changed, 65 insertions(+), 93 deletions(-) diff --git a/mm/khugepaged.c b/mm/khugepaged.c index d6992ba1f604..43598cc5998b 100644 --- a/mm/khugepaged.c +++ b/mm/khugepaged.c @@ -1287,17 +1287,17 @@ static void retract_page_tables(struct address_space *mapping, pgoff_t pgoff) * * Basic scheme is simple, details are more complex: * - allocate and freeze a new huge page; - * - scan over radix tree replacing old pages the new one + * - scan page cache replacing old pages with the new one * + swap in pages if necessary; * + fill in gaps; - * + keep old pages around in case if rollback is required; - * - if replacing succeed: + * + keep old pages around in case rollback is required; + * - if replacing succeeds: * + copy data over; * + free old pages; * + unfreeze huge page; * - if replacing failed; * + put all pages back and unfreeze them; - * + restore gaps in the radix-tree; + * + restore gaps in the page cache; * + free huge page; */ static void collapse_shmem(struct mm_struct *mm, @@ -1305,12 +1305,11 @@ static void collapse_shmem(struct mm_struct *mm, struct page **hpage, int node) { gfp_t gfp; - struct page *page, *new_page, *tmp; + struct page *new_page; struct mem_cgroup *memcg; pgoff_t index, end = start + HPAGE_PMD_NR; LIST_HEAD(pagelist); - struct radix_tree_iter iter; - void **slot; + XA_STATE(xas, &mapping->i_pages, start); int nr_none = 0, result = SCAN_SUCCEED; VM_BUG_ON(start & (HPAGE_PMD_NR - 1)); @@ -1335,48 +1334,48 @@ static void collapse_shmem(struct mm_struct *mm, __SetPageLocked(new_page); BUG_ON(!page_ref_freeze(new_page, 1)); - /* - * At this point the new_page is 'frozen' (page_count() is zero), locked - * and not up-to-date. It's safe to insert it into radix tree, because - * nobody would be able to map it or use it in other way until we - * unfreeze it. + * At this point the new_page is 'frozen' (page_count() is zero), + * locked and not up-to-date. It's safe to insert it into the page + * cache, because nobody would be able to map it or use it in other + * way until we unfreeze it. */ - index = start; - xa_lock_irq(&mapping->i_pages); - radix_tree_for_each_slot(slot, &mapping->i_pages, &iter, start) { - int n = min(iter.index, end) - index; - - /* - * Handle holes in the radix tree: charge it from shmem and - * insert relevant subpage of new_page into the radix-tree. - */ - if (n && !shmem_charge(mapping->host, n)) { - result = SCAN_FAIL; + /* This will be less messy when we use multi-index entries */ + do { + xas_lock_irq(&xas); + xas_create_range(&xas, end - 1); + if (!xas_error(&xas)) break; - } - nr_none += n; - for (; index < min(iter.index, end); index++) { - radix_tree_insert(&mapping->i_pages, index, - new_page + (index % HPAGE_PMD_NR)); - } + xas_unlock_irq(&xas); + if (!xas_nomem(&xas, GFP_KERNEL)) + goto out; + } while (1); - /* We are done. */ - if (index >= end) - break; + for (index = start; index < end; index++) { + struct page *page = xas_next(&xas); + + VM_BUG_ON(index != xas.xa_index); + if (!page) { + if (!shmem_charge(mapping->host, 1)) { + result = SCAN_FAIL; + break; + } + xas_store(&xas, new_page + (index % HPAGE_PMD_NR)); + nr_none++; + continue; + } - page = radix_tree_deref_slot_protected(slot, - &mapping->i_pages.xa_lock); if (xa_is_value(page) || !PageUptodate(page)) { - xa_unlock_irq(&mapping->i_pages); + xas_unlock_irq(&xas); /* swap in or instantiate fallocated page */ if (shmem_getpage(mapping->host, index, &page, SGP_NOHUGE)) { result = SCAN_FAIL; - goto tree_unlocked; + goto xa_unlocked; } - xa_lock_irq(&mapping->i_pages); + xas_lock_irq(&xas); + xas_set(&xas, index); } else if (trylock_page(page)) { get_page(page); } else { @@ -1396,7 +1395,7 @@ static void collapse_shmem(struct mm_struct *mm, result = SCAN_TRUNCATED; goto out_unlock; } - xa_unlock_irq(&mapping->i_pages); + xas_unlock_irq(&xas); if (isolate_lru_page(page)) { result = SCAN_DEL_PAGE_LRU; @@ -1406,17 +1405,16 @@ static void collapse_shmem(struct mm_struct *mm, if (page_mapped(page)) unmap_mapping_pages(mapping, index, 1, false); - xa_lock_irq(&mapping->i_pages); + xas_lock(&xas); + xas_set(&xas, index); - slot = radix_tree_lookup_slot(&mapping->i_pages, index); - VM_BUG_ON_PAGE(page != radix_tree_deref_slot_protected(slot, - &mapping->i_pages.xa_lock), page); + VM_BUG_ON_PAGE(page != xas_load(&xas), page); VM_BUG_ON_PAGE(page_mapped(page), page); /* * The page is expected to have page_count() == 3: * - we hold a pin on it; - * - one reference from radix tree; + * - one reference from page cache; * - one from isolate_lru_page; */ if (!page_ref_freeze(page, 3)) { @@ -1431,56 +1429,30 @@ static void collapse_shmem(struct mm_struct *mm, list_add_tail(&page->lru, &pagelist); /* Finally, replace with the new page. */ - radix_tree_replace_slot(&mapping->i_pages, slot, - new_page + (index % HPAGE_PMD_NR)); - - slot = radix_tree_iter_resume(slot, &iter); - index++; + xas_store(&xas, new_page + (index % HPAGE_PMD_NR)); continue; out_lru: - xa_unlock_irq(&mapping->i_pages); + xas_unlock_irq(&xas); putback_lru_page(page); out_isolate_failed: unlock_page(page); put_page(page); - goto tree_unlocked; + goto xa_unlocked; out_unlock: unlock_page(page); put_page(page); break; } + xas_unlock_irq(&xas); - /* - * Handle hole in radix tree at the end of the range. - * This code only triggers if there's nothing in radix tree - * beyond 'end'. - */ - if (result == SCAN_SUCCEED && index < end) { - int n = end - index; - - if (!shmem_charge(mapping->host, n)) { - result = SCAN_FAIL; - goto tree_locked; - } - - for (; index < end; index++) { - radix_tree_insert(&mapping->i_pages, index, - new_page + (index % HPAGE_PMD_NR)); - } - nr_none += n; - } - -tree_locked: - xa_unlock_irq(&mapping->i_pages); -tree_unlocked: - +xa_unlocked: if (result == SCAN_SUCCEED) { - unsigned long flags; + struct page *page, *tmp; struct zone *zone = page_zone(new_page); /* - * Replacing old pages with new one has succeed, now we need to - * copy the content and free old pages. + * Replacing old pages with new one has succeeded, now we + * need to copy the content and free the old pages. */ list_for_each_entry_safe(page, tmp, &pagelist, lru) { copy_highpage(new_page + (page->index % HPAGE_PMD_NR), @@ -1494,16 +1466,16 @@ static void collapse_shmem(struct mm_struct *mm, put_page(page); } - local_irq_save(flags); + local_irq_disable(); __inc_node_page_state(new_page, NR_SHMEM_THPS); if (nr_none) { __mod_node_page_state(zone->zone_pgdat, NR_FILE_PAGES, nr_none); __mod_node_page_state(zone->zone_pgdat, NR_SHMEM, nr_none); } - local_irq_restore(flags); + local_irq_enable(); /* - * Remove pte page tables, so we can re-faulti + * Remove pte page tables, so we can re-fault * the page as huge. */ retract_page_tables(mapping, start); @@ -1518,37 +1490,37 @@ static void collapse_shmem(struct mm_struct *mm, *hpage = NULL; } else { - /* Something went wrong: rollback changes to the radix-tree */ + struct page *page; + /* Something went wrong: roll back page cache changes */ shmem_uncharge(mapping->host, nr_none); - xa_lock_irq(&mapping->i_pages); - radix_tree_for_each_slot(slot, &mapping->i_pages, &iter, start) { - if (iter.index >= end) - break; + xas_lock_irq(&xas); + xas_set(&xas, start); + xas_for_each(&xas, page, end - 1) { page = list_first_entry_or_null(&pagelist, struct page, lru); - if (!page || iter.index < page->index) { + if (!page || xas.xa_index < page->index) { if (!nr_none) break; nr_none--; /* Put holes back where they were */ - radix_tree_delete(&mapping->i_pages, iter.index); + xas_store(&xas, NULL); continue; } - VM_BUG_ON_PAGE(page->index != iter.index, page); + VM_BUG_ON_PAGE(page->index != xas.xa_index, page); /* Unfreeze the page. */ list_del(&page->lru); page_ref_unfreeze(page, 2); - radix_tree_replace_slot(&mapping->i_pages, slot, page); - slot = radix_tree_iter_resume(slot, &iter); - xa_unlock_irq(&mapping->i_pages); + xas_store(&xas, page); + xas_pause(&xas); + xas_unlock_irq(&xas); putback_lru_page(page); unlock_page(page); - xa_lock_irq(&mapping->i_pages); + xas_lock_irq(&xas); } VM_BUG_ON(nr_none); - xa_unlock_irq(&mapping->i_pages); + xas_unlock_irq(&xas); /* Unfreeze new_page, caller would take care about freeing it */ page_ref_unfreeze(new_page, 1);