Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Liam Howlett <liam.howlett@oracle.com>
To:     "maple-tree@lists.infradead.org" <maple-tree@lists.infradead.org>,
        "linux-mm@kvack.org" <linux-mm@kvack.org>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
        Andrew Morton <akpm@linux-foundation.org>,
        Yu Zhao <yuzhao@google.com>, Hugh Dickins <hughd@google.com>
Subject: [PATCH v11 36/69] xtensa: remove vma linked list walks
Thread-Topic: [PATCH v11 36/69] xtensa: remove vma linked list walks
Thread-Index: AQHYmYd2FJHhDZsqiUWjGtYrfGXkEg==
Date:   Sun, 17 Jul 2022 02:46:49 +0000
Message-ID: <20220717024615.2106835-37-Liam.Howlett@oracle.com>
References: <20220717024615.2106835-1-Liam.Howlett@oracle.com>
In-Reply-To: <20220717024615.2106835-1-Liam.Howlett@oracle.com>
Accept-Language: en-US
Content-Language: en-US
x-ms-exchange-antispam-messagedata-chunkcount: 1
x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?Q?0QCvu/O+ojgwg4CEXdQ21/wVeRnhtIjxWOHHGAShcMhdIwImABn7/9u7eI?=
 =?iso-8859-1?Q?sFyY6Cg33Zsrh7jS2Hq9WA8yf4+8oWE2VqAxV4hFaQLHWLTldi0RirrsTR?=
 =?iso-8859-1?Q?fm22zF1MYzq8GHHWtD4dKqh1oU3g0VfwzxvSEE1MVEfjraoNLgq97vkw9w?=
 =?iso-8859-1?Q?Ak6AzpB64ST9i9s6HWl0eiJ6+hhmr3EcrdQ7DT1UfT6wO1Rv7xLiJeKf9I?=
 =?iso-8859-1?Q?WhG11ZM/puCp9OuvkvztrJ3kO6jB2W48GuTdl4yFX3GxdbHLcySLHMu5mE?=
 =?iso-8859-1?Q?P1XfMhlLoI60P8z0gdv3O5sakwWny0x+ZWFxOOml8GVm5g+Qs1Wuf/gjq1?=
 =?iso-8859-1?Q?sUEvTbAQbmt2Cce+RIr++tCZqHalaepJfwh1zqv7BdOXm16/E1j/zwfVLY?=
 =?iso-8859-1?Q?kMDftSGNBmoIbcgMehcKHoTJiGQZ+JSVEH4X3NtUuueu/1qxfMMHmEU2O6?=
 =?iso-8859-1?Q?a/4H9gzkB595AaokSBXVUt0Wgk0mKuQcVWRF49oSGaVW1NbOz4z31/KfIW?=
 =?iso-8859-1?Q?CkpWC9ubsGw6zcYjsfSsgG+gQzGG0MKS4sHdr0a7c1XCUGP9jmVHqj6s8w?=
 =?iso-8859-1?Q?aAu2eOmywW1qEOXavZPQ09bkqGl+5+Z7wBQAC6DcfzPmjBepFveaYppj9n?=
 =?iso-8859-1?Q?0r9iEzqcxmzglDi6uaWiQZ+XEUN1tt/1yTTXDk5wMb7DfX+ReXcp56masM?=
 =?iso-8859-1?Q?e+TUtFsOjSp1P2l/Z0DRaIavy28Y7uzY5gTsn+yWBnN76H8FLTxUiM5bpK?=
 =?iso-8859-1?Q?Lswub6sbXVVSByYEK3zinYEQunDIUaXLUg4Xy6A+OBEY6Fkahc15QooD/f?=
 =?iso-8859-1?Q?NXL6FkBZJcqhwAkTET2eyQkGXRquIDDJUgMVDSoLvzxeVMx+/grWrjCtGp?=
 =?iso-8859-1?Q?+vVqxP34alvkLgwbZBa56Dbu3TVABEIWp2JDqBhq0lP00rDlE4lwLgBe8D?=
 =?iso-8859-1?Q?IK1aohAWgcXkCb6dR2UYM2MtBIqu7xkiNtHjGuIQlGyHRxitDe7K5pRWdI?=
 =?iso-8859-1?Q?IJZNZDAEDREfppShL2rKLExG0nBLzDFUcg55Xr5fhjN3u5URcNuiWl1BEj?=
 =?iso-8859-1?Q?npColCpAv56JedZetE6jcyWxQekQTHalGwm5YGwbvb5lLKrWcu1I0n4bpU?=
 =?iso-8859-1?Q?1zWb+hvLdt3k9AokywKtye5agyNMkcbMZXcBmEULeP3ZOhArpEjgyXp+ac?=
 =?iso-8859-1?Q?4UUijemKO+KOV+U8pO5UIqcC+Io6h3ayPt5Rx7N+P11i0r7m/ZnQsOhVE4?=
 =?iso-8859-1?Q?obyILVzcle1mYcVf+y8ruGmCAQyhYGFMf0YtD9bMPWGYtqdvzGwreKYt4y?=
 =?iso-8859-1?Q?72Wb7fNKtDq+T7lBAChFsTluVZ3K1xKPT3Q+CyS5//zzdgpXA9YuS/OcGR?=
 =?iso-8859-1?Q?9lC3QiJVFZRxjPO877w0JFbOKC0TLZWF0BnZK/qdd8Hl++aw89Vp4jvjS0?=
 =?iso-8859-1?Q?nN+WNMmDjjWpI0kP4sxrQ6M+OfMj7YdftS58VrMNps47UPZ6QaRo4EOu8Q?=
 =?iso-8859-1?Q?ifN3LrQ0LpYA+EnMCZVLbNrWOkS+1dxoJl1ZPVxlueIDdk5amqFUhZTYgB?=
 =?iso-8859-1?Q?B+QPnUoMftrd8+LCBNCd3zdWq43MafCMzokpuIzLZTY0rEhazkeVH/yjoH?=
 =?iso-8859-1?Q?o2v2RDrWefLw+H51ElAWmgcPdlB7StVWPLpzznf2JIMD/V8Xevyd2TbQ?=
 =?iso-8859-1?Q?=3D=3D?=
