From patchwork Tue Jul 19 19:14:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Liam R. Howlett" X-Patchwork-Id: 12922947 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 18910C433EF for ; Tue, 19 Jul 2022 19:50:09 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 6E7666B0071; Tue, 19 Jul 2022 15:50:08 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 694116B0073; Tue, 19 Jul 2022 15:50:08 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 50F0B6B0074; Tue, 19 Jul 2022 15:50:08 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 3F3E96B0071 for ; Tue, 19 Jul 2022 15:50:08 -0400 (EDT) Received: from smtpin04.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id D0252C028D for ; Tue, 19 Jul 2022 19:50:07 +0000 (UTC) X-FDA: 79704890454.04.A5FE346 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by imf11.hostedemail.com (Postfix) with ESMTP id 42C5E40006 for ; Tue, 19 Jul 2022 19:50:07 +0000 (UTC) Received: from pps.filterd (m0246617.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 26JGccR1031777; Tue, 19 Jul 2022 19:14:07 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-2022-7-12; bh=uQjsLwoXXn5SP5QCO2BYUzT3uohZ+BrtV3fomiVnliU=; b=F2rHkPEW37xhtWffJUvPdODsW47Km1kd3/TuK8+/245EvZF9gt9KppWwmWu/d03rSd4E HbE7cwziaqfXHUITByNwhAYPQt8GLAd2npysWkGy44yFCWIA4yudjR1gHSL1jZw8zaMo +gepDUaS/6/a5qWWe8S1avvIeGSWNtMzirUkaxq1iR+76hC8w1+5gbs0xos9pgPMpueg IWPNPnPy7GcQUReccNmPNGcuYEiT7VlVitTzo74bup/pU2+c+ZFPZJycfS/dB2JJs6lQ nqyHrRxblSVzJcqWPK52+MTiuLaddFw4Pjula2i22C6NpUcSVTXrb+JQ5IV0XZSp1CX0 0g== Received: from phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta02.appoci.oracle.com [147.154.114.232]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3hbnvtfh5k-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 19 Jul 2022 19:14:07 +0000 Received: from pps.filterd (phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.5/8.17.1.5) with ESMTP id 26JIShfU009880; Tue, 19 Jul 2022 19:14:06 GMT Received: from nam11-bn8-obe.outbound.protection.outlook.com (mail-bn8nam11lp2168.outbound.protection.outlook.com [104.47.58.168]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3hc1ggsbfr-3 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 19 Jul 2022 19:14:06 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=M+ori3yuftmuL2ZnlIIAHQ1W7EUzvNBh0jtyJ/r52G3Xdlzs+sfDiTpxgzic4+vFEscUQGEeFYSFMBeM8zGqOAAhT0FEImy5ZyO/KiXC+BqPgEK/fpZi73o5jQudlS+gweW3qQmg+G5j5rPXg/ZR++AQ/kdD6ILvMSbxY6nNwVkwUmfx4YCfPXcEAuRhaFhkkZxW/fXalttbYEMavv3+4nz0MbMCj+goKY/yOhfbrXqZoIS9K9l0o+lP9LcU2Up4NiDjvMVMFXTPFo33o7GL12a/ybdzk87037quYR9Ug8xV/0pi0Nk9SMGCNB+WmqwrPZHf75iM8DGOeUzpqOnfJw== 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=uQjsLwoXXn5SP5QCO2BYUzT3uohZ+BrtV3fomiVnliU=; b=NdheDV92IU3OdKSO/68ECK8QbarQNJu0hbgfOb2zDBZeJy8c1jlgOr3CrAjJFOnnAUr17yxgIbRDjJBmcMe9zKov8oBfTjjQOTtH7M3p3jh4B0VC/GbWpw0BxtsLcDeWZ+pY29cVOFSfwm5LAJo/z6IXS7cH66yYeQrkPz7+fCKmwPyh6y8/L6Mv1Oneod7TSHFiL64kUtvQlvtVx73jMOj5XF4FGTese1DHAQSwSk+SlrDzv98TcYX8ZEuOriYASRABQLn5JKh7+Zgx9IUewmWFPSferyKK/uBnJRwvfM2s1QX9q9SlSvzljeKjLB18AaBypKtNpJGVqy5h1iz5eg== 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=uQjsLwoXXn5SP5QCO2BYUzT3uohZ+BrtV3fomiVnliU=; b=f3gU6boc9RxAbuOXZMJQ5GyACIY/o62FwpWagy7UxRY/hUfL24PLzNCkfBYuxHgIUIvtu7zXt6FctVSm5ZI//mLjm1mOt775xUX8Tzi3LfOyq4dGspPkmW+0f2t0aaPJDEzjN6uMGLdhHQejHY/Fj8tlEWiORw60IITECQzV/fU= Received: from BL0PR10MB3011.namprd10.prod.outlook.com (2603:10b6:208:7e::29) by MW5PR10MB5805.namprd10.prod.outlook.com (2603:10b6:303:192::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5438.23; Tue, 19 Jul 2022 19:14:04 +0000 Received: from BL0PR10MB3011.namprd10.prod.outlook.com ([fe80::7c45:9b1:38eb:ca87]) by BL0PR10MB3011.namprd10.prod.outlook.com ([fe80::7c45:9b1:38eb:ca87%4]) with mapi id 15.20.5438.024; Tue, 19 Jul 2022 19:14:04 +0000 From: Liam Howlett To: "maple-tree@lists.infradead.org" , "linux-mm@kvack.org" , "linux-kernel@vger.kernel.org" , Andrew Morton , Hugh Dickins CC: Yu Zhao Subject: [PATCH 3/3] mm/mmap: change do_brk_munmap() to use Thread-Topic: [PATCH 3/3] mm/mmap: change do_brk_munmap() to use Thread-Index: AQHYm6O1bKoRuJ9fK0eWoMj2rSrXUw== Date: Tue, 19 Jul 2022 19:14:02 +0000 Message-ID: <20220719191352.3366482-4-Liam.Howlett@oracle.com> References: <20220719191352.3366482-1-Liam.Howlett@oracle.com> In-Reply-To: <20220719191352.3366482-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.35.1 x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 81955a46-67f8-4364-f63e-08da69bad89a x-ms-traffictypediagnostic: MW5PR10MB5805:EE_ x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: 013xdFkE/encm/S8biPz6RnKUutNKQHNvtxHpwnx/+IWqil3eUuQabnOkxUOSKDNXit5Ov8yEb8nwVw9LrCBD1jwuSIJNiWO/JIXvKRQN3d2yCFfLa69VLMoS2WzUN+EhT/u9yrCruD58pzXrM5gpYElAxVEOtUa/S+lrF5vwnU/uDCoZN41KPF8YiQRqXRuj495ekZJKvUNlyHOxErcXg+DZJO0K5mGYWDThllCPUN1GzkmYxHk2qQ2llqfNDH+280hnQLZIFzgWsDC9+VOw8PyTuTqfZCndBEZGXDlDndA2o23nFwXLvNAUQSnCNE9nnSVpyy/2eTa9R3gUY958OiW97KcAQtnOlgPXz7DI0oaoxxKgYRUHMWH8vggLmywWv066NBwCd9YXTZ3HCP2uCpPDQZDAj7L6ydwV46pH6pUw/fp5HUw4lfgNyeYNqkW5Tt+MumemZKMimvcKB9q+u3aTMck80hvNS1/+LZuuO+pnPoYGM7EvNv/1fh6dAQKD8b8xwscfhhm+mQ84Bj2H3ff0Yr7h+8DAe1DImU8xaqNM224osYfekPvymIuPAA+Ikz8P23jqP9OfRAFn+9TV9e7ImPW53KsdKWsBxPs+onmyQ5LBUed9LsY6YIfmFEMWFYNHoKZY/RGRP/UqZieoiVV454F8sVpxKZW666eGBh7Ay6wXGVzm8BVCT3qTIGyEpK2QwDViinbCBKRWIr2S72K9I6tcCCdUwckuhhT0L+8A47HFOhQA4NprK7Lh2Lm8d54h/JJknW0TjsZ9hcrM6/R/4u4nxrO/amyRygDQwIKjDTwnuDy1N3tuPvPn/mvYWYwGdhXFWL2zNuCBURhYiNgWVrUVvLgaIkbCnjUH9Qy6lb4LQM5slsV42UMcBvP x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BL0PR10MB3011.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230016)(39860400002)(396003)(136003)(346002)(376002)(366004)(2616005)(86362001)(6486002)(26005)(6512007)(38070700005)(1076003)(41300700001)(8936002)(2906002)(4326008)(38100700002)(6506007)(44832011)(478600001)(5660300002)(122000001)(110136005)(186003)(316002)(966005)(66446008)(76116006)(8676002)(71200400001)(66476007)(91956017)(64756008)(66556008)(66946007)(36756003)(83380400001);DIR:OUT;SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?q?eCLMH2NCU4tMvk67yuajKxz?= =?iso-8859-1?q?r3LhWX050tMWCx6TQQJTPx2cy/QqBnubb2d+XMPKWgf0wO3AvNlEUxmPL46a?= =?iso-8859-1?q?l4+dNKVrKrIzP570/uxKAHyikEnofNJLImVvio99XnFgIS1GZnwkOIGX6zi/?= =?iso-8859-1?q?RpYPeXqfBA9l+UOLDh575RIw1f0sn084WI2GW7xxl/lr7ZDEng6j8hOz2d1a?= =?iso-8859-1?q?Qt+67wZq8Ae95ljz3YToEH1dblhv9EyCIXSpJVBtBHlmYQZ5aBhkUcZzM1r+?= =?iso-8859-1?q?RhtlocwlNuec5jeqVRMnnRn0Xzw700pWe7NtZaFxCDMIw+IgJih2OW/v8i5A?= =?iso-8859-1?q?MSqpM4rihhEoWT7R+trhXyXaZERHRcE+FmUUadIGgYDMV6uL06hTJQzhxNzI?= =?iso-8859-1?q?bYwmy7dbYpvLzR8t19oMuGGcm5Zhf6pQDorK3sUgFqp28K8tbyCYGmhIz6Wc?= =?iso-8859-1?q?yCTyaifQrT4vxwzQh7sODcul6TGQbCR2fZA2a7+wB2EA3BMGw9rDqEAQGNgP?= =?iso-8859-1?q?MdqAIJpRAUkqjlfOUvOTCPN7//Tg9VdCf1WqcRK0My9CJcYm7Is0hHZ1OLo+?= =?iso-8859-1?q?30Te7jkii63cZXURIN6C8M0tekiVV87EkewCdiyBF8D1z3szTVFq0fQ7xiy1?= =?iso-8859-1?q?lvweuFrBooc6FYrT0OgOAM/Yy2gQCgVsYCncZG3Vp49ZMcr19Uhn/O6pzH/m?= =?iso-8859-1?q?5aMQVIzvawLev8PQQnm+UDWCeAHmq3MCijdQTnEdwosyPVeRxiBN7VaAuVbW?= =?iso-8859-1?q?X6kTTQtVUN+yWjr/OK4tNVMEuW+YwHU2ppEISjR3db+WaYanXvl6gbgAa0o4?= =?iso-8859-1?q?owubfF7QZ5MF5GA1J20h8+LhaBu064S0q2fDkt3Bth8fzaCn/sWe8t2asHkh?= =?iso-8859-1?q?KIeUPSXzYdKfyQGedQRzR8Toe5wD8oQEb3DsPX7ZDH1PnfowcK9fmS4rQA2t?= =?iso-8859-1?q?Te+qfYMxzyeIwOeqJMXU1YIPrLRmvyNZ3Knfi+7seGhMhjn1qCA49dwRc1W5?= =?iso-8859-1?q?+F+Ru2gVQA/AUSYXJTGKbrmn6KwFXdsqlhgJdEn+FpF3eI2Io3cv5TJafvcP?= =?iso-8859-1?q?5ZMDokgPHEHt1edg7z3DgAmPbLZSvhs71k/yxjpRpKc7Z8GV/js5ctMQGKuW?= =?iso-8859-1?q?h/e6QK1FgYyElAIThV9LjFWlRsk0ICZZko/MA5R09sOT7wpQmttjqGuBqD6b?= =?iso-8859-1?q?XORSdNDtVLErSpV+4lHnLnzTuyLpKzu/oImDUhhCJ23Qw3YvaEtn3CxzNqx5?= =?iso-8859-1?q?YRtCgAzROFyCBCWbsiCnn1Wnph4z5UJBfF2uHBVyNt2mnwrUFKnWZGJAV+rQ?= =?iso-8859-1?q?455UYu+5/DqWJ1Pq/AfdVB61XodyH1xeAkRVoidcs94kcciEDvthcaV7Dli1?= =?iso-8859-1?q?f2Mx2TjaDq4c6UCYAM7ix3jO3tPu7dvS22xMVwq+e6VKbW7K+ypPw3hAVncV?= =?iso-8859-1?q?vHQd1SZCXEId4IRSB5I0xo98Td5MvQ/CWxG/Ot+67qywn8SwBmA+ZA5eAA4Z?= =?iso-8859-1?q?6F0d9ruGDpxbCqcEhvvKDx3C8IBku2GBS4FSKq3/KQLAjEQQhZXuU4GQxdzd?= =?iso-8859-1?q?UQorhLGo+Z9yWYsnG3fl8cmVn5biyEIYtHg8rX8sGdm8jrwDmZsorFigIzP4?= =?iso-8859-1?q?zKcHj181LrgYV/6hEqZqj5EVNfmqgvmfqD5BPOw=3D=3D?= MIME-Version: 1.0 X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: BL0PR10MB3011.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 81955a46-67f8-4364-f63e-08da69bad89a X-MS-Exchange-CrossTenant-originalarrivaltime: 19 Jul 2022 19:14:02.7871 (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: 8QuIEPR7HH7OhpOGD/IXQsZkjqYNyPlkL4POCQbypg9mu/t/3m0Cys8ADaFKauwlX9RLC6ttBtSh83Dk7htlAA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW5PR10MB5805 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.883,Hydra:6.0.517,FMLib:17.11.122.1 definitions=2022-07-19_07,2022-07-19_01,2022-06-22_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxlogscore=999 spamscore=0 bulkscore=0 malwarescore=0 adultscore=0 mlxscore=0 phishscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2206140000 definitions=main-2207190082 X-Proofpoint-GUID: DJjD6ClP2mfMokIGy1APfeU-fxzkBoEl X-Proofpoint-ORIG-GUID: DJjD6ClP2mfMokIGy1APfeU-fxzkBoEl ARC-Seal: i=2; s=arc-20220608; d=hostedemail.com; t=1658260207; a=rsa-sha256; cv=pass; b=A4b6uSdu5EN8Y3407bPONqonA7snnCDWUPPpKg0/BfpE48QcmK3O4yArzV5RP/hwNUJUjw nLwbDpIioymZvCXju4/ZFEz5tZqk50YiUlv7wdz+Uh9CV6j9Yp3C7N/ffP6bxuiSZcz/92 Ool08dMyrN2z6Wqvitoicwd+fS3xD60= ARC-Authentication-Results: i=2; imf11.hostedemail.com; dkim=pass header.d=oracle.com header.s=corp-2022-7-12 header.b=F2rHkPEW; dkim=pass header.d=oracle.onmicrosoft.com header.s=selector2-oracle-onmicrosoft-com header.b=f3gU6boc; spf=none (imf11.hostedemail.com: domain of liam.howlett@oracle.com has no SPF policy when checking 205.220.165.32) smtp.mailfrom=liam.howlett@oracle.com; arc=pass ("microsoft.com:s=arcselector9901:i=1"); dmarc=pass (policy=none) header.from=oracle.com ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1658260207; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=uQjsLwoXXn5SP5QCO2BYUzT3uohZ+BrtV3fomiVnliU=; b=cPUrEqz11BTEsyQtNLQ9vZvb7beEPYZiIz3ygIqdxXKc8h5SQDMBjlT7UzSov7PszD88ye f7OiZg6QEDomK33Vtjx5n6j/6EVwineahoaEfDWTgIGf3M+3U2bAQ5+OSBEJFj+aGsptNg Ojf7VMfL9XDjkUe3MCzwgLlgHGLpVgk= X-Rspamd-Queue-Id: 42C5E40006 Authentication-Results: imf11.hostedemail.com; dkim=pass header.d=oracle.com header.s=corp-2022-7-12 header.b=F2rHkPEW; dkim=pass header.d=oracle.onmicrosoft.com header.s=selector2-oracle-onmicrosoft-com header.b=f3gU6boc; spf=none (imf11.hostedemail.com: domain of liam.howlett@oracle.com has no SPF policy when checking 205.220.165.32) smtp.mailfrom=liam.howlett@oracle.com; arc=pass ("microsoft.com:s=arcselector9901:i=1"); dmarc=pass (policy=none) header.from=oracle.com X-Rspam-User: X-Rspamd-Server: rspam06 X-Stat-Signature: fhr9fdxr1gudmw4d6qo7jgokouppo6q6 X-HE-Tag: 1658260207-546206 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. Link: https://lkml.kernel.org/r/20220504011345.662299-14-Liam.Howlett@oracle.com Link: https://lkml.kernel.org/r/20220519150509.1290067-1-Liam.Howlett@oracle.com Link: https://lkml.kernel.org/r/20220621204632.3370049-30-Liam.Howlett@oracle.com Signed-off-by: Liam R. Howlett Cc: Catalin Marinas Cc: David Howells Cc: "Matthew Wilcox (Oracle)" Cc: SeongJae Park Cc: Vlastimil Babka Cc: Will Deacon Cc: Davidlohr Bueso Signed-off-by: Andrew Morton --- mm/mmap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mm/mmap.c b/mm/mmap.c index ddd5040ecc9f..10ea2f146d4f 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -3085,7 +3085,7 @@ static int do_brk_munmap(struct ma_state *mas, struct vm_area_struct *vma, int ret; arch_unmap(mm, newbrk, oldbrk); - ret = do_mas_munmap(mas, mm, newbrk, oldbrk-newbrk, uf, true); + ret = do_mas_align_munmap(mas, vma, mm, newbrk, oldbrk, uf, true); validate_mm_mt(mm); return ret; }