From: Liam Howlett <liam.howlett@oracle.com>
To: "maple-tree@lists.infradead.org" <maple-tree@lists.infradead.org>,
"linux-mm@kvack.org" <linux-mm@kvack.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
Andrew Morton <akpm@linux-foundation.org>
Subject: [PATCH v9 10/69] mmap: use the VMA iterator in count_vma_pages_range()
Date: Wed, 4 May 2022 01:07:52 +0000 [thread overview]
Message-ID: <20220504010716.661115-12-Liam.Howlett@oracle.com> (raw)
In-Reply-To: <20220504010716.661115-1-Liam.Howlett@oracle.com>
From: "Matthew Wilcox (Oracle)" <willy@infradead.org>
This simplifies the implementation and is faster than using the linked
list.
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: Liam R. Howlett <Liam.Howlett@Oracle.com>
Acked-by: Vlastimil Babka <vbabka@suse.cz>
---
mm/mmap.c | 24 +++++++-----------------
1 file changed, 7 insertions(+), 17 deletions(-)
diff --git a/mm/mmap.c b/mm/mmap.c
index 7e01bab46416..4343286a6ca1 100644
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -675,29 +675,19 @@ munmap_vma_range(struct mm_struct *mm, unsigned long start, unsigned long len,
return 0;
}
+
static unsigned long count_vma_pages_range(struct mm_struct *mm,
unsigned long addr, unsigned long end)
{
- unsigned long nr_pages = 0;
+ VMA_ITERATOR(vmi, mm, addr);
struct vm_area_struct *vma;
+ unsigned long nr_pages = 0;
- /* Find first overlapping mapping */
- vma = find_vma_intersection(mm, addr, end);
- if (!vma)
- return 0;
-
- nr_pages = (min(end, vma->vm_end) -
- max(addr, vma->vm_start)) >> PAGE_SHIFT;
-
- /* Iterate over the rest of the overlaps */
- for (vma = vma->vm_next; vma; vma = vma->vm_next) {
- unsigned long overlap_len;
-
- if (vma->vm_start > end)
- break;
+ for_each_vma_range(vmi, vma, end) {
+ unsigned long vm_start = max(addr, vma->vm_start);
+ unsigned long vm_end = min(end, vma->vm_end);
- overlap_len = min(end, vma->vm_end) - vma->vm_start;
- nr_pages += overlap_len >> PAGE_SHIFT;
+ nr_pages += (vm_end - vm_start) / PAGE_SIZE;
}
return nr_pages;
--
2.35.1
next prev parent reply other threads:[~2022-05-04 1:08 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-04 1:07 [PATCH v9 00/69] Maple Tree v9 Liam Howlett
2022-05-04 1:07 ` Liam Howlett
2022-05-04 1:07 ` [PATCH v9 01/69] Maple Tree: add new data structure Liam Howlett
2022-05-04 1:07 ` [PATCH v9 02/69] radix tree test suite: add pr_err define Liam Howlett
2022-05-04 1:07 ` [PATCH v9 03/69] radix tree test suite: add kmem_cache_set_non_kernel() Liam Howlett
2022-05-04 1:07 ` [PATCH v9 04/69] radix tree test suite: add allocation counts and size to kmem_cache Liam Howlett
2022-05-04 1:07 ` [PATCH v9 06/69] radix tree test suite: add lockdep_is_held to header Liam Howlett
2022-05-04 1:07 ` [PATCH v9 05/69] radix tree test suite: add support for slab bulk APIs Liam Howlett
2022-05-04 1:07 ` [PATCH v9 07/69] lib/test_maple_tree: add testing for maple tree Liam Howlett
2022-05-04 1:07 ` [PATCH v9 09/69] mm: add VMA iterator Liam Howlett
2022-05-04 1:07 ` [PATCH v9 08/69] mm: start tracking VMAs with maple tree Liam Howlett
2022-05-10 10:37 ` SeongJae Park
2022-05-10 15:51 ` Liam Howlett
2022-05-10 16:58 ` Liam Howlett
2022-05-12 17:01 ` Qian Cai
2022-05-12 17:50 ` Liam Howlett
2022-06-06 12:26 ` Qian Cai
2022-06-06 16:16 ` Liam Howlett
2022-06-06 16:42 ` Qian Cai
2022-05-04 1:07 ` Liam Howlett [this message]
2022-05-04 1:07 ` [PATCH v9 12/69] mm/mmap: use the maple tree for find_vma_prev() instead of the rbtree Liam Howlett
2022-05-04 1:07 ` [PATCH v9 11/69] mm/mmap: use the maple tree in find_vma() " Liam Howlett
2022-05-04 1:07 ` [PATCH v9 13/69] mm/mmap: use maple tree for unmapped_area{_topdown} Liam Howlett
2022-05-04 1:07 ` [PATCH v9 14/69] kernel/fork: use maple tree for dup_mmap() during forking Liam Howlett
2022-05-06 2:25 ` [PATCH v9 00/69] Maple Tree v9 Andrew Morton
2022-05-09 18:55 ` Liam Howlett
2022-05-09 20:02 ` Andrew Morton
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=20220504010716.661115-12-Liam.Howlett@oracle.com \
--to=liam.howlett@oracle.com \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=maple-tree@lists.infradead.org \
/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).