From: Matthew Wilcox <willy@infradead.org> To: linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: Matthew Wilcox <mawilcox@microsoft.com> Subject: [PATCH 33/62] page cache: Convert page_cache_next_hole to XArray Date: Wed, 22 Nov 2017 13:07:10 -0800 [thread overview] Message-ID: <20171122210739.29916-34-willy@infradead.org> (raw) In-Reply-To: <20171122210739.29916-1-willy@infradead.org> From: Matthew Wilcox <mawilcox@microsoft.com> Use xas_find_any() to scan the entries instead of doing a lookup from the top of the tree each time. Signed-off-by: Matthew Wilcox <mawilcox@microsoft.com> --- mm/filemap.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/mm/filemap.c b/mm/filemap.c index 1c03b0ea105e..accc350f9544 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -1349,20 +1349,15 @@ int __lock_page_or_retry(struct page *page, struct mm_struct *mm, pgoff_t page_cache_next_hole(struct address_space *mapping, pgoff_t index, unsigned long max_scan) { - unsigned long i; - - for (i = 0; i < max_scan; i++) { - struct page *page; + XA_STATE(xas, index); - page = radix_tree_lookup(&mapping->pages, index); - if (!page || xa_is_value(page)) - break; - index++; - if (index == 0) + while (max_scan--) { + void *entry = xas_find_any(&mapping->pages, &xas); + if (!entry || xa_is_value(entry)) break; } - return index; + return xas.xa_index; } EXPORT_SYMBOL(page_cache_next_hole); -- 2.15.0
WARNING: multiple messages have this Message-ID (diff)
From: Matthew Wilcox <willy@infradead.org> To: linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: Matthew Wilcox <mawilcox@microsoft.com> Subject: [PATCH 33/62] page cache: Convert page_cache_next_hole to XArray Date: Wed, 22 Nov 2017 13:07:10 -0800 [thread overview] Message-ID: <20171122210739.29916-34-willy@infradead.org> (raw) In-Reply-To: <20171122210739.29916-1-willy@infradead.org> From: Matthew Wilcox <mawilcox@microsoft.com> Use xas_find_any() to scan the entries instead of doing a lookup from the top of the tree each time. Signed-off-by: Matthew Wilcox <mawilcox@microsoft.com> --- mm/filemap.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/mm/filemap.c b/mm/filemap.c index 1c03b0ea105e..accc350f9544 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -1349,20 +1349,15 @@ int __lock_page_or_retry(struct page *page, struct mm_struct *mm, pgoff_t page_cache_next_hole(struct address_space *mapping, pgoff_t index, unsigned long max_scan) { - unsigned long i; - - for (i = 0; i < max_scan; i++) { - struct page *page; + XA_STATE(xas, index); - page = radix_tree_lookup(&mapping->pages, index); - if (!page || xa_is_value(page)) - break; - index++; - if (index == 0) + while (max_scan--) { + void *entry = xas_find_any(&mapping->pages, &xas); + if (!entry || xa_is_value(entry)) break; } - return index; + return xas.xa_index; } EXPORT_SYMBOL(page_cache_next_hole); -- 2.15.0 -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
next prev parent reply other threads:[~2017-11-22 21:18 UTC|newest] Thread overview: 159+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-11-22 21:06 [PATCH 00/62] XArray November 2017 Edition Matthew Wilcox 2017-11-22 21:06 ` Matthew Wilcox 2017-11-22 21:06 ` [PATCH 01/62] tools: Make __test_and_clear_bit available Matthew Wilcox 2017-11-22 21:06 ` Matthew Wilcox 2017-11-22 21:06 ` [PATCH 02/62] radix tree test suite: Remove ARRAY_SIZE Matthew Wilcox 2017-11-22 21:06 ` Matthew Wilcox 2017-11-22 21:06 ` [PATCH 03/62] radix tree test suite: Check reclaim bit Matthew Wilcox 2017-11-22 21:06 ` Matthew Wilcox 2017-11-22 21:06 ` [PATCH 04/62] idr test suite: Fix ida_test_random() Matthew Wilcox 2017-11-22 21:06 ` Matthew Wilcox 2017-11-22 21:06 ` [PATCH 05/62] radix tree: Add a missing cast to gfp_t Matthew Wilcox 2017-11-22 21:06 ` Matthew Wilcox 2017-11-22 21:28 ` Luc Van Oostenryck 2017-11-22 21:28 ` Luc Van Oostenryck 2017-11-22 22:24 ` Matthew Wilcox 2017-11-22 22:24 ` Matthew Wilcox 2017-11-22 22:35 ` Luc Van Oostenryck 2017-11-22 22:35 ` Luc Van Oostenryck 2017-11-22 21:06 ` [PATCH 06/62] idr: Make cursor explicit for cyclic allocation Matthew Wilcox 2017-11-22 21:06 ` Matthew Wilcox 2017-11-22 21:06 ` [PATCH 07/62] idr: Rewrite extended IDR API Matthew Wilcox 2017-11-22 21:06 ` Matthew Wilcox 2017-11-22 21:06 ` [PATCH 08/62] Explicitly include radix-tree.h Matthew Wilcox 2017-11-22 21:06 ` Matthew Wilcox 2017-11-22 21:06 ` [PATCH 09/62] arm64: Turn flush_dcache_mmap_lock into a no-op Matthew Wilcox 2017-11-22 21:06 ` Matthew Wilcox 2017-11-22 21:06 ` [PATCH 10/62] unicore32: " Matthew Wilcox 2017-11-22 21:06 ` Matthew Wilcox 2017-11-22 21:06 ` [PATCH 11/62] Export __set_page_dirty Matthew Wilcox 2017-11-22 21:06 ` Matthew Wilcox 2017-11-22 21:06 ` [PATCH 12/62] xfs: Rename xa_ elements to ail_ Matthew Wilcox 2017-11-22 21:06 ` Matthew Wilcox 2017-11-22 21:06 ` [PATCH 13/62] fscache: Use appropriate radix tree accessors Matthew Wilcox 2017-11-22 21:06 ` Matthew Wilcox 2017-11-22 21:06 ` [PATCH 14/62] xarray: Add the xa_lock to the radix_tree_root Matthew Wilcox 2017-11-22 21:06 ` Matthew Wilcox 2017-11-22 21:06 ` [PATCH 15/62] page cache: Use xa_lock Matthew Wilcox 2017-11-22 21:06 ` Matthew Wilcox 2017-11-22 21:06 ` [PATCH 16/62] xarray: Replace exceptional entries Matthew Wilcox 2017-11-22 21:06 ` Matthew Wilcox 2017-11-22 21:06 ` [PATCH 17/62] xarray: Change definition of sibling entries Matthew Wilcox 2017-11-22 21:06 ` Matthew Wilcox 2017-11-22 21:06 ` [PATCH 18/62] xarray: Add definition of struct xarray Matthew Wilcox 2017-11-22 21:06 ` Matthew Wilcox 2017-11-22 21:06 ` [PATCH 19/62] xarray: Define struct xa_node Matthew Wilcox 2017-11-22 21:06 ` Matthew Wilcox 2017-11-22 21:06 ` [PATCH 20/62] xarray: Add xa_load Matthew Wilcox 2017-11-22 21:06 ` Matthew Wilcox 2017-11-22 21:06 ` [PATCH 21/62] xarray: Add xa_get_tag, xa_set_tag and xa_clear_tag Matthew Wilcox 2017-11-22 21:06 ` Matthew Wilcox 2017-11-22 21:06 ` [PATCH 22/62] xarray: Add xa_store Matthew Wilcox 2017-11-22 21:06 ` Matthew Wilcox 2017-11-22 21:07 ` [PATCH 23/62] xarray: Add xa_cmpxchg Matthew Wilcox 2017-11-22 21:07 ` Matthew Wilcox 2017-11-22 21:07 ` [PATCH 24/62] xarray: Add xa_for_each Matthew Wilcox 2017-11-22 21:07 ` Matthew Wilcox 2017-11-22 21:07 ` [PATCH 25/62] xarray: Add xa_init Matthew Wilcox 2017-11-22 21:07 ` Matthew Wilcox 2017-11-22 21:07 ` [PATCH 26/62] xarray: Add xas_for_each_tag Matthew Wilcox 2017-11-22 21:07 ` Matthew Wilcox 2017-11-22 21:07 ` [PATCH 27/62] xarray: Add xa_get_entries and xa_get_tagged Matthew Wilcox 2017-11-22 21:07 ` Matthew Wilcox 2017-11-22 21:07 ` [PATCH 28/62] xarray: Add xa_destroy Matthew Wilcox 2017-11-22 21:07 ` Matthew Wilcox 2017-11-22 21:07 ` [PATCH 29/62] xarray: Add xas_prev_any Matthew Wilcox 2017-11-22 21:07 ` Matthew Wilcox 2017-11-22 21:07 ` [PATCH 30/62] xarray: Add xas_find_any / xas_next_any Matthew Wilcox 2017-11-22 21:07 ` Matthew Wilcox 2017-11-22 21:07 ` [PATCH 31/62] Convert IDR to use xarray Matthew Wilcox 2017-11-22 21:07 ` Matthew Wilcox 2017-11-22 21:07 ` [PATCH 32/62] ida: Convert to using xarray Matthew Wilcox 2017-11-22 21:07 ` Matthew Wilcox 2017-11-22 21:07 ` Matthew Wilcox [this message] 2017-11-22 21:07 ` [PATCH 33/62] page cache: Convert page_cache_next_hole to XArray Matthew Wilcox 2017-11-22 21:07 ` [PATCH 34/62] page cache: Use xarray for adding pages Matthew Wilcox 2017-11-22 21:07 ` Matthew Wilcox 2017-11-22 21:07 ` [PATCH 35/62] page cache: Convert page_cache_tree_delete to xarray Matthew Wilcox 2017-11-22 21:07 ` Matthew Wilcox 2017-11-22 21:07 ` [PATCH 36/62] page cache: Convert find_get_entry " Matthew Wilcox 2017-11-22 21:07 ` Matthew Wilcox 2017-11-22 21:07 ` [PATCH 37/62] shmem: Convert replace " Matthew Wilcox 2017-11-22 21:07 ` Matthew Wilcox 2017-11-22 21:07 ` [PATCH 38/62] shmem: Convert shmem_confirm_swap to XArray Matthew Wilcox 2017-11-22 21:07 ` Matthew Wilcox 2017-11-22 21:07 ` [PATCH 39/62] shmem: Convert find_swap_entry " Matthew Wilcox 2017-11-22 21:07 ` Matthew Wilcox 2017-11-22 21:07 ` [PATCH 40/62] shmem: Convert shmem_tag_pins " Matthew Wilcox 2017-11-22 21:07 ` Matthew Wilcox 2017-11-22 21:07 ` [PATCH 41/62] shmem: Convert shmem_wait_for_pins " Matthew Wilcox 2017-11-22 21:07 ` Matthew Wilcox 2017-11-22 21:07 ` [PATCH 42/62] vmalloc: Convert to xarray Matthew Wilcox 2017-11-22 21:07 ` Matthew Wilcox 2017-11-22 21:07 ` [PATCH 43/62] brd: Convert to XArray Matthew Wilcox 2017-11-22 21:07 ` Matthew Wilcox 2017-11-22 21:07 ` [PATCH 44/62] xfs: Convert m_perag_tree " Matthew Wilcox 2017-11-22 21:07 ` Matthew Wilcox 2017-11-22 21:07 ` [PATCH 45/62] xfs: Convert pag_ici_root " Matthew Wilcox 2017-11-22 21:07 ` Matthew Wilcox 2017-11-22 21:07 ` [PATCH 46/62] xfs: Convert xfs dquot " Matthew Wilcox 2017-11-22 21:07 ` Matthew Wilcox 2017-11-22 21:07 ` [PATCH 47/62] xfs: Convert mru cache " Matthew Wilcox 2017-11-22 21:07 ` Matthew Wilcox 2017-11-22 21:07 ` [PATCH 48/62] block: Remove IDR preloading Matthew Wilcox 2017-11-22 21:07 ` Matthew Wilcox 2017-11-22 21:07 ` [PATCH 49/62] rxrpc: " Matthew Wilcox 2017-11-22 21:07 ` Matthew Wilcox 2017-11-22 21:07 ` [PATCH 50/62] cgroup: Remove IDR wrappers Matthew Wilcox 2017-11-22 21:07 ` Matthew Wilcox 2017-11-22 21:07 ` [PATCH 51/62] dca: Remove idr_preload calls Matthew Wilcox 2017-11-22 21:07 ` Matthew Wilcox 2017-11-22 21:07 ` [PATCH 52/62] ipc: Remove call to idr_preload Matthew Wilcox 2017-11-22 21:07 ` Matthew Wilcox 2017-11-22 21:07 ` [PATCH 53/62] irq: " Matthew Wilcox 2017-11-22 21:07 ` Matthew Wilcox 2017-11-22 21:07 ` [PATCH 54/62] scsi: Remove idr_preload in st driver Matthew Wilcox 2017-11-22 21:07 ` Matthew Wilcox 2017-11-22 21:07 ` [PATCH 55/62] firewire: Remove call to idr_preload Matthew Wilcox 2017-11-22 21:07 ` Matthew Wilcox 2017-11-22 21:07 ` [PATCH 56/62] drm: Remove drm_minor_lock and idr_preload Matthew Wilcox 2017-11-22 21:07 ` Matthew Wilcox 2017-11-22 21:07 ` [PATCH 57/62] drm: Remove drm_syncobj_fd_to_handle Matthew Wilcox 2017-11-22 21:07 ` Matthew Wilcox 2017-11-22 21:07 ` [PATCH 58/62] drm: Remove qxl driver IDR locks Matthew Wilcox 2017-11-22 21:07 ` Matthew Wilcox 2017-11-22 21:07 ` [PATCH 59/62] drm: Replace virtio IDRs with IDAs Matthew Wilcox 2017-11-22 21:07 ` Matthew Wilcox 2017-11-22 21:07 ` [PATCH 60/62] drm: Replace vmwgfx " Matthew Wilcox 2017-11-22 21:07 ` Matthew Wilcox 2017-11-22 21:07 ` [PATCH 61/62] net: Redesign act_api use of IDR Matthew Wilcox 2017-11-22 21:07 ` Matthew Wilcox 2017-11-22 21:07 ` [PATCH 62/62] mm: Convert page-writeback to XArray Matthew Wilcox 2017-11-22 21:07 ` Matthew Wilcox 2017-11-23 1:25 ` [PATCH 00/62] XArray November 2017 Edition Dave Chinner 2017-11-23 1:25 ` Dave Chinner 2017-11-23 2:46 ` Matthew Wilcox 2017-11-23 2:46 ` Matthew Wilcox 2017-11-24 1:16 ` XArray documentation Matthew Wilcox 2017-11-24 1:16 ` Matthew Wilcox 2017-11-24 4:30 ` Andreas Dilger 2017-11-24 17:17 ` Matthew Wilcox 2017-11-24 17:17 ` Matthew Wilcox 2017-11-24 16:50 ` Martin Steigerwald 2017-11-24 16:50 ` Martin Steigerwald 2017-11-24 17:03 ` Matthew Wilcox 2017-11-24 17:03 ` Matthew Wilcox 2017-11-24 17:03 ` Matthew Wilcox 2017-11-24 18:01 ` Martin Steigerwald 2017-11-24 18:01 ` Martin Steigerwald 2017-11-24 19:48 ` Shakeel Butt 2017-11-24 19:48 ` Shakeel Butt 2017-11-24 19:56 ` Matthew Wilcox 2017-11-24 19:56 ` Matthew Wilcox 2017-11-24 21:18 ` Matthew Wilcox 2017-11-24 21:18 ` Matthew Wilcox 2017-11-24 21:18 ` Matthew Wilcox 2017-11-24 22:02 ` Martin Steigerwald 2017-11-24 22:02 ` Martin Steigerwald 2017-11-24 22:08 ` Matthew Wilcox 2017-11-24 22:08 ` 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=20171122210739.29916-34-willy@infradead.org \ --to=willy@infradead.org \ --cc=linux-fsdevel@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mm@kvack.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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.