Content-Type: text/plain; charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
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: 736de655-2c13-4b62-0b94-08da679eade7
X-MS-Exchange-CrossTenant-originalarrivaltime: 17 Jul 2022 02:46:49.5213
 (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: inbe44eJxs9Vvn0I+Tt7oEinf4jn7PGHyXOYu+bRyuTHO7zrf0l0jrAxv0sv70fxNYshSIosq1gBy1Byc/rdAg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN6PR10MB2799
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-17_01,2022-07-15_01,2022-06-22_01
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 bulkscore=0 mlxscore=0 mlxlogscore=932
 suspectscore=0 phishscore=0 adultscore=0 spamscore=0 malwarescore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2206140000
 definitions=main-2207170010
X-Proofpoint-GUID: jioDZuSOSTp7u9m97nrSrii49vmLuu5p
X-Proofpoint-ORIG-GUID: jioDZuSOSTp7u9m97nrSrii49vmLuu5p
X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW,
        RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE autolearn=ham
        autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

From: "Matthew Wilcox (Oracle)" <willy@infradead.org>

Use the VMA iterator instead.  Since VMA can no longer be NULL in the
loop, then deal with out-of-memory outside the loop.  This means a
slightly longer run time in the failure case (-ENOMEM) - it will run to
the end of the VMAs before erroring instead of in the middle of the loop.

Link: https://lkml.kernel.org/r/20220504011345.662299-21-Liam.Howlett@oracl=
e.com
Link: https://lkml.kernel.org/r/20220621204632.3370049-37-Liam.Howlett@orac=
le.com
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: Liam R. Howlett <Liam.Howlett@Oracle.com>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: David Howells <dhowells@redhat.com>
Cc: SeongJae Park <sj@kernel.org>
Cc: Vlastimil Babka <vbabka@suse.cz>
Cc: Will Deacon <will@kernel.org>
Cc: Davidlohr Bueso <dave@stgolabs.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
 arch/xtensa/kernel/syscall.c | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/arch/xtensa/kernel/syscall.c b/arch/xtensa/kernel/syscall.c
index 201356faa7e6..b3c2450d6f23 100644
--- a/arch/xtensa/kernel/syscall.c
+++ b/arch/xtensa/kernel/syscall.c
@@ -58,6 +58,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, u=
nsigned long addr,
 		unsigned long len, unsigned long pgoff, unsigned long flags)
 {
 	struct vm_area_struct *vmm;
+	struct vma_iterator vmi;
=20
 	if (flags & MAP_FIXED) {
 		/* We do not accept a shared mapping if it would violate
@@ -79,15 +80,20 @@ unsigned long arch_get_unmapped_area(struct file *filp,=
 unsigned long addr,
 	else
 		addr =3D PAGE_ALIGN(addr);
=20
-	for (vmm =3D find_vma(current->mm, addr); ; vmm =3D vmm->vm_next) {
-		/* At this point:  (!vmm || addr < vmm->vm_end). */
-		if (TASK_SIZE - len < addr)
-			return -ENOMEM;
-		if (!vmm || addr + len <=3D vm_start_gap(vmm))
-			return addr;
+	vma_iter_init(&vmi, current->mm, addr);
+	for_each_vma(vmi, vmm) {
+		/* At this point:  (addr < vmm->vm_end). */
+		if (addr + len <=3D vm_start_gap(vmm))
+			break;
+
 		addr =3D vmm->vm_end;
 		if (flags & MAP_SHARED)
 			addr =3D COLOUR_ALIGN(addr, pgoff);
 	}
+
+	if (TASK_SIZE - len < addr)
+		return -ENOMEM;
+
+	return addr;
 }
 #endif
--=20
2.35.1