From patchwork Mon Aug 22 15:05:19 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: 12950710 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 A84E7C32774 for ; Mon, 22 Aug 2022 15:05:24 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 42EC86B0075; Mon, 22 Aug 2022 11:05:24 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 3DE2C6B0081; Mon, 22 Aug 2022 11:05:24 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 20A6D8D0002; Mon, 22 Aug 2022 11:05:24 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 11DE06B0075 for ; Mon, 22 Aug 2022 11:05:24 -0400 (EDT) Received: from smtpin19.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id E5C7D1C6AB3 for ; Mon, 22 Aug 2022 15:05:23 +0000 (UTC) X-FDA: 79827552126.19.4EDDD00 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by imf11.hostedemail.com (Postfix) with ESMTP id 66A6F400C9 for ; Mon, 22 Aug 2022 15:05:23 +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 27MEkUsA022008; Mon, 22 Aug 2022 15:05:22 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=j4OXzP9sc8L56IR02p652+sfDEGFsbR52+i407wH1e4=; b=FNLJaw8h0g7UYruH5/hddOBLiUS7s9clwUSKf5KW1uDcL5vRASknK3wYghybzmtVCkL/ 1vUYQx+q6TxAz3ZhboOF8ENSGLSYDiHInYGQ3FEY/6UJOoOWppJMG2uUuiWcHsFlnH/g 3bOrQzbUSS/O9uA7zwgsKUUAm8LTqRaSby7UavSxrqS4Txh+3MZndn91tMF7ZUV3nRJR njd+pWdW9/eTyF7g4bYdsbl+Mfmtat4yGVO/dHq3lS6qkt8Xe2573ijcS05zrwU0JQey CD9BCYPN/TTntdagZyZi+caJ9XDn6aqZu1/fVeYOUzwFjUea1B6vp/j4YY8KZqScgTMT 1A== Received: from iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta01.appoci.oracle.com [130.35.100.223]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3j4btmg2pu-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 22 Aug 2022 15:05:22 +0000 Received: from pps.filterd (iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.5/8.17.1.5) with ESMTP id 27ME4OWk037856; Mon, 22 Aug 2022 15:05:20 GMT Received: from nam11-bn8-obe.outbound.protection.outlook.com (mail-bn8nam11lp2168.outbound.protection.outlook.com [104.47.58.168]) by iadpaimrmta01.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3j3mkg3bsu-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 22 Aug 2022 15:05:20 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=J6bw12PLc+dP9WYWzDJoRaBnqboWCqFnCDPf167ly6BG/h5AcxhjxYMZaSMmSwZFmIXSYvHpgt/u7qXQIc4SU+/pV3AjXJlahyAovZ8/jGGMWqdRp9YyIg1x4xf8FPo6TUaGbR9Z0pnDvA37txxfHcOR48A4vssGihpSXu94EpAKitzSSlxx4WDv/oBm+IbXV0ArZDufJaeAKROHHdeusShax5PLvgdWewGYpIZMBGYzg9+DKE7N4onfoakQBfxtYQ4+pHZBD+s7mqdC0EkER3cu99j/G0pdPOSXJNUkWsP0d7G79KvJydCIXDtNxGLRuSRGWergPNx/gTFi9G1Q0g== 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=j4OXzP9sc8L56IR02p652+sfDEGFsbR52+i407wH1e4=; b=VQDj9KlnBSXYVMGWikoS9eP9x3CGbLA3Ajm/Meh9xFrRT9aAqHlkqMYyGeCVhf/hXgWzzGMUqonzJF4gLqMzlY/rYt2MFa6FPhSYrHDzAaYASEed3oPaGlDkLFLVkYBmLuzRQJ4zMTUgViDkV7cenO1w5rfltd8zsktXRu+/UWCAeWcnD4wH9qCXLiCS+BxHAkFIzBkoL5ghz49G/K+hrGAZ9K/Vm2gvjhH3D8qRb8Ny9yYqPwIkS7+j67EWnFrexKrHd9tnKw9Ehgdl+hmKp2XyrGRl+jVXJp/MYUP8VrKoVsqfFQwhBT8Y2FpwdaY3GlO1iqaUueWAHJFLyv4DYA== 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=j4OXzP9sc8L56IR02p652+sfDEGFsbR52+i407wH1e4=; b=EPi4u/3vCI/dVRqzDWUG8uthzgljyglFOZetFGdq5M5aONnqii6u5wjMEA99twFwEjUTesBZQOn1z18JbRBLwC2yCTNdmN4Q+vQxuTWCbZSA37GWCtxuiPlTDB9za88WoRgoyQnhJ/1bIm3ivMY+mzSaYyxfKD2Mofs1oWHcm2g= Received: from SN6PR10MB3022.namprd10.prod.outlook.com (2603:10b6:805:d8::25) by CH0PR10MB5260.namprd10.prod.outlook.com (2603:10b6:610:c4::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5546.16; Mon, 22 Aug 2022 15:05:19 +0000 Received: from SN6PR10MB3022.namprd10.prod.outlook.com ([fe80::3d34:ebb5:d9df:98b3]) by SN6PR10MB3022.namprd10.prod.outlook.com ([fe80::3d34:ebb5:d9df:98b3%5]) with mapi id 15.20.5546.023; Mon, 22 Aug 2022 15:05:19 +0000 From: Liam Howlett To: "maple-tree@lists.infradead.org" , "linux-mm@kvack.org" , "linux-kernel@vger.kernel.org" , Andrew Morton CC: Liam Howlett Subject: [PATCH v13 29/70] mm/mmap: change do_brk_munmap() to use do_mas_align_munmap() Thread-Topic: [PATCH v13 29/70] mm/mmap: change do_brk_munmap() to use do_mas_align_munmap() Thread-Index: AQHYtjiY0RrMXyi95kGAebmwEfmmAg== Date: Mon, 22 Aug 2022 15:05:19 +0000 Message-ID: <20220822150128.1562046-30-Liam.Howlett@oracle.com> References: <20220822150128.1562046-1-Liam.Howlett@oracle.com> In-Reply-To: <20220822150128.1562046-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: 907e69cc-563e-42db-40b2-08da844fba9a x-ms-traffictypediagnostic: CH0PR10MB5260:EE_ x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: vaoxIlQC+bY9fX43q/vOZgtXX/EB43YFxX8O3QhGmcbDrjEEL4bI0zopByE6S/9g4rGfYKYxVqLKDnCbBP1HWXR1KdwRzsG4eHjII6CIR8GSEtDfJbN415BBlykkxt6Q1AcDAamIHg6u3WcILHKW1gXPlLf4ZTPUeXFX8YAQHRO+LSyOO2hyxVGYZQ4gjlPdJHb8qCbH89MQRNzNkGJUqUUTuSJthiMzR+/PbdGOwPh8Q4WVQQJomSe/Abomdd766y0P5ZGP5E33KIxP6Xi9xRtnrCZ4HCNCfUJ2lC6UwfRv/9vYFN3w1ET+ffo+OqS68NQ3A+Ug6K3AdYjy8Ddo1XcAcaqZhy/a6KTLW+94Nxv+YAe5wGq0e8Vll1Sr07dqtpscXoFtXyThBZfpEJTjXRbMibKvNDvMjDWJjDzgPt7Al0mfITCTYmVLWMTJeEUMlRZroumiMKIEuPq9NISK33u9nCyffE5bVRUBMoSqkgJDF9TZXaPDZP+uenSaqcEn6cwz7NsUt1LKiG6DHO4NftAh8ls7VUbp6xLsM3JG4omuIJMZAGp8vt0rPD1VamECrhVvcGd9TfJTnD9bebATasCaMnA6byqA4P5vp94B2ZtxraqWQXF3sQxREvXY72qBT/ph5+fr/+yK29NB7MwNy/jUcGbQ/1T6o75i/6AZhfESODclV2QHgirNL97nA5cSa0Qg9PmupS8ug5Yc+zMuqDLYpAo3Bo2rxCKT367ntG5iigp3QqpuF6jJ8ENf1RRGTTetI03Okln6OJhVhN/PTQ== 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:(13230016)(136003)(366004)(346002)(376002)(39860400002)(396003)(26005)(2906002)(86362001)(6506007)(1076003)(2616005)(107886003)(6512007)(38100700002)(186003)(122000001)(83380400001)(38070700005)(110136005)(8936002)(36756003)(71200400001)(316002)(6486002)(478600001)(91956017)(76116006)(4326008)(64756008)(66446008)(66476007)(66556008)(66946007)(8676002)(44832011)(4744005)(5660300002)(41300700001);DIR:OUT;SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?q?kAtw7NiW0+pqPuFSIDe/9WV?= =?iso-8859-1?q?SAxpFq/3IQSnHJupypCLq6lFo1531lV2VAVCLD37Gd4+m8SYi4jHVOsUqWCF?= =?iso-8859-1?q?JXbiBXSjEuQXitlVg3I0Gi17SHsq8jM+vNuX/P9V7e5DrW0HQgDcukvB2Vag?= =?iso-8859-1?q?yqv69j/rI5VKQSdlbggwvu/fIEX834Pnq++vJ5b5aydQUr/jpLFtELjPuhy7?= =?iso-8859-1?q?ioCKJQAqsdtDUh7mRnq2vKXENKgY2sncPvjgBWkGHNLQJdTkFftDJTdNtg+Y?= =?iso-8859-1?q?jJWjfAcOP61N/4F4nKOkh4kD0WZSwpKXHYpf7ukPpEBKojhBdPIEgthIZA90?= =?iso-8859-1?q?WZmzAk6g8WRx84OwZq/W96j9cnV8tMH/rvqR2ewsjFiFtrbQyKiZj4sEfMR9?= =?iso-8859-1?q?eUmBCh8TA7Ui4o4qQwX7O/B1I6p7t0pw9Biv3uP9B/A6dm95TIbAsw+eDBA/?= =?iso-8859-1?q?D3qSu9Og27xi0pdWAqhi6og0qWXSRaUy2KweuPR3AnZazR+i6vNrQE5F9B9e?= =?iso-8859-1?q?OgBeuHErix0tZC2UANrlMvtDZjnafVqz7vhTEcBEr1gvpUVh/JQDll5CETbU?= =?iso-8859-1?q?BMwA2si+XhRQM2GYKyZlawRepudkbEhhNYXyUBrlka6aJA8dMdInIdIUXyrB?= =?iso-8859-1?q?S0GXXiPHXCHfu9dYXXfEHQxP2T8uA/g8vDcvCj4jcBMAF7Lah4Z00IrmGkHU?= =?iso-8859-1?q?GKzpw4UofbwUaw3yJbmO3YahtBwcdQ4/oDNmIyNVidXzois/idse2U8+eSwS?= =?iso-8859-1?q?eJM/tlttf5VwroThE1MzChuOHgs4+/YvKGrmTFdRQnDBkzq2hl19hns92op3?= =?iso-8859-1?q?z+bj6V4zKqK49HEqB1+tqZbQfCFZffJiJh8GsBwzWO3ClF91MFmIXgEcLTLE?= =?iso-8859-1?q?s+oLnqhWazZd5KF//OntfwZFE834UDKIhL2mtOsn9zC7aUI+BwQleLHNtOUL?= =?iso-8859-1?q?hJ2+Kj+sL46g7wZMxCq6e8cB8rK2SZAu8TLGyNiix2h3MsJ/4WjUzEsBBmPI?= =?iso-8859-1?q?dyWeELXiL6DWdXKmwyVHHrnr/SLKcF+CxD6mBo3BIC3gKUeqRaPSIXEwIdvb?= =?iso-8859-1?q?8/5ubRvZ/l2B0KbzgPRCtpV9i1ZqnV7vXDIeY0W6YhVFyxOBnGUqdB0rgGcD?= =?iso-8859-1?q?6CSq8CxaYM7yTFM0xPqsfoioFxrYgWBETN+hSOpQUwDFQNWuSBbHY3vbSfYi?= =?iso-8859-1?q?IDWu4DW6lL7U2c3raZxO5nvgCo3JHtuNryNZZtp8C+yDiHQ694Et33VP0H3I?= =?iso-8859-1?q?33/23t65+4RtzINm0NkHkwO7zakTHfFl2KoJhwx+WtyTLLteeaG76UD1OMCT?= =?iso-8859-1?q?a2mZuBxcz6VfK5unneHflbIrxhiv3bJG0A4FKbHDIktuEjCAFPJ+yN7OnhxA?= =?iso-8859-1?q?oEuhBBD2D1GXhYC40kOCSeZCaUxyjCbRaYiuq2XHTyS0DcUCki2JT8vXZxZb?= =?iso-8859-1?q?nzE/jJyUPb4Fxbo9dFdzbtqlmvP50yYLzSMWGBYAr1je/livyEyJ9xhdQWu3?= =?iso-8859-1?q?XVa/gmrI7hXDgyDiDcuEPM0WIPRTvn3LnBOxu40tEzMQc1dCI2+x3tbOj2/u?= =?iso-8859-1?q?9jbIl8wqji8uiTVi5K7e/MRIJmUZfXSSOUNeCFVfIEKKzN6cHQXFuEYMXBRY?= =?iso-8859-1?q?Z2KBmU259c6VyCry+a7k67s85rhZKKpGa2TtPjA=3D=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: 907e69cc-563e-42db-40b2-08da844fba9a X-MS-Exchange-CrossTenant-originalarrivaltime: 22 Aug 2022 15:05:19.3675 (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: 5Ps28ZuV4+FzfHm1DH4WsHSEk8f23jTYqIwRToNE/voxAuQGYKF/trwDwpXsROPH2VPjQ3+xMaHwd1lZZ36U0w== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH0PR10MB5260 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.895,Hydra:6.0.517,FMLib:17.11.122.1 definitions=2022-08-22_09,2022-08-22_02,2022-06-22_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 adultscore=0 suspectscore=0 phishscore=0 malwarescore=0 spamscore=0 mlxlogscore=999 bulkscore=0 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2207270000 definitions=main-2208220065 X-Proofpoint-GUID: oAcFdtebHKaF7aUkF9k5eBQMQTS-qJLL X-Proofpoint-ORIG-GUID: oAcFdtebHKaF7aUkF9k5eBQMQTS-qJLL ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1661180723; 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=j4OXzP9sc8L56IR02p652+sfDEGFsbR52+i407wH1e4=; b=Gka9zDTPiekgve/YSpIxP0VPU6sp/J5mNrtCSw9G2KpCd4M1eEWfC4y3B1XLumrCAbpHcp H7krjxEG03aLlK417ltx5DmZ19p77J+ONMg5Bby87z0tk9c6AnVOrBC9q+2ndxL+WWCCMH NfK/jShu0R2mreM7DhVqWfTAEL1oqoQ= ARC-Authentication-Results: i=2; imf11.hostedemail.com; dkim=pass header.d=oracle.com header.s=corp-2022-7-12 header.b=FNLJaw8h; dkim=pass header.d=oracle.onmicrosoft.com header.s=selector2-oracle-onmicrosoft-com header.b="EPi4u/3v"; spf=pass (imf11.hostedemail.com: domain of liam.howlett@oracle.com designates 205.220.165.32 as permitted sender) smtp.mailfrom=liam.howlett@oracle.com; arc=pass ("microsoft.com:s=arcselector9901:i=1"); dmarc=pass (policy=none) header.from=oracle.com ARC-Seal: i=2; s=arc-20220608; d=hostedemail.com; t=1661180723; a=rsa-sha256; cv=pass; b=w897IqWTKbAzd75z2kx/GoCHNwT+Qrpfhl77NbELo4kTjaph1VgpMDiWWOIWsCKuG73Vi/ 5Pi9htWNqBX9J9zkCs0mAivJq8rzZ1123v7+0vY6TV6piDMxt7DPAFPRbJsqUsYAWSkbU7 SM7hnImo7V9Zs8L4AnVSUQpLo0QcdsI= X-Stat-Signature: f5cdnz5z7sym5ni9irytcr1akufep4qi X-Rspamd-Queue-Id: 66A6F400C9 X-Rspam-User: Authentication-Results: imf11.hostedemail.com; dkim=pass header.d=oracle.com header.s=corp-2022-7-12 header.b=FNLJaw8h; dkim=pass header.d=oracle.onmicrosoft.com header.s=selector2-oracle-onmicrosoft-com header.b="EPi4u/3v"; spf=pass (imf11.hostedemail.com: domain of liam.howlett@oracle.com designates 205.220.165.32 as permitted sender) smtp.mailfrom=liam.howlett@oracle.com; arc=pass ("microsoft.com:s=arcselector9901:i=1"); dmarc=pass (policy=none) header.from=oracle.com X-Rspamd-Server: rspam05 X-HE-Tag: 1661180723-367722 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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mm/mmap.c b/mm/mmap.c index 1c90a58b9cd8..64d12dd9d234 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -3042,7 +3042,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; }