From patchwork Mon Jun 11 14:06:07 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Wilcox X-Patchwork-Id: 10457949 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 A1F69601A0 for ; Mon, 11 Jun 2018 14:09:27 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8EB572835B for ; Mon, 11 Jun 2018 14:09:27 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8321428471; Mon, 11 Jun 2018 14:09:27 +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 E47352835B for ; Mon, 11 Jun 2018 14:09:26 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 504136B0285; Mon, 11 Jun 2018 10:07:00 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 4B7406B0289; Mon, 11 Jun 2018 10:07:00 -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 1F1BE6B028A; Mon, 11 Jun 2018 10:07:00 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pg0-f69.google.com (mail-pg0-f69.google.com [74.125.83.69]) by kanga.kvack.org (Postfix) with ESMTP id CF83D6B0285 for ; Mon, 11 Jun 2018 10:06:59 -0400 (EDT) Received: by mail-pg0-f69.google.com with SMTP id w1-v6so6595147pgr.7 for ; Mon, 11 Jun 2018 07:06:59 -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=tRkUpxAn62xizVV0HSxWSbxkMPT1z8gWqMUFuTsxcsc=; b=PmOdXqfjaX2UznZBBuMDBi9FR0XVLEF/VBcNmVT0oC8fnNcMBdQSYJcoGJLDEqBS1A jKxgGRIpIVxoZYyClophFBmYSGx5l1tXijm8S91P4XMrJQmr/hkN+xTIgzkuE8znbdNM j+kyzV5ryV5Zn9GCnkxFFRk8L9zb0c8Grj3DD7tlOZF8gtyERoeH46/0G5S0T1gVL1vd U5QqODO3jLA6i4p5R9RryGqJW1iDc47R34lwVuCEMqFVopEqLaiPkPSFzjYqwjJZrp5N rz2aTRcNuGH1B8p5oIZH9j1fy6FSAHiJFn2yFu0JrxzgszAgB28YdvgoKp7N8woEyFZm ou8g== X-Gm-Message-State: APt69E0ienflZ0Ggb3IBaDzWqfW0nGvJ9px8NrHA1b/xCEFh81yZQgiu VA25wtdUorjdFIfxOii+ekGaFkd6vdBaczFa1bGuQb8BQvjFlWgEjF+WfHfd1VnkdC9gif49gf4 dpZb+bJ1q9oUrsvFoRgyiRJ2vDZq90J3JCro0DnGKQgcZHjaapw5GNsFkIZ4RqQMt1A== X-Received: by 2002:a65:418b:: with SMTP id a11-v6mr14947886pgq.118.1528726019526; Mon, 11 Jun 2018 07:06:59 -0700 (PDT) X-Google-Smtp-Source: ADUXVKI8P9g3sccVNo0f6hFI8P/MDRo/HylffRtH2Y1N3F2Xb5RzKomISUNlyuiHp/MGZCo18NSm X-Received: by 2002:a65:418b:: with SMTP id a11-v6mr14947830pgq.118.1528726018432; Mon, 11 Jun 2018 07:06:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1528726018; cv=none; d=google.com; s=arc-20160816; b=Cgc1w7SW2X1VzhOg+Yw+Zv+yPAXQB0Vd+VuyCcf0/B1PxYK2yi33F0sQiQYgD7eGrt q7lTmtx2jYvUvJUXSAE5+7lxMs1yqqK0JoPwtUXCQPfJyeOeqmD6uVIQJ121AmIXNjSk yKY10AypCEb86+fOie1qyw49Bk7v4rMrdIUGFjQhoC1ByiMgoe6QK2FE/STj5nE6m3gB JG/UwUwQDn8VrYWRP7+XBsotHg9NUfAQWOEJfHkY0MEl0Kukc++EqwQj/JIBgrjqQUK0 F9NGp7AJJXO/84zAY3te8gZiu3MKEEER79HtxWym6GO3Q8LJDsu10y8pXGnOZKASlY9B 18Qg== 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=tRkUpxAn62xizVV0HSxWSbxkMPT1z8gWqMUFuTsxcsc=; b=FwbFGyMpJCxUJYzdiOfLj4LqDqqP4XaDshF8lAMZJQJTOMlYWK+xGy8vCLGNH9x5LA Ct1hkK/pADVjxZVxAwy9A5UputoKsUfbNxuNLfs2u++lg1tTd5Cvwqz4mhMb6WHLIqEd qb5r2CzydEM5ufA+57NXlJ2qnRo5JZXfqKS+NGYbnFcbrcgdZvrk1TCx0CT6wU8hiCJk KE12Az+DM76CwC8NUhawsAx8zkJ5A3Y0J7nmt1OKM2MyxXq0Lx8xdl+swYip8QST/01c /0O50fRIqPvCgPM3r59P75hHE6pkYRRSODyFvmp2Ju1+s83V7WajpJ8+WtNV0voXC5V+ xFsQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20170209 header.b=slhmQnhK; 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 w61-v6si34491518plb.502.2018.06.11.07.06.58 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 11 Jun 2018 07:06:58 -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=slhmQnhK; 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=tRkUpxAn62xizVV0HSxWSbxkMPT1z8gWqMUFuTsxcsc=; b=slhmQnhKTfd7N3lynlfciaSsL eqe2DFon/BnpvAJqaWiliZDDsKMWrgv+TWZNbCDwmu2T7GvTWPxH3EVeNuailEhKAlATYSwO0EsOA icPDKHd5nYiy2Ba1g65++2970YuUw46dwfnU/pN6RqYAGUXJheRcSLGP6rJTC/6MsSN7ZgLqXwhok aFDJzQSaGcCjYA/RBiWp66QZDI9Oywf/nqNCV5C7reLJLwBBVR1vnc+UvficMEg7g1gsU3ha0WeQ0 djI0VQzIIOMK0H4SJ/dgAghXGBusF+56TSIx+rQ+HYYWgS4II4MCUi8YzagpOkOxbml0EtQZ7Owmo 4KGbfoYVA==; Received: from willy by bombadil.infradead.org with local (Exim 4.90_1 #2 (Red Hat Linux)) id 1fSNTF-0004ml-Kj; Mon, 11 Jun 2018 14:06:57 +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 v13 40/72] mm: Convert page migration to XArray Date: Mon, 11 Jun 2018 07:06:07 -0700 Message-Id: <20180611140639.17215-41-willy@infradead.org> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180611140639.17215-1-willy@infradead.org> References: <20180611140639.17215-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 From: Matthew Wilcox Signed-off-by: Matthew Wilcox --- mm/migrate.c | 48 ++++++++++++++++++------------------------------ 1 file changed, 18 insertions(+), 30 deletions(-) diff --git a/mm/migrate.c b/mm/migrate.c index 8c0af0f7cab1..80dc5b8c9738 100644 --- a/mm/migrate.c +++ b/mm/migrate.c @@ -323,7 +323,7 @@ void __migration_entry_wait(struct mm_struct *mm, pte_t *ptep, page = migration_entry_to_page(entry); /* - * Once radix-tree replacement of page migration started, page_count + * Once page cache replacement of page migration started, page_count * *must* be zero. And, we don't want to call wait_on_page_locked() * against a page without get_page(). * So, we use get_page_unless_zero(), here. Even failed, page fault @@ -438,10 +438,10 @@ int migrate_page_move_mapping(struct address_space *mapping, struct buffer_head *head, enum migrate_mode mode, int extra_count) { + XA_STATE(xas, &mapping->i_pages, page_index(page)); struct zone *oldzone, *newzone; int dirty; int expected_count = 1 + extra_count; - void **pslot; /* * Device public or private pages have an extra refcount as they are @@ -467,21 +467,16 @@ int migrate_page_move_mapping(struct address_space *mapping, oldzone = page_zone(page); newzone = page_zone(newpage); - xa_lock_irq(&mapping->i_pages); - - pslot = radix_tree_lookup_slot(&mapping->i_pages, - page_index(page)); + xas_lock_irq(&xas); expected_count += hpage_nr_pages(page) + page_has_private(page); - if (page_count(page) != expected_count || - radix_tree_deref_slot_protected(pslot, - &mapping->i_pages.xa_lock) != page) { - xa_unlock_irq(&mapping->i_pages); + if (page_count(page) != expected_count || xas_load(&xas) != page) { + xas_unlock_irq(&xas); return -EAGAIN; } if (!page_ref_freeze(page, expected_count)) { - xa_unlock_irq(&mapping->i_pages); + xas_unlock_irq(&xas); return -EAGAIN; } @@ -495,7 +490,7 @@ int migrate_page_move_mapping(struct address_space *mapping, if (mode == MIGRATE_ASYNC && head && !buffer_migrate_lock_buffers(head, mode)) { page_ref_unfreeze(page, expected_count); - xa_unlock_irq(&mapping->i_pages); + xas_unlock_irq(&xas); return -EAGAIN; } @@ -523,16 +518,13 @@ int migrate_page_move_mapping(struct address_space *mapping, SetPageDirty(newpage); } - radix_tree_replace_slot(&mapping->i_pages, pslot, newpage); + xas_store(&xas, newpage); if (PageTransHuge(page)) { int i; - int index = page_index(page); for (i = 1; i < HPAGE_PMD_NR; i++) { - pslot = radix_tree_lookup_slot(&mapping->i_pages, - index + i); - radix_tree_replace_slot(&mapping->i_pages, pslot, - newpage + i); + xas_next(&xas); + xas_store(&xas, newpage + i); } } @@ -543,7 +535,7 @@ int migrate_page_move_mapping(struct address_space *mapping, */ page_ref_unfreeze(page, expected_count - hpage_nr_pages(page)); - xa_unlock(&mapping->i_pages); + xas_unlock(&xas); /* Leave irq disabled to prevent preemption while updating stats */ /* @@ -583,22 +575,18 @@ EXPORT_SYMBOL(migrate_page_move_mapping); int migrate_huge_page_move_mapping(struct address_space *mapping, struct page *newpage, struct page *page) { + XA_STATE(xas, &mapping->i_pages, page_index(page)); int expected_count; - void **pslot; - - xa_lock_irq(&mapping->i_pages); - - pslot = radix_tree_lookup_slot(&mapping->i_pages, page_index(page)); + xas_lock_irq(&xas); expected_count = 2 + page_has_private(page); - if (page_count(page) != expected_count || - radix_tree_deref_slot_protected(pslot, &mapping->i_pages.xa_lock) != page) { - xa_unlock_irq(&mapping->i_pages); + if (page_count(page) != expected_count || xas_load(&xas) != page) { + xas_unlock_irq(&xas); return -EAGAIN; } if (!page_ref_freeze(page, expected_count)) { - xa_unlock_irq(&mapping->i_pages); + xas_unlock_irq(&xas); return -EAGAIN; } @@ -607,11 +595,11 @@ int migrate_huge_page_move_mapping(struct address_space *mapping, get_page(newpage); - radix_tree_replace_slot(&mapping->i_pages, pslot, newpage); + xas_store(&xas, newpage); page_ref_unfreeze(page, expected_count - 1); - xa_unlock_irq(&mapping->i_pages); + xas_unlock_irq(&xas); return MIGRATEPAGE_SUCCESS; }