diff options
author | Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> | 2014-01-13 01:04:24 -0500 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2014-01-14 23:46:38 -0500 |
commit | b3084f4db3aeb991c507ca774337c7e7893ed04f (patch) | |
tree | c5cad3a6843272a173e95a87a6087d362e19073e /include | |
parent | a6da83f98267bc8ee4e34aa899169991eb0ceb93 (diff) |
powerpc/thp: Fix crash on mremap
This patch fix the below crash
NIP [c00000000004cee4] .__hash_page_thp+0x2a4/0x440
LR [c0000000000439ac] .hash_page+0x18c/0x5e0
...
Call Trace:
[c000000736103c40] [00001ffffb000000] 0x1ffffb000000(unreliable)
[437908.479693] [c000000736103d50] [c0000000000439ac] .hash_page+0x18c/0x5e0
[437908.479699] [c000000736103e30] [c00000000000924c] .do_hash_page+0x4c/0x58
On ppc64 we use the pgtable for storing the hpte slot information and
store address to the pgtable at a constant offset (PTRS_PER_PMD) from
pmd. On mremap, when we switch the pmd, we need to withdraw and deposit
the pgtable again, so that we find the pgtable at PTRS_PER_PMD offset
from new pmd.
We also want to move the withdraw and deposit before the set_pmd so
that, when page fault find the pmd as trans huge we can be sure that
pgtable can be located at the offset.
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Acked-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'include')
-rw-r--r-- | include/asm-generic/pgtable.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/include/asm-generic/pgtable.h b/include/asm-generic/pgtable.h index db0923458940..8e4f41d9af4d 100644 --- a/include/asm-generic/pgtable.h +++ b/include/asm-generic/pgtable.h | |||
@@ -558,6 +558,18 @@ static inline pmd_t pmd_read_atomic(pmd_t *pmdp) | |||
558 | } | 558 | } |
559 | #endif | 559 | #endif |
560 | 560 | ||
561 | #ifndef pmd_move_must_withdraw | ||
562 | static inline int pmd_move_must_withdraw(spinlock_t *new_pmd_ptl, | ||
563 | spinlock_t *old_pmd_ptl) | ||
564 | { | ||
565 | /* | ||
566 | * With split pmd lock we also need to move preallocated | ||
567 | * PTE page table if new_pmd is on different PMD page table. | ||
568 | */ | ||
569 | return new_pmd_ptl != old_pmd_ptl; | ||
570 | } | ||
571 | #endif | ||
572 | |||
561 | /* | 573 | /* |
562 | * This function is meant to be used by sites walking pagetables with | 574 | * This function is meant to be used by sites walking pagetables with |
563 | * the mmap_sem hold in read mode to protect against MADV_DONTNEED and | 575 | * the mmap_sem hold in read mode to protect against MADV_DONTNEED and |