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=-12.7 required=3.0 tests=BAYES_00, 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 25C1AC433E2 for ; Fri, 28 Aug 2020 08:10:52 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 7408920665 for ; Fri, 28 Aug 2020 08:10:51 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7408920665 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 A73006B0002; Fri, 28 Aug 2020 04:10:50 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id A23986B0003; Fri, 28 Aug 2020 04:10:50 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 9125F6B0006; Fri, 28 Aug 2020 04:10:50 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0018.hostedemail.com [216.40.44.18]) by kanga.kvack.org (Postfix) with ESMTP id 790AA6B0002 for ; Fri, 28 Aug 2020 04:10:50 -0400 (EDT) Received: from smtpin07.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id 2808B1F0A for ; Fri, 28 Aug 2020 08:10:50 +0000 (UTC) X-FDA: 77199256260.07.farm31_120ee8e27074 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin07.hostedemail.com (Postfix) with ESMTP id F1FBA1803F9A3 for ; Fri, 28 Aug 2020 08:10:49 +0000 (UTC) X-HE-Tag: farm31_120ee8e27074 X-Filterd-Recvd-Size: 3582 Received: from out30-45.freemail.mail.aliyun.com (out30-45.freemail.mail.aliyun.com [115.124.30.45]) by imf23.hostedemail.com (Postfix) with ESMTP for ; Fri, 28 Aug 2020 08:10:48 +0000 (UTC) X-Alimail-AntiSpam:AC=PASS;BC=-1|-1;BR=01201311R961e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=e01e01358;MF=richard.weiyang@linux.alibaba.com;NM=1;PH=DS;RN=4;SR=0;TI=SMTPD_---0U750IIp_1598602237; Received: from localhost(mailfrom:richard.weiyang@linux.alibaba.com fp:SMTPD_---0U750IIp_1598602237) by smtp.aliyun-inc.com(127.0.0.1); Fri, 28 Aug 2020 16:10:37 +0800 From: Wei Yang To: akpm@linux-foundation.org Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Wei Yang Subject: [PATCH] mm/mmap: leave adjust_next as virtual address instead of page frame number Date: Fri, 28 Aug 2020 16:10:31 +0800 Message-Id: <20200828081031.11306-1-richard.weiyang@linux.alibaba.com> X-Mailer: git-send-email 2.20.1 (Apple Git-117) MIME-Version: 1.0 X-Rspamd-Queue-Id: F1FBA1803F9A3 X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam03 Content-Transfer-Encoding: quoted-printable X-Bogosity: Ham, tests=bogofilter, spamicity=0.000011, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: Instead of convert adjust_next between virtual address and page frame number, let's just store the virtual address into adjust_next. Also, this patch fixes one typo in the comment of vma_adjust_trans_huge(). Signed-off-by: Wei Yang --- mm/huge_memory.c | 4 ++-- mm/mmap.c | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/mm/huge_memory.c b/mm/huge_memory.c index 78c84bee7e29..2c633ba14440 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -2300,13 +2300,13 @@ void vma_adjust_trans_huge(struct vm_area_struct = *vma, =20 /* * If we're also updating the vma->vm_next->vm_start, if the new - * vm_next->vm_start isn't page aligned and it could previously + * vm_next->vm_start isn't hpage aligned and it could previously * contain an hugepage: check if we need to split an huge pmd. */ if (adjust_next > 0) { struct vm_area_struct *next =3D vma->vm_next; unsigned long nstart =3D next->vm_start; - nstart +=3D adjust_next << PAGE_SHIFT; + nstart +=3D adjust_next; if (nstart & ~HPAGE_PMD_MASK && (nstart & HPAGE_PMD_MASK) >=3D next->vm_start && (nstart & HPAGE_PMD_MASK) + HPAGE_PMD_SIZE <=3D next->vm_end) diff --git a/mm/mmap.c b/mm/mmap.c index 90b1298d4222..e4c9bbfd4103 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -758,7 +758,7 @@ int __vma_adjust(struct vm_area_struct *vma, unsigned= long start, * vma expands, overlapping part of the next: * mprotect case 5 shifting the boundary up. */ - adjust_next =3D (end - next->vm_start) >> PAGE_SHIFT; + adjust_next =3D (end - next->vm_start); exporter =3D next; importer =3D vma; VM_WARN_ON(expand !=3D importer); @@ -768,7 +768,7 @@ int __vma_adjust(struct vm_area_struct *vma, unsigned= long start, * split_vma inserting another: so it must be * mprotect case 4 shifting the boundary down. */ - adjust_next =3D -((vma->vm_end - end) >> PAGE_SHIFT); + adjust_next =3D -(vma->vm_end - end); exporter =3D vma; importer =3D next; VM_WARN_ON(expand !=3D importer); @@ -840,8 +840,8 @@ int __vma_adjust(struct vm_area_struct *vma, unsigned= long start, } vma->vm_pgoff =3D pgoff; if (adjust_next) { - next->vm_start +=3D adjust_next << PAGE_SHIFT; - next->vm_pgoff +=3D adjust_next; + next->vm_start +=3D adjust_next; + next->vm_pgoff +=3D adjust_next >> PAGE_SHIFT; } =20 if (root) { --=20 2.20.1 (Apple Git-117)