Commit bf181b9f authored by Michel Lespinasse's avatar Michel Lespinasse Committed by Linus Torvalds
Browse files

mm anon rmap: replace same_anon_vma linked list with an interval tree. 



When a large VMA (anon or private file mapping) is first touched, which
will populate its anon_vma field, and then split into many regions through
the use of mprotect(), the original anon_vma ends up linking all of the
vmas on a linked list.  This can cause rmap to become inefficient, as we
have to walk potentially thousands of irrelevent vmas before finding the
one a given anon page might fall into.

By replacing the same_anon_vma linked list with an interval tree (where
each avc's interval is determined by its vma's start and last pgoffs), we
can make rmap efficient for this use case again.

While the change is large, all of its pieces are fairly simple.

Most places that were walking the same_anon_vma list were looking for a
known pgoff, so they can just use the anon_vma_interval_tree_foreach()
interval tree iterator instead.  The exception here is ksm, where the
page's index is not known.  It would probably be possible to rework ksm so
that the index would be known, but for now I have decided to keep things
simple and just walk the entirety of the interval tree there.

When updating vma's that already have an anon_vma assigned, we must take
care to re-index the corresponding avc's on their interval tree.  This is
done through the use of anon_vma_interval_tree_pre_update_vma() and
anon_vma_interval_tree_post_update_vma(), which remove the avc's from
their interval tree before the update and re-insert them after the update.
 The anon_vma stays locked during the update, so there is no chance that
rmap would miss the vmas that are being updated.

Signed-off-by: default avatarMichel Lespinasse <walken@google.com>
Cc: Andrea Arcangeli <aarcange@redhat.com>
Cc: Rik van Riel <riel@redhat.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Daniel Santos <daniel.santos@pobox.com>
Cc: Hugh Dickins <hughd@google.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 108d6642

include/linux/mm.h

+14 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 


struct mempolicy;

struct anon_vma;

struct anon_vma_chain;

struct file_ra_state;

struct user_struct;

struct writeback_control;
@@ -1377,6 +1378,19 @@ static inline void vma_nonlinear_insert(struct vm_area_struct *vma, 
	list_add_tail(&vma->shared.nonlinear, list);

}



void anon_vma_interval_tree_insert(struct anon_vma_chain *node,

				   struct rb_root *root);

void anon_vma_interval_tree_remove(struct anon_vma_chain *node,

				   struct rb_root *root);

struct anon_vma_chain *anon_vma_interval_tree_iter_first(

	struct rb_root *root, unsigned long start, unsigned long last);

struct anon_vma_chain *anon_vma_interval_tree_iter_next(

	struct anon_vma_chain *node, unsigned long start, unsigned long last);



#define anon_vma_interval_tree_foreach(avc, root, start, last)		 \

	for (avc = anon_vma_interval_tree_iter_first(root, start, last); \

	     avc; avc = anon_vma_interval_tree_iter_next(avc, start, last))



/* mmap.c */

extern int __vm_enough_memory(struct mm_struct *mm, long pages, int cap_sys_admin);

