From patchwork Wed Dec 1 14:30:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Liam R. Howlett" X-Patchwork-Id: 12650053 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1816AC433EF for ; Wed, 1 Dec 2021 14:43:23 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D20B06B009B; Wed, 1 Dec 2021 09:31:46 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id CA7BA6B009C; Wed, 1 Dec 2021 09:31:46 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id AAC5B6B009D; Wed, 1 Dec 2021 09:31:46 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0214.hostedemail.com [216.40.44.214]) by kanga.kvack.org (Postfix) with ESMTP id 9B37B6B009B for ; Wed, 1 Dec 2021 09:31:46 -0500 (EST) Received: from smtpin07.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id 64F0186E87 for ; Wed, 1 Dec 2021 14:31:36 +0000 (UTC) X-FDA: 78869463792.07.3472A10 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by imf12.hostedemail.com (Postfix) with ESMTP id 10FBD10003CB for ; Wed, 1 Dec 2021 14:30:34 +0000 (UTC) Received: from pps.filterd (m0246617.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.16.1.2/8.16.1.2) with SMTP id 1B1E16mS002526; Wed, 1 Dec 2021 14:30:25 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : references : in-reply-to : content-type : content-transfer-encoding : mime-version; s=corp-2021-07-09; bh=gvd8WkrzBJrW3nY3N0vr/HBqi1qDFwUHwCi04bdspeQ=; b=zqh2Ua5HNqoP+02Ldlqy/6sg/fm7AAlLZsH2dMtAzzoa8wAzhF42Ie/iaNnWy2CZPJfB mQqF5X+uoJ2VA+vbqF5X4wTJngSLfd0Kx47YNyYBcE3FcmCRfwYSn+hsDr8AbvE4nuzd cMwTjZxRc3VbniONSabQlAEA+hdHtro6iWd7R8L2BnqATM35SkKiAeOqCTwu1cpo3tPM N6Llg5vb8j7TG1zsTVCS++JV9Emu4V0OuQkVpih7tnN4aUhl2QiQoH2hvOM/nkrYvYF+ SJ8N8NTYE5xNzVjgmYoHIqTpUBUbdf0TmMQJo9pjvexGswmrY28wRqN+fop05SsYSCCk Lg== Received: from userp3020.oracle.com (userp3020.oracle.com [156.151.31.79]) by mx0b-00069f02.pphosted.com with ESMTP id 3cmvmx21vb-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 01 Dec 2021 14:30:25 +0000 Received: from pps.filterd (userp3020.oracle.com [127.0.0.1]) by userp3020.oracle.com (8.16.1.2/8.16.1.2) with SMTP id 1B1EAL5I032122; Wed, 1 Dec 2021 14:30:10 GMT Received: from nam11-bn8-obe.outbound.protection.outlook.com (mail-bn8nam11lp2169.outbound.protection.outlook.com [104.47.58.169]) by userp3020.oracle.com with ESMTP id 3cke4rv42p-7 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 01 Dec 2021 14:30:10 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Cg3gG8ZA6QjnTCK8A7+2W11ZdUr5ng21wNctiNob7jmAliTDmoUC+suGTw9v/ZBUh23ilF3TfLrqOZbeh40UPB7Xw+7I+X9GGnF1HBegdmpp6SKc0uIm2yjtTbPKN3wMsxJeb16YlOeCs2G9QYxPuE2CSOI5ufI0/es9Ttpit5fph25qa/H2IRuP5Qe830AzdQ17Fs6YI/S04i1My7ZjMU86PlRYj2zBcCYp91vk2AygYBMo+YV32wOhpBJ+HOD54fnB3iWPO5cf054BmHf76jIwestUrvphnF8s3VMz0iK+vGUCSJmYqhMJ/5e8F451RGXkOXAO8nfL26io2tHA6w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=gvd8WkrzBJrW3nY3N0vr/HBqi1qDFwUHwCi04bdspeQ=; b=HUjflK+c3t2DV64eV/UWoCM8/wd2BwGtVuqaTOuNorqOoHtvRBJsx7McJedVeMAAScT2jweMFXkPDUC1sGY8b2VnLWxHJelPMcftM8fBMr/SnQi7OAlJi4dNOvbNEDIaXvNdWCJFoGggCcxi8B5bHe5JpJCRiBMMwFE/7n3dMc78eli1bsZVe8s/DNKcQT3gtlvDv/sS+lgSNneXXHIu6iXp5q+pIhDZs3s1wyVtxi0I/n4X2KJOa0LYdLe2umxGW4HD1Sk3uT7L0QLqtoBru94dJJqO8pC6FvJjFCnSTFQhob7PpDNqDHCv3x4Aw/jaDH9w8rZOLnLmgWOWhhQyXA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.onmicrosoft.com; s=selector2-oracle-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=gvd8WkrzBJrW3nY3N0vr/HBqi1qDFwUHwCi04bdspeQ=; b=bYuLMrjKLnnwMJDWDkDwxnAF+h7DUUW5kTqdiakG9qERNJVBxXAE4FBM0N4YnxPiE8Rb1WTwwdvWdjbZk3H30tZOUvYE27I5VLdTjKwlffO4pTlSKfPQ2wC5gpNBoMmI38v7UbUbQCHqpUulwz2Be5CiXWvMtj9MFLEdpfTRKIo= Received: from SN6PR10MB3022.namprd10.prod.outlook.com (2603:10b6:805:d8::25) by SN6PR10MB3021.namprd10.prod.outlook.com (2603:10b6:805:cc::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.11; Wed, 1 Dec 2021 14:30:03 +0000 Received: from SN6PR10MB3022.namprd10.prod.outlook.com ([fe80::c4d0:8291:84d:ac66]) by SN6PR10MB3022.namprd10.prod.outlook.com ([fe80::c4d0:8291:84d:ac66%7]) with mapi id 15.20.4734.027; Wed, 1 Dec 2021 14:30:03 +0000 From: Liam Howlett To: "maple-tree@lists.infradead.org" , "linux-mm@kvack.org" , "linux-kernel@vger.kernel.org" , Andrew Morton CC: Song Liu , Davidlohr Bueso , "Paul E . McKenney" , Matthew Wilcox , Laurent Dufour , David Rientjes , Axel Rasmussen , Suren Baghdasaryan , Vlastimil Babka , Rik van Riel , Peter Zijlstra , Michel Lespinasse , Jerome Glisse , Minchan Kim , Joel Fernandes , Rom Lemarchand , Liam Howlett Subject: [PATCH v4 27/66] mm/mmap: Change do_brk_munmap() to use do_mas_align_munmap() Thread-Topic: [PATCH v4 27/66] mm/mmap: Change do_brk_munmap() to use do_mas_align_munmap() Thread-Index: AQHX5r/usRUxQs+IyEmLitRRgBJ0VA== Date: Wed, 1 Dec 2021 14:30:03 +0000 Message-ID: <20211201142918.921493-28-Liam.Howlett@oracle.com> References: <20211201142918.921493-1-Liam.Howlett@oracle.com> In-Reply-To: <20211201142918.921493-1-Liam.Howlett@oracle.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-mailer: git-send-email 2.30.2 x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 4c09355e-6ef0-4a8e-7886-08d9b4d71092 x-ms-traffictypediagnostic: SN6PR10MB3021: x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:241; x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: JOh1/lHtRgQ7fGukGkosGDLAjLT+JD3mKz3LyQDqRCJOEZzdIo7gYkldEAt+hqzIPNZ1MXbh5264kCgKOnjmwQJhoXk6RSqAOsKQpfO8OkOPb1Cq7wKdJHewrH3emiVnB4mLzbJrWESYQMR3FCBOGBNtAv17ubqG0V/poWTV1y/bmVE9HbT9+m1McLJdrppnLKvsxPgBUh/ACh+2sRxp1Bt/ZrWakHBxea3uO9L2BpoilMyiABFTjrXq9LDNqufWxUcaWKtKGdcS34vEPbNp92BawIfvOypf5uBfSWXCMYadkl2fDJIXtrqj9ajJNsIrFd7y05U6ROL6xVPKQujrUV2R1RZRJvt+ioqyUyglmDeKXk7wyHeiwgdIKsECGwcZX3UhgYxE8kelkgneMYMGTHinvFkNfHHAmOLu5lyn2qfgxHxnFcqJZ4QUGoMUtlzBHgKKz5QIj1TztTnzEDIINA7SrhYnS7wENje9wbD0ojsFeDgeQgxA6BL9MInN2wK82jWU/mdN/vN+yqG0x4yby47PfTrnSo6M1Jhdg0bmaqmarFduOO7NrSAOWJItxayUFZPKIE4zwDKw/L0Ot267mQP4YIw8gY2jI2LnfSu/q61dWZV6nx5Z/UMGTkLTI4i3tnVDk7PZzGuGx8K1vZVZVLk+SoYh0VaYRI2aFQlCWayZMrFv+yeteACYxvvJAprdWRfMcnb3qJ73XONAZRrt7g== x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SN6PR10MB3022.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(366004)(66556008)(7416002)(38100700002)(107886003)(38070700005)(316002)(66446008)(76116006)(64756008)(66476007)(2616005)(122000001)(83380400001)(2906002)(6512007)(91956017)(508600001)(66946007)(71200400001)(8936002)(54906003)(186003)(86362001)(44832011)(4326008)(6486002)(6506007)(5660300002)(36756003)(8676002)(110136005)(26005)(1076003);DIR:OUT;SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?q?ALbD7/dDlrKf4wCOZk5+2ue?= =?iso-8859-1?q?mU6/iRry2mTXV0ZSRBZ+Z+NROubsUuJMvgh3t5yShCCUWsdICC9bj8fWQoBK?= =?iso-8859-1?q?XkERis7d/RKe27BL6zn/AHXN6It4wBk7InHhKVl/+M/3CdXkg/RQa4JKPjnv?= =?iso-8859-1?q?QUybms1J+peV/r0l8+QNDNr/NJlRT1ip0KgcwyUa8Ue+HG1sXMbI9hiId0HE?= =?iso-8859-1?q?k3r8pZkPiTPl42KAAyoWCUzltECgCA5U0Lj0LSI/Z6xwCNPA93VDg0VjDbtO?= =?iso-8859-1?q?mCMlAPANgD7aT5qRo9kb0Fl/mJ6kBSf6en4tn6hZECn2ZqpfHo0RIzRUmTIx?= =?iso-8859-1?q?ieTEx2JxaqqwrYQnXKnTddFTHvNkpIXr4NbmL/0Mo1V+PdbDHUD61xMHjBnn?= =?iso-8859-1?q?UqJNOPEoasNY25qurFy1xjArx3+Iue6448neHytRMtQQ/EkhlgeYLDqbp/xO?= =?iso-8859-1?q?YwB2Q39sGq7QIEioMJ8CeTA0jCFRg6GMk2Vksagie2d7mcqXFCgxXt3G4kFQ?= =?iso-8859-1?q?FXBoTi3l/WWoEpE+Vcadgojlo73geMQrg+xV5GQqwWi41Ik/JgDeHWtSJ5C7?= =?iso-8859-1?q?n400ltlGahHBHHBFVWhAyBIHg+FqVl4A8RhZBTxEwwoxod2e/B603gVdi27S?= =?iso-8859-1?q?TlsIczfXBuEAUBGiNTSNJmGBqNLTC5+8OVER697gwJQqsgI8AcPwCVVe2tCi?= =?iso-8859-1?q?uN5JnZJydtRq9o8UlaVUtaXBriyrm3bVe5HRY/KLE62ZkDmScWM0BqGg4kYu?= =?iso-8859-1?q?lOYSvO9G795jGxSrsjY79pjgo4KUHgHx5usUIrxYCXCLSXVOg6RNIXx7JasW?= =?iso-8859-1?q?uJUSZPSoDJhlaltzGbQ/8EOKswKGl3pz5shkA321uIAvEVGTnQK+d8U/DVTt?= =?iso-8859-1?q?MiXO+kk53ZIbmfDV4afFVKfEpFEheHFxhlWdHoKHbwM3Y4iid8cZXdYiBI2O?= =?iso-8859-1?q?3WhYG9uM1l2q1IYqJei4yQQJzVgJTAkTyQu+FHtyBL/rsoxMKL2v622RLFbb?= =?iso-8859-1?q?XGARz3xrzKm9iMyX8dOeMPdLqrQFJo1kbJNOvTqqDk7dpFs0GB4E+spg0eex?= =?iso-8859-1?q?vuWvbD36NEUNX1cxS8j0i1yXJhTWEIW4DSEC4335BrZEa9C97J901Gj6b5L0?= =?iso-8859-1?q?IHqjVz6Szd1kCjyLzwfMEuM5ALhCJuIHavkI/JKEiJgN++ZqOMzMDtGfNAl/?= =?iso-8859-1?q?zBpl64fzVrdb3r+VL4c1O7P0Qy9b95oJCiRri0XJqvrGxiW2sXRTthCYanPc?= =?iso-8859-1?q?dn2p7y5NuMoKNXRqq5rp1W74oNJOX1cqMosKdspxgOQq7TqDs76Mei4+6Ufg?= =?iso-8859-1?q?NAxlTl0wzkRYmIIlNGwNxUQkiZhWzvyjtnpLdFwoHR7YtF+SeQ9cZJGomI/H?= =?iso-8859-1?q?3Cx3bydDkRwxscVgz5g+Cl6JIQGqTzzf7cPYbaBKMuMvsAuHQFx5n+0eGooj?= =?iso-8859-1?q?PH6B5+gZRA6BeghqqSXG7/8gitPv9+B7gUBI7G2aEQ613Xv3AaqsRdk9GHmC?= =?iso-8859-1?q?L1qFQcclnYoi6u1fQJZW2Ed4kO02R5822SiDJM4C8BgVcHqyvENRiBfhUIwt?= =?iso-8859-1?q?N6fLbzcytMSoRvcBBWs28q5J5R93ZcC6N8CdifwUrh0HNWwyjt5s5Y2suOW4?= =?iso-8859-1?q?vn+5YV3aNW6alAMZj7v5+k3sV5cTCZTTdUTOVXR27wrzKO0M7FXHriaYWUNI?= =?iso-8859-1?q?=3D?= MIME-Version: 1.0 X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: SN6PR10MB3022.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4c09355e-6ef0-4a8e-7886-08d9b4d71092 X-MS-Exchange-CrossTenant-originalarrivaltime: 01 Dec 2021 14:30:03.7359 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: xu9N4I+HUz+b+LrIdsunBfiMGF+r8KyyzXZA5Bj6Sp1egAbtGeP4RXHjuy0s/U3B7ejOIw3elZQxyuz7RyC0qw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN6PR10MB3021 X-Proofpoint-Virus-Version: vendor=nai engine=6300 definitions=10184 signatures=668683 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 malwarescore=0 mlxlogscore=999 phishscore=0 suspectscore=0 spamscore=0 adultscore=0 mlxscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2110150000 definitions=main-2112010081 X-Proofpoint-ORIG-GUID: fGurPw56lXWHd45nxNAj_jLHb350MmrY X-Proofpoint-GUID: fGurPw56lXWHd45nxNAj_jLHb350MmrY X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: 10FBD10003CB X-Stat-Signature: 7h4fhksn6sd6keom3k9yur4bbbyfs5it Authentication-Results: imf12.hostedemail.com; dkim=pass header.d=oracle.com header.s=corp-2021-07-09 header.b=zqh2Ua5H; dkim=pass header.d=oracle.onmicrosoft.com header.s=selector2-oracle-onmicrosoft-com header.b=bYuLMrjK; spf=none (imf12.hostedemail.com: domain of liam.howlett@oracle.com has no SPF policy when checking 205.220.165.32) smtp.mailfrom=liam.howlett@oracle.com; dmarc=pass (policy=none) header.from=oracle.com X-HE-Tag: 1638369034-570825 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: From: "Liam R. Howlett" do_brk_munmap() has already aligned the address and has a maple tree state to be used. Use the new do_mas_align_munmap() to avoid unnecessary alignment and error checks. Signed-off-by: Liam R. Howlett --- mm/mmap.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/mm/mmap.c b/mm/mmap.c index 14190306a483..79b8494d83c6 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -2926,12 +2926,15 @@ 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); + if (likely((vma->vm_end < oldbrk) || + ((vma->vm_start == newbrk) && (vma->vm_end == oldbrk)))) { + // remove entire mapping(s) + ret = do_mas_align_munmap(mas, vma, mm, newbrk, oldbrk, uf, + true); goto munmap_full_vma; }