Message ID | 20201210170402.3468568-27-Liam.Howlett@Oracle.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show
Return-Path: <SRS0=CYP3=FO=kvack.org=owner-linux-mm@kernel.org> 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=-16.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,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 8EA24C4361B for <linux-mm@archiver.kernel.org>; Thu, 10 Dec 2020 17:06:02 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 1E91B230FC for <linux-mm@archiver.kernel.org>; Thu, 10 Dec 2020 17:06:02 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1E91B230FC Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=Oracle.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id A535C6B0068; Thu, 10 Dec 2020 12:06:01 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 9B4CC6B006E; Thu, 10 Dec 2020 12:06:01 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 87CE46B0071; Thu, 10 Dec 2020 12:06:01 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0252.hostedemail.com [216.40.44.252]) by kanga.kvack.org (Postfix) with ESMTP id 7086B6B0068 for <linux-mm@kvack.org>; Thu, 10 Dec 2020 12:06:01 -0500 (EST) Received: from smtpin15.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id 1F03D8249980 for <linux-mm@kvack.org>; Thu, 10 Dec 2020 17:06:01 +0000 (UTC) X-FDA: 77578000122.15.pigs18_1e0e564273f9 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin15.hostedemail.com (Postfix) with ESMTP id 122731814AC98 for <linux-mm@kvack.org>; Thu, 10 Dec 2020 17:05:18 +0000 (UTC) X-HE-Tag: pigs18_1e0e564273f9 X-Filterd-Recvd-Size: 4596 Received: from aserp2130.oracle.com (aserp2130.oracle.com [141.146.126.79]) by imf47.hostedemail.com (Postfix) with ESMTP for <linux-mm@kvack.org>; Thu, 10 Dec 2020 17:05:17 +0000 (UTC) Received: from pps.filterd (aserp2130.oracle.com [127.0.0.1]) by aserp2130.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 0BAGnPDL139638; Thu, 10 Dec 2020 17:05:10 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding; s=corp-2020-01-29; bh=Hr4eNEhT0N2gyo/UedKAfU3BwmwfiNlra1kIM8G7uGc=; b=qopudZBIi/TOfdfQD6aBBCImmDsTuqnmp6EE7ESnKTv9zSXVzgSHfhK+TqLAZGwFU0pe po1xplob0To5TUOJ4NlZR7zPbitry0wnomKJB55EhTt6W8x1uhuf7AZDV2fLWEaSrgPu pEc2RAMJi6AGzWecszF/iduthUz9oATU4XAkCowrEBQ1LAIEIr+xStVmhvPrA+Uji+tk IS3G43dmsAglwZXe/yUZPS6HCwS2pc0Pt9Lbc0GQ4qFJIshxECJ4kodJ0WQgP2h+axK+ bzeyg7G0CE2dl/krr8KvlbWKEcPuepRr8pSKh58DUHVMDeq391CVU5ZNmMdHJZxB+ltx MA== Received: from aserp3020.oracle.com (aserp3020.oracle.com [141.146.126.70]) by aserp2130.oracle.com with ESMTP id 357yqc6m1t-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Thu, 10 Dec 2020 17:05:10 +0000 Received: from pps.filterd (aserp3020.oracle.com [127.0.0.1]) by aserp3020.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 0BAGwklq046192; Thu, 10 Dec 2020 17:05:10 GMT Received: from userv0121.oracle.com (userv0121.oracle.com [156.151.31.72]) by aserp3020.oracle.com with ESMTP id 358m41xbpu-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 10 Dec 2020 17:05:09 +0000 Received: from abhmp0009.oracle.com (abhmp0009.oracle.com [141.146.116.15]) by userv0121.oracle.com (8.14.4/8.13.8) with ESMTP id 0BAH58I3005507; Thu, 10 Dec 2020 17:05:08 GMT Received: from revolver.jebus.ca (/23.233.25.87) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Thu, 10 Dec 2020 09:05:07 -0800 From: "Liam R. Howlett" <Liam.Howlett@Oracle.com> To: maple-tree@lists.infradead.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: Andrew Morton <akpm@google.com>, Song Liu <songliubraving@fb.com>, Davidlohr Bueso <dave@stgolabs.net>, "Paul E . McKenney" <paulmck@kernel.org>, Matthew Wilcox <willy@infradead.org>, Jerome Glisse <jglisse@redhat.com>, David Rientjes <rientjes@google.com>, Axel Rasmussen <axelrasmussen@google.com>, Suren Baghdasaryan <surenb@google.com>, Vlastimil Babka <vbabka@suse.cz> Subject: [PATCH 26/28] mm/mmap: Change do_brk_munmap() to use do_mas_align_munmap() Date: Thu, 10 Dec 2020 12:04:00 -0500 Message-Id: <20201210170402.3468568-27-Liam.Howlett@Oracle.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201210170402.3468568-1-Liam.Howlett@Oracle.com> References: <20201210170402.3468568-1-Liam.Howlett@Oracle.com> MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9830 signatures=668683 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 malwarescore=0 adultscore=0 bulkscore=0 phishscore=0 suspectscore=0 mlxscore=0 mlxlogscore=999 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2009150000 definitions=main-2012100106 X-Proofpoint-Virus-Version: vendor=nai engine=6000 definitions=9830 signatures=668683 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 mlxlogscore=999 clxscore=1015 malwarescore=0 bulkscore=0 phishscore=0 adultscore=0 spamscore=0 priorityscore=1501 mlxscore=0 lowpriorityscore=0 impostorscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2009150000 definitions=main-2012100106 Content-Transfer-Encoding: quoted-printable X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: <linux-mm.kvack.org> |
Series |
RFC mm: Introducing the Maple Tree
|
expand
|
diff --git a/mm/mmap.c b/mm/mmap.c index 36a6b03193eb3..284c90504b44c 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -2992,12 +2992,13 @@ static int do_brk_munmap(struct ma_state *mas, struct vm_area_struct *vma, struct mm_struct *mm = vma->vm_mm; struct vm_area_struct unmap; unsigned long unmap_pages; - int ret = 1; + int ret; arch_unmap(mm, newbrk, oldbrk); if (likely(vma->vm_start >= newbrk)) { // remove entire mapping(s) - ret = do_mas_munmap(mas, mm, newbrk, oldbrk-newbrk, uf, true); + ret = do_mas_align_munmap(mas, vma, mm, newbrk, oldbrk, uf, + true); goto munmap_full_vma; }
do_brk_munmap() already has aligned addresses. Signed-off-by: Liam R. Howlett <Liam.Howlett@Oracle.com> --- mm/mmap.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)