From patchwork Wed Dec 1 14:30:09 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: 12650089 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 96E2FC433F5 for ; Wed, 1 Dec 2021 14:52:02 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C24BF6B00CB; Wed, 1 Dec 2021 09:46:08 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id BAF1A6B00CD; Wed, 1 Dec 2021 09:46:08 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 9DC0F6B00CE; Wed, 1 Dec 2021 09:46:08 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0149.hostedemail.com [216.40.44.149]) by kanga.kvack.org (Postfix) with ESMTP id 8EA286B00CB for ; Wed, 1 Dec 2021 09:46:08 -0500 (EST) Received: from smtpin23.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id 552B9180EE414 for ; Wed, 1 Dec 2021 14:45:58 +0000 (UTC) X-FDA: 78869499996.23.33B8518 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by imf18.hostedemail.com (Postfix) with ESMTP id 216174002091 for ; Wed, 1 Dec 2021 14:45:56 +0000 (UTC) Received: from pps.filterd (m0246632.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.16.1.2/8.16.1.2) with SMTP id 1B1DDQAB010074; Wed, 1 Dec 2021 14:30:45 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=kT3cEgYgmm5Xh9Pz7hJuun/feObyMjjkmh7VxMJX6Vs=; b=VjoLVn+/WeNqcCxr1ll8AV7HMXgHXlJLWw8GsTR/58uLJU1PRqLXtsgFoJ0vgwFafyvo 5kIHbkkLJqXBnJ2h9+LWOBsrWDyBIRkg3ToC4XLTGr49hWVUkCT35DpmclM1WqG7yd21 ZpD6RneK8Xk5KyjNEomkdaqCv1QkiwWAaR7WJubaLyroW8II4b4x0AH/wiV1PtDmKdr3 8j/BIlZ2+8kCxo48BJaoShWyQJz3JwX7UvGFP21U55dVmFdbIo34Co9wA8I51OzHCxNm fYeggYtnBUqTRsyNSUAB97O5OpLnGOI3rZ5qaacTmNFtl/Qs3vwKWyYwJN919RqwsvFE RQ== Received: from aserp3020.oracle.com (aserp3020.oracle.com [141.146.126.70]) by mx0b-00069f02.pphosted.com with ESMTP id 3cp9r50e4d-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 01 Dec 2021 14:30:45 +0000 Received: from pps.filterd (aserp3020.oracle.com [127.0.0.1]) by aserp3020.oracle.com (8.16.1.2/8.16.1.2) with SMTP id 1B1EBl7Z109791; Wed, 1 Dec 2021 14:30:44 GMT Received: from nam10-bn7-obe.outbound.protection.outlook.com (mail-bn7nam10lp2102.outbound.protection.outlook.com [104.47.70.102]) by aserp3020.oracle.com with ESMTP id 3cnhveqcc9-3 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 01 Dec 2021 14:30:44 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BgVDRT/34mhxinPo8PYqWlX3J+krRu4m+EHn8ipJnTG5Jd3SrMhLP9FyJ/xufh/KQkA/AAtZCU7/P/ryTibM0dau+MOcfL6NAYRLU8+NI+PEJYtEc/4aFSNrq5A3xGg0ruZZJUz6Y4erWgYr5nGRbBBXerEORaVTGzT57bNTFCKobPg5AzBnpmhb/DKaKNqe/xYzDmogmeOvHgSN7MAm8HdksheqmUSZioigip4L9nxDVuR8+/CC0k8sZxf+0ivECb84rQHeKVlcLSEXvnaFwNUxRuvr6UUCis6ycsNZXq9K/3tDHw6MQ80+qYCBtoSyG7kxxvv2zz/heqSopWPNjA== 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=kT3cEgYgmm5Xh9Pz7hJuun/feObyMjjkmh7VxMJX6Vs=; b=H6ecQqF4Di/tlCCs5ALoWEFL7kaxeTFruH1f1O/prLRBgnIocYjllWgNXjylBuVGyN58gGuxyBnk6RHyLO8KdUXBQLFJCHwk7ximxFaw7OivBQa5Ehzyq4Do2OMThvbJZ4JQULo9s09k1cI8fRcLqLxMa+tdwNJUmk+H06pO+lIgeXOjW6hiK8SY4XbvNIkKBEf5B1BTzHYIXjQGxsHXiZwQu5dEK9F7ddxUwc1aueyx7TzLUd9wREH51ExgVJl9oWSLUWj+Cr2eqmSYEq+unCPheAGK/DRMB+Css6zGLm7JpmBf2Vy01PdIoNCeBXPNKJgD0e1HtbqUhQrErUG6/Q== 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=kT3cEgYgmm5Xh9Pz7hJuun/feObyMjjkmh7VxMJX6Vs=; b=U4S+mfkDmf30Qj6ibd2izC0XaNwuU+h3GaFyQUioyRPFC3nn4SWXrr/5fE0gGwti/228pG2EduUIELOpX8C7PafdpgyV/ORaBaxAs/ohQjfErEiZ5ww/gWo4p1LYA3iabY460cOS+hNF9I2srLoO3KLBgLB6eb6XTzrLBHAfihI= Received: from SN6PR10MB3022.namprd10.prod.outlook.com (2603:10b6:805:d8::25) by SA2PR10MB4508.namprd10.prod.outlook.com (2603:10b6:806:11d::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4734.23; Wed, 1 Dec 2021 14:30:38 +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:37 +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 40/66] exec: Use VMA iterator instead of linked list Thread-Topic: [PATCH v4 40/66] exec: Use VMA iterator instead of linked list Thread-Index: AQHX5r/xeY0gQmeZr0+LO7hmfQvN0Q== Date: Wed, 1 Dec 2021 14:30:09 +0000 Message-ID: <20211201142918.921493-41-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: 036f19a7-6038-43ab-5371-08d9b4d724e7 x-ms-traffictypediagnostic: SA2PR10MB4508: x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:7691; x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: kTxaGGg1Z4/JkOLLQNz7vTwORgHOaTVo3jFK9xE09FaNXmOLGcKV9bicLdS6qIk18CvxaeS0lIfJCtIB6ZbQ0fpWAVYpp4DqIhKKA3vYu7heWxk757KKIw8avHudYX9/f7L02Yh14cajuh17AdEWWsWrTldBfNC5BWbw/QxSVSe67WVKJlXgvi2ATK8HbeDHMkA7aeY/GXM0yGZ2yZ2fwkuiqvJ1aYooh53O2x3IuxuOad+3vhiYZBmFTQnF4jq6+rSB/xfD2v/NVKLiktnvlrEhOJGHA2vjM2T4Rb/DLjmm5fcdlUhUN+N2oYosHl0i2DRwmC5eo69axVoqRJMmqyol+28cdzuGs4oF91DdXmhIic5fD2gyzao7sECS2eK8ujhFX7Aba2Kb2ZHAXFM66wAUT7buk4sERnRyZP69JS0dgXL+qK8d4Od0M92j6F4M6P47PIMaWzqIvj27RD1YItdj4peYdhk2XkpNcjPKk9oNvGPGjbPOM4vgZcNehdGVzS5qT8uHahQPG0vXYaQh6h2VFWapSWj9VRwwQCATNK8/CZzXDKPbaIMVa/oZBVgV2ny2YHTxWuqkeoYFwAAdD8yQ2nKD7PyjWZqcqS665tozMVzMj5ZvBZOR7jVkhxDVN2ZB6uRVc3yxskM+RSgqFZxMFzZtxeQ6xpEHSBdp3SfhA7W+Ju+/rlommd2Mz2Ye 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)(186003)(26005)(7416002)(1076003)(2906002)(8936002)(54906003)(83380400001)(2616005)(38100700002)(71200400001)(66946007)(86362001)(66446008)(8676002)(6506007)(38070700005)(6512007)(6666004)(122000001)(508600001)(110136005)(6486002)(64756008)(66556008)(76116006)(91956017)(107886003)(316002)(5660300002)(44832011)(36756003)(4326008)(66476007);DIR:OUT;SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?q?z4CRAtJfSJEpvF09KeUg8HZ?= =?iso-8859-1?q?ha4ZQBg27AxtdlGnHRMme4u//MmkIAxEyvqFyzcFvlTbvsaoRjwJOGayo6Jc?= =?iso-8859-1?q?wRP/2yTdwmQYrsO0MViYxvr4lKBpcjdxzJhg1n8J20fs+KUDbrMgTJQjX3Rg?= =?iso-8859-1?q?Q+WJF8qRnWEdv7v+rRRoSt4LT20w9N9axmyfTxVMa+eC2tJ3vhupaysClymL?= =?iso-8859-1?q?/6d1RYqzTC+mZcVLjHmzF0/pkMy/ZRZi+qyH7SqvnvLbQNqgeqak9ySjYw/L?= =?iso-8859-1?q?1zAkGK2shILu9h1qp7IqbGFqrQ8IEThWLfmJvdrAqUXfAuL/67v1ziWY6vA5?= =?iso-8859-1?q?Bv+Ao+6j5r5fpeoJfOi88kFDVZEmMnxtpztD+2LWNLZcpkKDQVPC0ZTPKBBz?= =?iso-8859-1?q?7EuJotJuMtC8rS6qNf9gMcPXLBMF48g1VXDiJHhnYbkpYwOpO67wyqfPVaIq?= =?iso-8859-1?q?37f9mQKj7gMs5ivpPUaWnGqFwUEAt8i1AHLcs1C2tcV0jB/MbPYUew7snms9?= =?iso-8859-1?q?7wd1+bzeuEFlQ2HmrU24sNTb0vjlo5hgmUc69Qi412JRJ0DcEu39vDzE1E5c?= =?iso-8859-1?q?M8DbF8uZ7+M/USK2B5vSS+FL20bHXmy+rQXVINpsENYHNlsnI22gEGqy4Vtk?= =?iso-8859-1?q?hWuUJrLguBfi/d/qypFZ7i8OOWyMgJM5fwPcIQlfv+Y/azdhrl0hRdHwGjwq?= =?iso-8859-1?q?T/ELEs4E7+bnawb9CSZOpjqTvs5EsWLIO74n6S5REkZKw8ALoppGzzW0Uw0D?= =?iso-8859-1?q?qPs/WUA2mCLvG5IR5WHq480KmfcAQ8m6vtjuRyzWnumr9mn62SQA++EG8Sd7?= =?iso-8859-1?q?dnqY4HiXxZjgA0AHI/MYBh+t83JBTTzZA2JzMUHdHn/g5VuTLhPmtV39PoTp?= =?iso-8859-1?q?1/nZNdXcbYAhVvI30rHwhqVoVX+r7tiTrtZeTc17oMX9cWlLaR0L6bFdW33D?= =?iso-8859-1?q?l0xq4RpZJYTj5Fm6hr4Z+WTRyvohrGAh82FyYHv7BXG9+z8Sujcmg0hGK49T?= =?iso-8859-1?q?jUS7Pat1dvsRiRr60QHWYIXzIUEL1VQlspVXqk6CXpMPMbdEzixVbL0qKMhq?= =?iso-8859-1?q?aKJlSL1Zi2+X2k2YS8M8aJnnMvcyC5WkOGAWVxH3ZbKWy8+ej2yiE5vqjeaL?= =?iso-8859-1?q?tVa4MYaa33O6Iv3j6C8zlC/8InSyHCSKsHxhU9WZ9ydwBm8+q5PK4ni2EwPT?= =?iso-8859-1?q?mYS47punveV7Ed5m+BkaEn9ScGbFeX5os8MoKTon7yq0qN8o7wQ2OPWZ7utE?= =?iso-8859-1?q?Nl3rFZzt/7S5wfZ8mes8m/94wyj8C+6uCkMUx4sh+U9yhc6HpRvAkSWwFt+5?= =?iso-8859-1?q?HGd8ekwt1q7YzIYhbA4cs639/dF/aOJCGYIwM5xAcoaj+d9fzdCRE9dweL5k?= =?iso-8859-1?q?Eo0Opx+YEznL0E5jyuEInWFL2P8wSTsrttZbamLBmg4wK7UsEiJkP8ItpOta?= =?iso-8859-1?q?GG+8TeM/NQYfXHKclnqiTjkYb2Fda3UAlIl/srBFJRvRoSkH9XTbLXIkLV87?= =?iso-8859-1?q?64j3QbYi187b/+TrZlnTcmQ7T8ucrHWTyFZV2/MddRcFUIkfQGIfWVjy2uVW?= =?iso-8859-1?q?EN2mFw0Vqq/gi4vi5Qk/S1KMcexrCMO3OTIsPE3H7+hgiWXQDschSlWDoa3w?= =?iso-8859-1?q?DAtRhhwkvnochJaFNzoR6a14LI8SwUbg0AF5b8rQXNuNrlT/onwxYtL+U/tU?= =?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: 036f19a7-6038-43ab-5371-08d9b4d724e7 X-MS-Exchange-CrossTenant-originalarrivaltime: 01 Dec 2021 14:30:09.0978 (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: 574cvWF15tixcFudUJzI6kPvz/jFRHcrJh9/90583zkLzZkxxQDqnRadfy27dr2SWDO6KkcuQ+qN0iEHmtB9hQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA2PR10MB4508 X-Proofpoint-Virus-Version: vendor=nai engine=6300 definitions=10184 signatures=668683 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 spamscore=0 adultscore=0 bulkscore=0 malwarescore=0 mlxlogscore=999 mlxscore=0 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2110150000 definitions=main-2112010081 X-Proofpoint-ORIG-GUID: XVgD2RQh1yGZMHby76tdzLwVM629lErh X-Proofpoint-GUID: XVgD2RQh1yGZMHby76tdzLwVM629lErh X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: 216174002091 X-Stat-Signature: 3m13tg7tboxb749qihxdqw9j38pr7epf Authentication-Results: imf18.hostedemail.com; dkim=pass header.d=oracle.com header.s=corp-2021-07-09 header.b="VjoLVn+/"; dkim=pass header.d=oracle.onmicrosoft.com header.s=selector2-oracle-onmicrosoft-com header.b=U4S+mfkD; spf=none (imf18.hostedemail.com: domain of liam.howlett@oracle.com has no SPF policy when checking 205.220.177.32) smtp.mailfrom=liam.howlett@oracle.com; dmarc=pass (policy=none) header.from=oracle.com X-HE-Tag: 1638369956-172406 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" Remove a use of the vm_next list by doing the initial lookup with the VMA iterator and then using it to find the next entry. Signed-off-by: Matthew Wilcox (Oracle) Signed-off-by: Liam R. Howlett Acked-by: Vlastimil Babka --- fs/exec.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/fs/exec.c b/fs/exec.c index fee18b63ed35..f033745c148a 100644 --- a/fs/exec.c +++ b/fs/exec.c @@ -680,6 +680,8 @@ static int shift_arg_pages(struct vm_area_struct *vma, unsigned long shift) unsigned long length = old_end - old_start; unsigned long new_start = old_start - shift; unsigned long new_end = old_end - shift; + VMA_ITERATOR(vmi, mm, new_start); + struct vm_area_struct *next; struct mmu_gather tlb; BUG_ON(new_start > new_end); @@ -688,7 +690,7 @@ static int shift_arg_pages(struct vm_area_struct *vma, unsigned long shift) * ensure there are no vmas between where we want to go * and where we are */ - if (vma != find_vma(mm, new_start)) + if (vma != vma_next(&vmi)) return -EFAULT; /* @@ -707,12 +709,13 @@ static int shift_arg_pages(struct vm_area_struct *vma, unsigned long shift) lru_add_drain(); tlb_gather_mmu(&tlb, mm); + next = vma_next(&vmi); if (new_end > old_start) { /* * when the old and new regions overlap clear from new_end. */ free_pgd_range(&tlb, new_end, old_end, new_end, - vma->vm_next ? vma->vm_next->vm_start : USER_PGTABLES_CEILING); + next ? next->vm_start : USER_PGTABLES_CEILING); } else { /* * otherwise, clean from old_start; this is done to not touch @@ -721,7 +724,7 @@ static int shift_arg_pages(struct vm_area_struct *vma, unsigned long shift) * for the others its just a little faster. */ free_pgd_range(&tlb, old_start, old_end, new_end, - vma->vm_next ? vma->vm_next->vm_start : USER_PGTABLES_CEILING); + next ? next->vm_start : USER_PGTABLES_CEILING); } tlb_finish_mmu(&tlb);