From: Wenchao Xia <wenchaolinux@xxxxxxxxx>
Signed-off-by: Wenchao Xia <wenchaolinux@xxxxxxxxx>
---
include/linux/huge_mm.h | 2 +-
mm/huge_memory.c | 6 ++++--
mm/mremap.c | 2 +-
3 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/include/linux/huge_mm.h b/include/linux/huge_mm.h
index ee1c244..567dc1e 100644
--- a/include/linux/huge_mm.h
+++ b/include/linux/huge_mm.h
@@ -29,7 +29,7 @@ extern int move_huge_pmd(struct vm_area_struct *vma,
struct vm_area_struct *new_vma,
unsigned long old_addr,
unsigned long new_addr, unsigned long old_end,
- pmd_t *old_pmd, pmd_t *new_pmd);
+ pmd_t *old_pmd, pmd_t *new_pmd, bool remove_old);
extern int change_huge_pmd(struct vm_area_struct *vma, pmd_t *pmd,
unsigned long addr, pgprot_t newprot,
int prot_numa);
diff --git a/mm/huge_memory.c b/mm/huge_memory.c
index e2f7f5a..f752388 100644
--- a/mm/huge_memory.c
+++ b/mm/huge_memory.c
@@ -1402,10 +1402,11 @@ int mincore_huge_pmd(struct vm_area_struct *vma, pmd_t *pmd,
return ret;
}
+/* This function copy or moves pmd in same mm */
int move_huge_pmd(struct vm_area_struct *vma, struct vm_area_struct *new_vma,
unsigned long old_addr,
unsigned long new_addr, unsigned long old_end,
- pmd_t *old_pmd, pmd_t *new_pmd)
+ pmd_t *old_pmd, pmd_t *new_pmd, bool remove_old)
{
int ret = 0;
pmd_t pmd;
@@ -1429,7 +1430,8 @@ int move_huge_pmd(struct vm_area_struct *vma, struct vm_area_struct *new_vma,
ret = __pmd_trans_huge_lock(old_pmd, vma);
if (ret == 1) {
- pmd = pmdp_get_and_clear(mm, old_addr, old_pmd);
+ pmd = remove_old ?
+ pmdp_get_and_clear(mm, old_addr, old_pmd) : *old_pmd;
VM_BUG_ON(!pmd_none(*new_pmd));
set_pmd_at(mm, new_addr, new_pmd, pmd);
spin_unlock(&mm->page_table_lock);
diff --git a/mm/mremap.c b/mm/mremap.c
index 463a257..0f3c5be 100644
--- a/mm/mremap.c
+++ b/mm/mremap.c
@@ -178,7 +178,7 @@ unsigned long move_page_tables(struct vm_area_struct *vma,
if (extent == HPAGE_PMD_SIZE)
err = move_huge_pmd(vma, new_vma, old_addr,
new_addr, old_end,
- old_pmd, new_pmd);
+ old_pmd, new_pmd, true);
if (err > 0) {
need_flush = true;
continue;
--
1.7.1
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@xxxxxxxxx. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@xxxxxxxxx";> email@xxxxxxxxx </a>