From: Matthew Wilcox <willy@infradead.org>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: Matthew Wilcox <mawilcox@microsoft.com>,
linux-kernel@vger.kernel.org, linux-mm@kvack.org,
linux-fsdevel@vger.kernel.org,
Ryusuke Konishi <konishi.ryusuke@lab.ntt.co.jp>,
linux-nilfs@vger.kernel.org, linux-btrfs@vger.kernel.org
Subject: [PATCH v8 37/63] mm: Convert add_to_swap_cache to XArray
Date: Tue, 6 Mar 2018 11:23:47 -0800 [thread overview]
Message-ID: <20180306192413.5499-38-willy@infradead.org> (raw)
In-Reply-To: <20180306192413.5499-1-willy@infradead.org>
From: Matthew Wilcox <mawilcox@microsoft.com>
Combine __add_to_swap_cache and add_to_swap_cache into one function
since there is no more need to preload.
Signed-off-by: Matthew Wilcox <mawilcox@microsoft.com>
---
mm/swap_state.c | 93 ++++++++++++++++++---------------------------------------
1 file changed, 29 insertions(+), 64 deletions(-)
diff --git a/mm/swap_state.c b/mm/swap_state.c
index b2ba3b1d4727..329736723d36 100644
--- a/mm/swap_state.c
+++ b/mm/swap_state.c
@@ -107,14 +107,15 @@ void show_swap_cache_info(void)
}
/*
- * __add_to_swap_cache resembles add_to_page_cache_locked on swapper_space,
+ * add_to_swap_cache resembles add_to_page_cache_locked on swapper_space,
* but sets SwapCache flag and private instead of mapping and index.
*/
-int __add_to_swap_cache(struct page *page, swp_entry_t entry)
+int add_to_swap_cache(struct page *page, swp_entry_t entry, gfp_t gfp)
{
- int error, i, nr = hpage_nr_pages(page);
- struct address_space *address_space;
+ struct address_space *address_space = swap_address_space(entry);
pgoff_t idx = swp_offset(entry);
+ XA_STATE(xas, &address_space->i_pages, idx);
+ unsigned long i, nr = 1UL << compound_order(page);
VM_BUG_ON_PAGE(!PageLocked(page), page);
VM_BUG_ON_PAGE(PageSwapCache(page), page);
@@ -123,50 +124,30 @@ int __add_to_swap_cache(struct page *page, swp_entry_t entry)
page_ref_add(page, nr);
SetPageSwapCache(page);
- address_space = swap_address_space(entry);
- xa_lock_irq(&address_space->i_pages);
- for (i = 0; i < nr; i++) {
- set_page_private(page + i, entry.val + i);
- error = radix_tree_insert(&address_space->i_pages,
- idx + i, page + i);
- if (unlikely(error))
- break;
- }
- if (likely(!error)) {
+ do {
+ xas_lock_irq(&xas);
+ xas_create_range(&xas, idx + nr - 1);
+ if (xas_error(&xas))
+ goto unlock;
+ for (i = 0; i < nr; i++) {
+ VM_BUG_ON_PAGE(xas.xa_index != idx + i, page);
+ set_page_private(page + i, entry.val + i);
+ xas_store(&xas, page + i);
+ xas_next(&xas);
+ }
address_space->nrpages += nr;
__mod_node_page_state(page_pgdat(page), NR_FILE_PAGES, nr);
ADD_CACHE_INFO(add_total, nr);
- } else {
- /*
- * Only the context which have set SWAP_HAS_CACHE flag
- * would call add_to_swap_cache().
- * So add_to_swap_cache() doesn't returns -EEXIST.
- */
- VM_BUG_ON(error == -EEXIST);
- set_page_private(page + i, 0UL);
- while (i--) {
- radix_tree_delete(&address_space->i_pages, idx + i);
- set_page_private(page + i, 0UL);
- }
- ClearPageSwapCache(page);
- page_ref_sub(page, nr);
- }
- xa_unlock_irq(&address_space->i_pages);
+unlock:
+ xas_unlock_irq(&xas);
+ } while (xas_nomem(&xas, gfp));
- return error;
-}
-
-
-int add_to_swap_cache(struct page *page, swp_entry_t entry, gfp_t gfp_mask)
-{
- int error;
+ if (!xas_error(&xas))
+ return 0;
- error = radix_tree_maybe_preload_order(gfp_mask, compound_order(page));
- if (!error) {
- error = __add_to_swap_cache(page, entry);
- radix_tree_preload_end();
- }
- return error;
+ ClearPageSwapCache(page);
+ page_ref_sub(page, nr);
+ return xas_error(&xas);
}
/*
@@ -220,7 +201,7 @@ int add_to_swap(struct page *page)
goto fail;
/*
- * Radix-tree node allocations from PF_MEMALLOC contexts could
+ * XArray node allocations from PF_MEMALLOC contexts could
* completely exhaust the page allocator. __GFP_NOMEMALLOC
* stops emergency reserves from being allocated.
*
@@ -232,7 +213,6 @@ int add_to_swap(struct page *page)
*/
err = add_to_swap_cache(page, entry,
__GFP_HIGH|__GFP_NOMEMALLOC|__GFP_NOWARN);
- /* -ENOMEM radix-tree allocation failure */
if (err)
/*
* add_to_swap_cache() doesn't return -EEXIST, so we can safely
@@ -421,19 +401,11 @@ struct page *__read_swap_cache_async(swp_entry_t entry, gfp_t gfp_mask,
break; /* Out of memory */
}
- /*
- * call radix_tree_preload() while we can wait.
- */
- err = radix_tree_maybe_preload(gfp_mask & GFP_KERNEL);
- if (err)
- break;
-
/*
* Swap entry may have been freed since our caller observed it.
*/
err = swapcache_prepare(entry);
if (err == -EEXIST) {
- radix_tree_preload_end();
/*
* We might race against get_swap_page() and stumble
* across a SWAP_HAS_CACHE swap_map entry whose page
@@ -441,26 +413,19 @@ struct page *__read_swap_cache_async(swp_entry_t entry, gfp_t gfp_mask,
*/
cond_resched();
continue;
- }
- if (err) { /* swp entry is obsolete ? */
- radix_tree_preload_end();
+ } else if (err) /* swp entry is obsolete ? */
break;
- }
- /* May fail (-ENOMEM) if radix-tree node allocation failed. */
+ /* May fail (-ENOMEM) if XArray node allocation failed. */
__SetPageLocked(new_page);
__SetPageSwapBacked(new_page);
- err = __add_to_swap_cache(new_page, entry);
+ err = add_to_swap_cache(new_page, entry, gfp_mask & GFP_KERNEL);
if (likely(!err)) {
- radix_tree_preload_end();
- /*
- * Initiate read into locked page and return.
- */
+ /* Initiate read into locked page */
lru_cache_add_anon(new_page);
*new_page_allocated = true;
return new_page;
}
- radix_tree_preload_end();
__ClearPageLocked(new_page);
/*
* add_to_swap_cache() doesn't return -EEXIST, so we can safely
--
2.16.1
next prev parent reply other threads:[~2018-03-06 19:36 UTC|newest]
Thread overview: 66+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-06 19:23 [PATCH v8 00/63] XArray v8 Matthew Wilcox
2018-03-06 19:23 ` [PATCH v8 01/63] mac80211_hwsim: Use DEFINE_IDA Matthew Wilcox
2018-03-06 19:23 ` [PATCH v8 02/63] radix tree: Use GFP_ZONEMASK bits of gfp_t for flags Matthew Wilcox
2018-03-06 19:23 ` [PATCH v8 03/63] arm64: Turn flush_dcache_mmap_lock into a no-op Matthew Wilcox
2018-03-06 19:23 ` [PATCH v8 04/63] unicore32: " Matthew Wilcox
2018-03-06 19:23 ` [PATCH v8 05/63] Export __set_page_dirty Matthew Wilcox
2018-03-06 19:23 ` [PATCH v8 06/63] btrfs: Use filemap_range_has_page() Matthew Wilcox
2018-03-07 14:17 ` David Sterba
2018-03-06 19:23 ` [PATCH v8 07/63] xfs: Rename xa_ elements to ail_ Matthew Wilcox
2018-03-06 19:23 ` [PATCH v8 08/63] fscache: Use appropriate radix tree accessors Matthew Wilcox
2018-03-06 19:23 ` [PATCH v8 09/63] xarray: Add the xa_lock to the radix_tree_root Matthew Wilcox
2018-03-06 19:23 ` [PATCH v8 10/63] page cache: Use xa_lock Matthew Wilcox
2018-03-06 19:23 ` [PATCH v8 11/63] xarray: Replace exceptional entries Matthew Wilcox
2018-03-06 19:23 ` [PATCH v8 12/63] xarray: Change definition of sibling entries Matthew Wilcox
2018-03-06 19:23 ` [PATCH v8 13/63] xarray: Add definition of struct xarray Matthew Wilcox
2018-03-06 19:23 ` [PATCH v8 14/63] xarray: Define struct xa_node Matthew Wilcox
2018-03-06 19:23 ` [PATCH v8 15/63] xarray: Add documentation Matthew Wilcox
2018-03-06 19:23 ` [PATCH v8 16/63] xarray: Add xa_load Matthew Wilcox
2018-03-06 19:23 ` [PATCH v8 17/63] xarray: Add xa_get_tag, xa_set_tag and xa_clear_tag Matthew Wilcox
2018-03-06 19:23 ` [PATCH v8 18/63] xarray: Add xa_store Matthew Wilcox
2018-03-06 19:23 ` [PATCH v8 19/63] xarray: Add xa_cmpxchg and xa_insert Matthew Wilcox
2018-03-06 19:23 ` [PATCH v8 20/63] xarray: Add xa_for_each Matthew Wilcox
2018-03-06 19:23 ` [PATCH v8 21/63] xarray: Add xa_extract Matthew Wilcox
2018-03-06 19:23 ` [PATCH v8 22/63] xarray: Add xa_destroy Matthew Wilcox
2018-03-06 19:23 ` [PATCH v8 23/63] xarray: Add xas_next and xas_prev Matthew Wilcox
2018-03-06 19:23 ` [PATCH v8 24/63] xarray: Add xas_create_range Matthew Wilcox
2018-03-06 19:23 ` [PATCH v8 25/63] xarray: Add MAINTAINERS entry Matthew Wilcox
2018-03-06 19:23 ` [PATCH v8 26/63] page cache: Rearrange address_space Matthew Wilcox
2018-03-06 19:23 ` [PATCH v8 27/63] page cache: Convert hole search to XArray Matthew Wilcox
2018-03-06 19:23 ` [PATCH v8 28/63] page cache: Add and replace pages using the XArray Matthew Wilcox
2018-03-06 19:23 ` [PATCH v8 29/63] page cache: Convert page deletion to XArray Matthew Wilcox
2018-03-06 19:23 ` [PATCH v8 30/63] page cache: Convert page cache lookups " Matthew Wilcox
2018-03-06 19:23 ` [PATCH v8 31/63] page cache: Convert delete_batch " Matthew Wilcox
2018-03-06 19:23 ` [PATCH v8 32/63] page cache: Remove stray radix comment Matthew Wilcox
2018-03-06 19:23 ` [PATCH v8 33/63] page cache: Convert filemap_range_has_page to XArray Matthew Wilcox
2018-03-06 19:23 ` [PATCH v8 34/63] mm: Convert page-writeback " Matthew Wilcox
2018-03-06 19:23 ` [PATCH v8 35/63] mm: Convert workingset " Matthew Wilcox
2018-03-06 19:23 ` [PATCH v8 36/63] mm: Convert truncate " Matthew Wilcox
2018-03-06 19:23 ` Matthew Wilcox [this message]
2018-03-06 19:23 ` [PATCH v8 38/63] mm: Convert delete_from_swap_cache " Matthew Wilcox
2018-03-06 19:23 ` [PATCH v8 39/63] mm: Convert __do_page_cache_readahead " Matthew Wilcox
2018-03-06 19:23 ` [PATCH v8 40/63] mm: Convert page migration " Matthew Wilcox
2018-03-06 19:23 ` [PATCH v8 41/63] mm: Convert huge_memory " Matthew Wilcox
2018-03-06 19:23 ` [PATCH v8 42/63] mm: Convert collapse_shmem " Matthew Wilcox
2018-03-06 19:23 ` [PATCH v8 43/63] mm: Convert khugepaged_scan_shmem " Matthew Wilcox
2018-03-06 19:23 ` [PATCH v8 44/63] pagevec: Use xa_tag_t Matthew Wilcox
2018-03-06 19:23 ` [PATCH v8 45/63] shmem: Convert replace to XArray Matthew Wilcox
2018-03-06 19:23 ` [PATCH v8 46/63] shmem: Convert shmem_confirm_swap " Matthew Wilcox
2018-03-06 19:23 ` [PATCH v8 47/63] shmem: Convert find_swap_entry " Matthew Wilcox
2018-03-06 19:23 ` [PATCH v8 48/63] shmem: Convert shmem_add_to_page_cache " Matthew Wilcox
2018-03-06 19:23 ` [PATCH v8 49/63] shmem: Convert shmem_alloc_hugepage " Matthew Wilcox
2018-03-06 19:24 ` [PATCH v8 50/63] shmem: Convert shmem_free_swap " Matthew Wilcox
2018-03-06 19:24 ` [PATCH v8 51/63] shmem: Convert shmem_partial_swap_usage " Matthew Wilcox
2018-03-06 19:24 ` [PATCH v8 52/63] memfd: Convert shmem_tag_pins " Matthew Wilcox
2018-03-06 19:24 ` [PATCH v8 53/63] memfd: Convert shmem_wait_for_pins " Matthew Wilcox
2018-03-06 19:24 ` [PATCH v8 54/63] shmem: Comment fixups Matthew Wilcox
2018-03-06 19:24 ` [PATCH v8 55/63] btrfs: Convert page cache to XArray Matthew Wilcox
2018-03-07 14:25 ` David Sterba
2018-03-06 19:24 ` [PATCH v8 56/63] fs: Convert buffer " Matthew Wilcox
2018-03-06 19:24 ` [PATCH v8 57/63] fs: Convert writeback " Matthew Wilcox
2018-03-06 19:24 ` [PATCH v8 58/63] nilfs2: Convert " Matthew Wilcox
2018-03-06 19:24 ` [PATCH v8 59/63] f2fs: " Matthew Wilcox
2018-03-06 19:24 ` [PATCH v8 60/63] lustre: " Matthew Wilcox
2018-03-06 19:24 ` [PATCH v8 61/63] dax: " Matthew Wilcox
2018-03-06 19:24 ` [PATCH v8 62/63] page cache: Finish XArray conversion Matthew Wilcox
2018-03-06 19:24 ` [PATCH v8 63/63] radix tree: Remove unused functions Matthew Wilcox
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180306192413.5499-38-willy@infradead.org \
--to=willy@infradead.org \
--cc=akpm@linux-foundation.org \
--cc=konishi.ryusuke@lab.ntt.co.jp \
--cc=linux-btrfs@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=linux-nilfs@vger.kernel.org \
--cc=mawilcox@microsoft.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).