From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.7 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, UNPARSEABLE_RELAY,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 86898C433E0 for ; Wed, 8 Jul 2020 09:50:59 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 4FF2020739 for ; Wed, 8 Jul 2020 09:50:59 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4FF2020739 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.alibaba.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id A2EDC8D0047; Wed, 8 Jul 2020 05:50:55 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 9E0378D0040; Wed, 8 Jul 2020 05:50:55 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8842E8D0047; Wed, 8 Jul 2020 05:50:55 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0225.hostedemail.com [216.40.44.225]) by kanga.kvack.org (Postfix) with ESMTP id 689AC8D0040 for ; Wed, 8 Jul 2020 05:50:55 -0400 (EDT) Received: from smtpin04.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id 2CAFF8248D7C for ; Wed, 8 Jul 2020 09:50:55 +0000 (UTC) X-FDA: 77014439670.04.bikes99_0917e1b26ebc Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin04.hostedemail.com (Postfix) with ESMTP id 06CF6800BE8C for ; Wed, 8 Jul 2020 09:50:55 +0000 (UTC) X-HE-Tag: bikes99_0917e1b26ebc X-Filterd-Recvd-Size: 3332 Received: from out30-57.freemail.mail.aliyun.com (out30-57.freemail.mail.aliyun.com [115.124.30.57]) by imf25.hostedemail.com (Postfix) with ESMTP for ; Wed, 8 Jul 2020 09:50:53 +0000 (UTC) X-Alimail-AntiSpam:AC=PASS;BC=-1|-1;BR=01201311R181e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=e01e04394;MF=richard.weiyang@linux.alibaba.com;NM=1;PH=DS;RN=15;SR=0;TI=SMTPD_---0U26Vwza_1594201845; Received: from localhost(mailfrom:richard.weiyang@linux.alibaba.com fp:SMTPD_---0U26Vwza_1594201845) by smtp.aliyun-inc.com(127.0.0.1); Wed, 08 Jul 2020 17:50:45 +0800 From: Wei Yang To: akpm@linux-foundation.org, kirill.shutemov@linux.intel.com, vbabka@suse.cz, yang.shi@linux.alibaba.com, thomas_os@shipmail.org, anshuman.khandual@arm.com, sean.j.christopherson@intel.com, richard.weiyang@linux.alibaba.com, peterx@redhat.com, aneesh.kumar@linux.ibm.com, willy@infradead.org, thellstrom@vmware.com Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, digetx@gmail.com Subject: [Patch v4 4/4] mm/mremap: use pmd_addr_end to simplify the calculate of extent Date: Wed, 8 Jul 2020 17:50:28 +0800 Message-Id: <20200708095028.41706-5-richard.weiyang@linux.alibaba.com> X-Mailer: git-send-email 2.20.1 (Apple Git-117) In-Reply-To: <20200708095028.41706-1-richard.weiyang@linux.alibaba.com> References: <20200708095028.41706-1-richard.weiyang@linux.alibaba.com> MIME-Version: 1.0 X-Rspamd-Queue-Id: 06CF6800BE8C X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam04 Content-Transfer-Encoding: quoted-printable X-Bogosity: Ham, tests=bogofilter, spamicity=0.000001, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: The purpose of this code is to calculate the smaller extent in old and new range. Let's leverage pmd_addr_end() to do the calculation. Hope this would make the code easier to read. Signed-off-by: Wei Yang --- v4: remove redundant parentheses pointed by Kirill --- mm/mremap.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/mm/mremap.c b/mm/mremap.c index f5f17d050617..f6f56aa0b893 100644 --- a/mm/mremap.c +++ b/mm/mremap.c @@ -237,11 +237,12 @@ unsigned long move_page_tables(struct vm_area_struc= t *vma, unsigned long new_addr, unsigned long len, bool need_rmap_locks) { - unsigned long extent, next, old_end; + unsigned long extent, old_next, new_next, old_end, new_end; struct mmu_notifier_range range; pmd_t *old_pmd, *new_pmd; =20 old_end =3D old_addr + len; + new_end =3D new_addr + len; flush_cache_range(vma, old_addr, old_end); =20 mmu_notifier_range_init(&range, MMU_NOTIFY_UNMAP, 0, vma, vma->vm_mm, @@ -250,14 +251,11 @@ unsigned long move_page_tables(struct vm_area_struc= t *vma, =20 for (; old_addr < old_end; old_addr +=3D extent, new_addr +=3D extent) = { cond_resched(); - next =3D (old_addr + PMD_SIZE) & PMD_MASK; - /* even if next overflowed, extent below will be ok */ - extent =3D next - old_addr; - if (extent > old_end - old_addr) - extent =3D old_end - old_addr; - next =3D (new_addr + PMD_SIZE) & PMD_MASK; - if (extent > next - new_addr) - extent =3D next - new_addr; + + old_next =3D pmd_addr_end(old_addr, old_end); + new_next =3D pmd_addr_end(new_addr, new_end); + extent =3D min(old_next - old_addr, new_next - new_addr); + old_pmd =3D get_old_pmd(vma->vm_mm, old_addr); if (!old_pmd) continue; --=20 2.20.1 (Apple Git-117)