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>
Subject: [PATCH v5 36/70] xtensa: Remove vma linked list walks
Thread-Topic: [PATCH v5 36/70] xtensa: Remove vma linked list walks
Thread-Index: AQHYF957lNjiLluBEk+xdDx8+Wi/Dg==
Date:   Wed, 2 Feb 2022 02:42:13 +0000
Message-ID: <20220202024137.2516438-37-Liam.Howlett@oracle.com>
References: <20220202024137.2516438-1-Liam.Howlett@oracle.com>
In-Reply-To: <20220202024137.2516438-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?WwsWXwm0QF42xExM10glbcFm575YhsSkovA9FobVWxGG3icrt6k6pUOn/W?=
 =?iso-8859-1?Q?MTHjQym0aV+qZ1kGA39HJGh/tYg07DOdqNFO44pgRujPbXNPSpmjLyPurw?=
 =?iso-8859-1?Q?KMCHKUdE+TxBNw8U99B3H3UB7ZXXs67OaVTlsKD1su83ZzfbNbga4YIFD3?=
 =?iso-8859-1?Q?oJpVvgmJo77LGRPRSAvHCHVDhCfzK6t5fnomUoCjXgUuVfs+SQvhXFq7sn?=
 =?iso-8859-1?Q?3EYFRdzg3faLeUwoell3q0CxTExxZjyPyVT1UVX9no1B7NLD7fOBtFgXaf?=
 =?iso-8859-1?Q?lTeTQdrEYHgLmolt/uynABoxG5VuXAWIxViFh6jO0msG8C3kagsYW+pGn9?=
 =?iso-8859-1?Q?nl1cu+/K1HxI5LKkR+KZHqD4J/fEzOuBwZoi9ONcIaqQtar1giGcvhVGao?=
 =?iso-8859-1?Q?kmLm3vMMmlKkBygODdjcWtl3HBy2F1pBExfl7zI5hEaGwoQ3t1xggzO4W3?=
 =?iso-8859-1?Q?u07KL8NiLStWetzU+pQm9W99i2YDNu31OnqI3Cv8cWXB9KVAYC08zbx7Ff?=
 =?iso-8859-1?Q?qxoLX5m38/NfUtvYaMFzz3gY0ywlAuRCCA0Lt9oW00iz5OGtUXr0T8CdI/?=
 =?iso-8859-1?Q?7+5ySMgAwNm73jkJxIGaaVcIu2fREtTerEjychQdY+b8z/DjQEJPTwNmon?=
 =?iso-8859-1?Q?pNazUsR54XrUYr60THkQdFku8XF2sZQXe2aUmZRucdS9HDew9Tij5NPy5m?=
 =?iso-8859-1?Q?+Rk+imGOQ9uIkVadrssWizZ7/I6WnozmWU2ywMuCY8EXsNPtvIoRe9Gh7a?=
 =?iso-8859-1?Q?sR4JHkLhJrgkIiH4icfMJD9tEMkCLh0C16uAtPx5zQ9EJa7aGMSR2bJBQa?=
 =?iso-8859-1?Q?uw63hPLtSiUT/932VT1345aGi1+OPOVQM4iexTHEJla5dfm94jf5v1xdSg?=
 =?iso-8859-1?Q?eHPNTsqWPhPKQ6r2WYKkcBQdPbs/yHCqgZ7JrqO6TyATTqtLXjYTkMNliA?=
 =?iso-8859-1?Q?fPdne3bcibuEuPSK+Hs8axp8uhjQo5MsSFhp1OiVYL3M3Pn0SBQU79TvmD?=
 =?iso-8859-1?Q?CD0eBGGw5Qm4CJFqspJK+Pe1i+3itWIkG8RUSwX75MjXjxWCkeKkJF9Ofj?=
 =?iso-8859-1?Q?lzzbAvX6oPkXOjFajT9pk9MwAazKXdyh+s5SsYe99gAz1xE/UyyQWTqLM8?=
 =?iso-8859-1?Q?4qtJGraBBuf3Bjzq55HUsG7io4flSd5yM52/g3/DWif8H4jrpRYA/u6/K/?=
 =?iso-8859-1?Q?2iZU9bXuHsACs/kJDy9aVTcaIR4SqzoVMK/BfrLp9el1ldDmnmAMuTUAbr?=
 =?iso-8859-1?Q?lL0B6lM84Fsbup+sf4SzFYihXiLyWr1SB3JW2LtiTAsaEhtKMQSzoe4kJd?=
 =?iso-8859-1?Q?1EO7LnYmoPc3Wmd7Ac8GD8tsAxdjkIp9l+I6Ztigkbt7+Bmy8Jm3P0N/VR?=
 =?iso-8859-1?Q?/57XNIwbQ6FwQgimzOziAyfs8figBYBaosMFRQMAFrXBs1v6iBcqfITNp4?=
 =?iso-8859-1?Q?RUmP2p+0dCWbzqVt16AHetfBcjWjeSsVIAVS01pIyuYiIVAiMoy7PNoP11?=
 =?iso-8859-1?Q?eLKmkNw62CHQJsqkahBlXI3VdMnclhBBpKf12mnoOCWBpHLj6hywnNR3QE?=
 =?iso-8859-1?Q?JIe8PY2MCUiErSOHSfvrPIMbUw+sKXFgzbvfwyW+lo6d/hZnHinvuw203B?=
 =?iso-8859-1?Q?hPojht6iSN1NwJxeStNY5SD+WVJCqmFdzDCOdTOzdyNO1+RISIKQbcuIUw?=
 =?iso-8859-1?Q?AD9LirpMNi6PdLFHjyI=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: b8f3a969-4999-4f82-9326-08d9e5f5b24a
X-MS-Exchange-CrossTenant-originalarrivaltime: 02 Feb 2022 02:42:13.6263
 (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: xgXjJ3e1QygaxTJBdJLOv1or07H3ATfyKysHSvA/xo4nnacwFBYDmpVZhJJoD1RbU+qFbRbGOXhBeew/KvJdyw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR10MB4129
X-Proofpoint-Virus-Version: vendor=nai engine=6300 definitions=10245 signatures=673430
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 malwarescore=0 phishscore=0
 mlxscore=0 adultscore=0 suspectscore=0 mlxlogscore=999 bulkscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2201110000
 definitions=main-2202020010
X-Proofpoint-ORIG-GUID: luNd0RWzitfpxLMPDyakIoYyxAgcGvMg
X-Proofpoint-GUID: luNd0RWzitfpxLMPDyakIoYyxAgcGvMg
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

From: "Liam R. Howlett" <Liam.Howlett@Oracle.com>

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.

Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: Liam R. Howlett <Liam.Howlett@Oracle.com>
---
 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.34.1