diff options
author | Kirill A. Shutemov <kirill.shutemov@linux.intel.com> | 2013-11-14 17:30:54 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-14 19:32:14 -0500 |
commit | bf929152e9f6c49b66fad4ebf08cc95b02ce48f5 (patch) | |
tree | 21b54239e0ad98f12a44039047ed96d775e6c67d /mm/memcontrol.c | |
parent | 9a86cb7bdc4ccbe3f99a1ca275b90a322a90f9ce (diff) |
mm, thp: change pmd_trans_huge_lock() to return taken lock
With split ptlock it's important to know which lock
pmd_trans_huge_lock() took. This patch adds one more parameter to the
function to return the lock.
In most places migration to new api is trivial. Exception is
move_huge_pmd(): we need to take two locks if pmd tables are different.
Signed-off-by: Naoya Horiguchi <n-horiguchi@ah.jp.nec.com>
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Tested-by: Alex Thorlton <athorlton@sgi.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: "Eric W . Biederman" <ebiederm@xmission.com>
Cc: "Paul E . McKenney" <paulmck@linux.vnet.ibm.com>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Andrea Arcangeli <aarcange@redhat.com>
Cc: Dave Hansen <dave.hansen@intel.com>
Cc: Dave Jones <davej@redhat.com>
Cc: David Howells <dhowells@redhat.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Kees Cook <keescook@chromium.org>
Cc: Mel Gorman <mgorman@suse.de>
Cc: Michael Kerrisk <mtk.manpages@gmail.com>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Rik van Riel <riel@redhat.com>
Cc: Robin Holt <robinmholt@gmail.com>
Cc: Sedat Dilek <sedat.dilek@gmail.com>
Cc: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Hugh Dickins <hughd@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm/memcontrol.c')
-rw-r--r-- | mm/memcontrol.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/mm/memcontrol.c b/mm/memcontrol.c index e3cd40b2d5d9..f1a0ae6e11b8 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c | |||
@@ -6605,10 +6605,10 @@ static int mem_cgroup_count_precharge_pte_range(pmd_t *pmd, | |||
6605 | pte_t *pte; | 6605 | pte_t *pte; |
6606 | spinlock_t *ptl; | 6606 | spinlock_t *ptl; |
6607 | 6607 | ||
6608 | if (pmd_trans_huge_lock(pmd, vma) == 1) { | 6608 | if (pmd_trans_huge_lock(pmd, vma, &ptl) == 1) { |
6609 | if (get_mctgt_type_thp(vma, addr, *pmd, NULL) == MC_TARGET_PAGE) | 6609 | if (get_mctgt_type_thp(vma, addr, *pmd, NULL) == MC_TARGET_PAGE) |
6610 | mc.precharge += HPAGE_PMD_NR; | 6610 | mc.precharge += HPAGE_PMD_NR; |
6611 | spin_unlock(&vma->vm_mm->page_table_lock); | 6611 | spin_unlock(ptl); |
6612 | return 0; | 6612 | return 0; |
6613 | } | 6613 | } |
6614 | 6614 | ||
@@ -6797,9 +6797,9 @@ static int mem_cgroup_move_charge_pte_range(pmd_t *pmd, | |||
6797 | * to be unlocked in __split_huge_page_splitting(), where the main | 6797 | * to be unlocked in __split_huge_page_splitting(), where the main |
6798 | * part of thp split is not executed yet. | 6798 | * part of thp split is not executed yet. |
6799 | */ | 6799 | */ |
6800 | if (pmd_trans_huge_lock(pmd, vma) == 1) { | 6800 | if (pmd_trans_huge_lock(pmd, vma, &ptl) == 1) { |
6801 | if (mc.precharge < HPAGE_PMD_NR) { | 6801 | if (mc.precharge < HPAGE_PMD_NR) { |
6802 | spin_unlock(&vma->vm_mm->page_table_lock); | 6802 | spin_unlock(ptl); |
6803 | return 0; | 6803 | return 0; |
6804 | } | 6804 | } |
6805 | target_type = get_mctgt_type_thp(vma, addr, *pmd, &target); | 6805 | target_type = get_mctgt_type_thp(vma, addr, *pmd, &target); |
@@ -6816,7 +6816,7 @@ static int mem_cgroup_move_charge_pte_range(pmd_t *pmd, | |||
6816 | } | 6816 | } |
6817 | put_page(page); | 6817 | put_page(page); |
6818 | } | 6818 | } |
6819 | spin_unlock(&vma->vm_mm->page_table_lock); | 6819 | spin_unlock(ptl); |
6820 | return 0; | 6820 | return 0; |
6821 | } | 6821 | } |
6822 | 6822 | ||