linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Wei Yang <richardw.yang@linux.intel.com>
To: akpm@linux-foundation.org, dan.j.williams@intel.com,
	aneesh.kumar@linux.ibm.com, kirill@shutemov.name,
	yang.shi@linux.alibaba.com, richardw.yang@linux.intel.com,
	thellstrom@vmware.com
Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org
Subject: [PATCH 3/5] mm/mremap: use pmd_addr_end to calculate next in move_page_tables()
Date: Sat, 18 Jan 2020 07:22:52 +0800	[thread overview]
Message-ID: <20200117232254.2792-4-richardw.yang@linux.intel.com> (raw)
In-Reply-To: <20200117232254.2792-1-richardw.yang@linux.intel.com>

Use the general helper instead of do it by hand.

Signed-off-by: Wei Yang <richardw.yang@linux.intel.com>
---
 mm/mremap.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/mm/mremap.c b/mm/mremap.c
index c2af8ba4ba43..a258914f3ee1 100644
--- a/mm/mremap.c
+++ b/mm/mremap.c
@@ -253,11 +253,8 @@ unsigned long move_page_tables(struct vm_area_struct *vma,
 
 	for (; old_addr < old_end; old_addr += extent, new_addr += extent) {
 		cond_resched();
-		next = (old_addr + PMD_SIZE) & PMD_MASK;
-		/* even if next overflowed, extent below will be ok */
+		next = pmd_addr_end(old_addr, old_end);
 		extent = next - old_addr;
-		if (extent > old_end - old_addr)
-			extent = old_end - old_addr;
 		old_pmd = get_old_pmd(vma->vm_mm, old_addr);
 		if (!old_pmd)
 			continue;
@@ -301,7 +298,7 @@ unsigned long move_page_tables(struct vm_area_struct *vma,
 
 		if (pte_alloc(new_vma->vm_mm, new_pmd))
 			break;
-		next = (new_addr + PMD_SIZE) & PMD_MASK;
+		next = pmd_addr_end(new_addr, new_addr + len);
 		if (extent > next - new_addr)
 			extent = next - new_addr;
 		move_ptes(vma, old_pmd, old_addr, old_addr + extent, new_vma,
-- 
2.17.1


  parent reply	other threads:[~2020-01-17 23:23 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-01-17 23:22 [PATCH 0/5] mm/mremap.c: cleanup move_page_tables() a little Wei Yang
2020-01-17 23:22 ` [PATCH 1/5] mm/mremap: format the check in move_normal_pmd() same as move_huge_pmd() Wei Yang
2020-01-17 23:22 ` [PATCH 2/5] mm/mremap: it is sure to have enough space when extent meets requirement Wei Yang
2020-01-17 23:22 ` Wei Yang [this message]
2020-01-26 14:47   ` [PATCH 3/5] mm/mremap: use pmd_addr_end to calculate next in move_page_tables() Dmitry Osipenko
2020-01-27  2:59     ` Andrew Morton
2020-01-29 17:18       ` Dmitry Osipenko
2020-01-29 23:59         ` Andrew Morton
2020-01-30  0:28           ` Stephen Rothwell
2020-01-28  0:43     ` Wei Yang
2020-01-28 15:59       ` Dmitry Osipenko
2020-01-28 23:29         ` Wei Yang
2020-01-28 23:35           ` Dmitry Osipenko
2020-01-29  0:28             ` Wei Yang
2020-01-29 18:56               ` Dmitry Osipenko
2020-01-29  9:47     ` Russell King - ARM Linux admin
2020-01-29 14:21       ` Dmitry Osipenko
2020-01-29 21:57       ` Wei Yang
2020-01-29 23:24         ` Russell King - ARM Linux admin
2020-01-30  1:30           ` Wei Yang
2020-01-30 14:15             ` Russell King - ARM Linux admin
2020-01-30 21:57               ` Wei Yang
2020-01-17 23:22 ` [PATCH 4/5] mm/mremap: calculate extent in one place Wei Yang
2020-01-17 23:22 ` [PATCH 5/5] mm/mremap: start addresses are properly aligned Wei Yang
2020-01-19  0:07 ` [PATCH 0/5] mm/mremap.c: cleanup move_page_tables() a little Andrew Morton
2020-01-19  2:11   ` Wei Yang

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200117232254.2792-4-richardw.yang@linux.intel.com \
    --to=richardw.yang@linux.intel.com \
    --cc=akpm@linux-foundation.org \
    --cc=aneesh.kumar@linux.ibm.com \
    --cc=dan.j.williams@intel.com \
    --cc=kirill@shutemov.name \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mm@kvack.org \
    --cc=thellstrom@vmware.com \
    --cc=yang.shi@linux.alibaba.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).