Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3d48ae45 authored by Peter Zijlstra's avatar Peter Zijlstra Committed by Linus Torvalds
Browse files

mm: Convert i_mmap_lock to a mutex 



Straightforward conversion of i_mmap_lock to a mutex.

Signed-off-by: default avatarPeter Zijlstra <a.p.zijlstra@chello.nl>
Acked-by: default avatarHugh Dickins <hughd@google.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: David Miller <davem@davemloft.net>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Russell King <rmk@arm.linux.org.uk>
Cc: Paul Mundt <lethal@linux-sh.org>
Cc: Jeff Dike <jdike@addtoit.com>
Cc: Richard Weinberger <richard@nod.at>
Cc: Tony Luck <tony.luck@intel.com>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: Mel Gorman <mel@csn.ul.ie>
Cc: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Cc: Nick Piggin <npiggin@kernel.dk>
Cc: Namhyung Kim <namhyung@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 97a89413

Documentation/lockstat.txt

+1 −1
Original line number Diff line number Diff line
@@ -136,7 +136,7 @@ View the top contending locks: 
                             dcache_lock:          1037           1161           0.38          45.32         774.51           6611         243371           0.15         306.48       77387.24

                         &inode->i_mutex:           161            286 18446744073709       62882.54     1244614.55           3653          20598 18446744073709       62318.60     1693822.74

                         &zone->lru_lock:            94             94           0.53           7.33          92.10           4366          32690           0.29          59.81       16350.06

              &inode->i_data.i_mmap_lock:            79             79           0.40           3.77          53.03          11779          87755           0.28         116.93       29898.44

              &inode->i_data.i_mmap_mutex:            79             79           0.40           3.77          53.03          11779          87755           0.28         116.93       29898.44

                        &q->__queue_lock:            48             50           0.52          31.62          86.31            774          13131           0.17         113.08       12277.52

                        &rq->rq_lock_key:            43             47           0.74          68.50         170.63           3706          33929           0.22         107.99       17460.62

                      &rq->rq_lock_key#2:            39             46           0.75           6.68          49.03           2979          32292           0.17         125.17       17137.63

Documentation/vm/locking

+1 −1
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ in some cases it is not really needed. Eg, vm_start is modified by 
expand_stack(), it is hard to come up with a destructive scenario without 

having the vmlist protection in this case.



The page_table_lock nests with the inode i_mmap_lock and the kmem cache

The page_table_lock nests with the inode i_mmap_mutex and the kmem cache

c_spinlock spinlocks.  This is okay, since the kmem code asks for pages after

dropping c_spinlock.  The page_table_lock also nests with pagecache_lock and

pagemap_lru_lock spinlocks, and no code asks for memory with these locks

arch/x86/mm/hugetlbpage.c

+2 −2
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ static void huge_pmd_share(struct mm_struct *mm, unsigned long addr, pud_t *pud) 
	if (!vma_shareable(vma, addr))

		return;



	spin_lock(&mapping->i_mmap_lock);

	mutex_lock(&mapping->i_mmap_mutex);

	vma_prio_tree_foreach(svma, &iter, &mapping->i_mmap, idx, idx) {

		if (svma == vma)

			continue;
@@ -97,7 +97,7 @@ static void huge_pmd_share(struct mm_struct *mm, unsigned long addr, pud_t *pud) 
		put_page(virt_to_page(spte));

	spin_unlock(&mm->page_table_lock);

out:

	spin_unlock(&mapping->i_mmap_lock);

	mutex_unlock(&mapping->i_mmap_mutex);

}



/*

fs/hugetlbfs/inode.c

+2 −2
Original line number Diff line number Diff line
@@ -412,10 +412,10 @@ static int hugetlb_vmtruncate(struct inode *inode, loff_t offset) 
	pgoff = offset >> PAGE_SHIFT;



	i_size_write(inode, offset);

	spin_lock(&mapping->i_mmap_lock);

	mutex_lock(&mapping->i_mmap_mutex);

	if (!prio_tree_empty(&mapping->i_mmap))

		hugetlb_vmtruncate_list(&mapping->i_mmap, pgoff);

	spin_unlock(&mapping->i_mmap_lock);

	mutex_unlock(&mapping->i_mmap_mutex);

	truncate_hugepages(inode, offset);

	return 0;

}

fs/inode.c

+1 −1
Original line number Diff line number Diff line
@@ -326,7 +326,7 @@ void address_space_init_once(struct address_space *mapping) 
	memset(mapping, 0, sizeof(*mapping));

	INIT_RADIX_TREE(&mapping->page_tree, GFP_ATOMIC);

	spin_lock_init(&mapping->tree_lock);

	spin_lock_init(&mapping->i_mmap_lock);

	mutex_init(&mapping->i_mmap_mutex);

	INIT_LIST_HEAD(&mapping->private_list);

	spin_lock_init(&mapping->private_lock);

	INIT_RAW_PRIO_TREE_ROOT(&mapping->i_mmap);