extern int vma_adjust(struct vm_area_struct *vma, unsigned long start,

include/linux/rmap.h

+6 −5
Original line number Diff line number Diff line
@@ -37,14 +37,14 @@ struct anon_vma { 
	atomic_t refcount;



	/*

	 * NOTE: the LSB of the head.next is set by

	 * NOTE: the LSB of the rb_root.rb_node is set by

	 * mm_take_all_locks() _after_ taking the above lock. So the

	 * head must only be read/written after taking the above lock

	 * rb_root must only be read/written after taking the above lock

	 * to be sure to see a valid next pointer. The LSB bit itself

	 * is serialized by a system wide lock only visible to

	 * mm_take_all_locks() (mm_all_locks_mutex).

	 */

	struct list_head head;	/* Chain of private "related" vmas */

	struct rb_root rb_root;	/* Interval tree of private "related" vmas */

};



/*
@@ -57,14 +57,15 @@ struct anon_vma { 
 * with a VMA, or the VMAs associated with an anon_vma.

 * The "same_vma" list contains the anon_vma_chains linking

 * all the anon_vmas associated with this VMA.

 * The "same_anon_vma" list contains the anon_vma_chains

 * The "rb" field indexes on an interval tree the anon_vma_chains

 * which link all the VMAs associated with this anon_vma.

 */

struct anon_vma_chain {

	struct vm_area_struct *vma;

	struct anon_vma *anon_vma;

	struct list_head same_vma;   /* locked by mmap_sem & page_table_lock */

	struct list_head same_anon_vma;	/* locked by anon_vma->mutex */

	struct rb_node rb;			/* locked by anon_vma->mutex */

	unsigned long rb_subtree_last;

};



#ifdef CONFIG_MMU

mm/huge_memory.c

+3 −2
Original line number Diff line number Diff line
@@ -1375,13 +1375,14 @@ static void __split_huge_page(struct page *page, 
			      struct anon_vma *anon_vma)

{

	int mapcount, mapcount2;

	pgoff_t pgoff = page->index << (PAGE_CACHE_SHIFT - PAGE_SHIFT);

	struct anon_vma_chain *avc;



	BUG_ON(!PageHead(page));

	BUG_ON(PageTail(page));



	mapcount = 0;

	list_for_each_entry(avc, &anon_vma->head, same_anon_vma) {

	anon_vma_interval_tree_foreach(avc, &anon_vma->rb_root, pgoff, pgoff) {

		struct vm_area_struct *vma = avc->vma;

		unsigned long addr = vma_address(page, vma);

		BUG_ON(is_vma_temporary_stack(vma));
@@ -1407,7 +1408,7 @@ static void __split_huge_page(struct page *page, 
	__split_huge_page_refcount(page);



	mapcount2 = 0;

	list_for_each_entry(avc, &anon_vma->head, same_anon_vma) {

	anon_vma_interval_tree_foreach(avc, &anon_vma->rb_root, pgoff, pgoff) {

		struct vm_area_struct *vma = avc->vma;

		unsigned long addr = vma_address(page, vma);

		BUG_ON(is_vma_temporary_stack(vma));

mm/interval_tree.c

+14 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 


#include <linux/mm.h>

#include <linux/fs.h>

#include <linux/rmap.h>

#include <linux/interval_tree_generic.h>



static inline unsigned long vma_start_pgoff(struct vm_area_struct *v)
@@ -57,3 +58,16 @@ void vma_interval_tree_insert_after(struct vm_area_struct *node, 
	rb_insert_augmented(&node->shared.linear.rb, root,

			    &vma_interval_tree_augment);

}



static inline unsigned long avc_start_pgoff(struct anon_vma_chain *avc)

{

	return vma_start_pgoff(avc->vma);

}



static inline unsigned long avc_last_pgoff(struct anon_vma_chain *avc)

{

	return vma_last_pgoff(avc->vma);

}



INTERVAL_TREE_DEFINE(struct anon_vma_chain, rb, unsigned long, rb_subtree_last,

		     avc_start_pgoff, avc_last_pgoff,, anon_vma_interval_tree)

mm/ksm.c

+6 −3
Original line number Diff line number Diff line
@@ -1618,7 +1618,8 @@ again: 
		struct vm_area_struct *vma;



		anon_vma_lock(anon_vma);

		list_for_each_entry(vmac, &anon_vma->head, same_anon_vma) {

		anon_vma_interval_tree_foreach(vmac, &anon_vma->rb_root,

					       0, ULONG_MAX) {

			vma = vmac->vma;

			if (rmap_item->address < vma->vm_start ||

			    rmap_item->address >= vma->vm_end)
@@ -1671,7 +1672,8 @@ again: 
		struct vm_area_struct *vma;



		anon_vma_lock(anon_vma);

		list_for_each_entry(vmac, &anon_vma->head, same_anon_vma) {

		anon_vma_interval_tree_foreach(vmac, &anon_vma->rb_root,

					       0, ULONG_MAX) {

			vma = vmac->vma;

			if (rmap_item->address < vma->vm_start ||

			    rmap_item->address >= vma->vm_end)
@@ -1723,7 +1725,8 @@ again: 
		struct vm_area_struct *vma;



		anon_vma_lock(anon_vma);

		list_for_each_entry(vmac, &anon_vma->head, same_anon_vma) {

		anon_vma_interval_tree_foreach(vmac, &anon_vma->rb_root,

					       0, ULONG_MAX) {

			vma = vmac->vma;

			if (rmap_item->address < vma->vm_start ||

			    rmap_item->address >= vma->vm_end)

CRA Git | Maintained and supported by SUSTech CRA and CCSE