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>,
        "damon @ lists . linux . dev" <damon@lists.linux.dev>,
        SeongJae Park <sj@kernel.org>,
        David Hildenbrand <david@redhat.com>
Subject: [PATCH v10 36/69] xtensa: remove vma linked list walks
Thread-Topic: [PATCH v10 36/69] xtensa: remove vma linked list walks
Thread-Index: AQHYhbAQdMOOfAzUkU2XTZghWGzf5Q==
Date:   Tue, 21 Jun 2022 20:47:05 +0000
Message-ID: <20220621204632.3370049-37-Liam.Howlett@oracle.com>
References: <20220621204632.3370049-1-Liam.Howlett@oracle.com>
In-Reply-To: <20220621204632.3370049-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?2qVIGiXg3tmORVhVWWpdvIAF1yYv7lwtQx7sQr4stbkgAIH4n/yxnPUDTr?=
 =?iso-8859-1?Q?Jm9lDZSGrQI9nArGCwdKoTTUuhFLmxmlKSVymgbifGETo4y6vdNW2KHlQ4?=
 =?iso-8859-1?Q?/3Er83QsYChqqsSzdzZwT3XFFqCEXT/uGYkQnJSrrwY65AsUBFocwS2IJ+?=
 =?iso-8859-1?Q?DjYlN9XzXyOZZDBaA5mkULSSv2UpyA6iwe1VjXcxrsQuXx9FalMvnRRXA+?=
 =?iso-8859-1?Q?zpnqa+4bCIsgCM40dtsYuRyw67A61GHdY54EKfZwYT1WKna0pRmAx+6/hk?=
 =?iso-8859-1?Q?2WZlATjZqbg682fhJtRrRTv/kHFmRzw7fM/YUpjW0uK8Le+ki8zbbCkhVP?=
 =?iso-8859-1?Q?8cjnIRS1G6/kJYSJxEsV4thOnLeXivJ+Lp4+riQu1kK3Om2F6gt0udVYvf?=
 =?iso-8859-1?Q?/XjZu9iZmYq+3ZEAwPuQYwr8ZvH5jFodFqqdNox9qABBAWgg+HCdUPpAfN?=
 =?iso-8859-1?Q?yQBHGMyis71dFvZQ3s+X90AsiBvHXRR8rGvZbxnwrLQGf1Oli8pJmp6Vtg?=
 =?iso-8859-1?Q?ljN2dFrI9iZYgPgtKGDbWX+JUiy5B9+D1PRH06cQSOkEk8JAHPJlAt1XQa?=
 =?iso-8859-1?Q?NSDWsyfV718qUyJlugb3nrWtOAmE9DdRf6iMHidM98BwIS0yOaojXb1CTX?=
 =?iso-8859-1?Q?8JX9+YDJu8tY0tgCtXN2wyYhJrnDq/8YWv9RmWyeQwCFki0WuPyilpIJVL?=
 =?iso-8859-1?Q?4tOIZL2XIo61+3FvpQMRTixsqV8prZq1YDu3Udbw6xs0G13VmJs7f3c7s2?=
 =?iso-8859-1?Q?rhXrg0w9ryZe4d79lZbaUqLZAbD6cc7Fn0TLhVZ8WKXOAl8spawZ5wK88K?=
 =?iso-8859-1?Q?m6EbMnhDw/sXMUXMpQP74CHSeIS1lHO2H2HYcggSHo7xQl2T9QFilX1yU5?=
 =?iso-8859-1?Q?KeosSqB9FuRK/3VO5mO2b8E4UAoAwny9MT/3QD/fUEjU7NopLzfJF/Wf2w?=
 =?iso-8859-1?Q?njYQEcIcF2zs/mpcraO9bsHSlr9RxM6PC+XZmvpzfBppJmji+JvO0IGzOC?=
 =?iso-8859-1?Q?zc4m+VAALuRI0wg3CZVj0BXHfLbK7gczpJKjsg9aI5vQfSVNpDiOfq4CQy?=
 =?iso-8859-1?Q?Pa78lMgYTdPXUi6W3D8hGuyrtvyyS0uYn8Vzyk6ASSm39FIqlIRnllQFxU?=
 =?iso-8859-1?Q?Jar+IKWp1mVD7nqpmwli6Iu3yXZ5+0YIYVSao6e3ytW5he1yrHrHQayv7J?=
 =?iso-8859-1?Q?shVT+vvoRnNL3nHN/wbm1SH1XajU4i+/8QBqVs5VO8ChA1l2PvSs2asWgF?=
 =?iso-8859-1?Q?6HtwgKMnghNaaxm68H0pRT854UX8nYPN+CPgzWvtiE850S6w224WDql8YP?=
 =?iso-8859-1?Q?2Hu6zdxUSIreqD6avKjRn1CEUHgHHdrJvpMSxpmRdNDaFpFZQj91hgHBk6?=
 =?iso-8859-1?Q?ojHEM1RDaTUg56t5UXCu9Gmr65vTQ4T8QOrwRy64G8frZjHSbfoTRfvwkP?=
 =?iso-8859-1?Q?fP/3TCy0eud1PMI67YanV7ztpQ5oLCJF6XTWw1qrx3MV8M+jDS00IhW3W0?=
 =?iso-8859-1?Q?mPV7kPFoWbD0NaaHfoDhOrRFeI3WaT2OGjqwzl/Fif9PhmojGgYLB8+5zH?=
 =?iso-8859-1?Q?Q+ceW1dRr75YOvMFPW9KHFZy9SP5McvreUXDpv/j3eztTE3J1mP5WjOMXT?=
 =?iso-8859-1?Q?4VHtPdh/SgSnE8QVtGEPjbUSltJ81GAl3ILEndZZPK3tK9gOUEun98OnF0?=
 =?iso-8859-1?Q?bl5QsVHf2qAdfsRZhlbIQ3m2kxbFpnRY/pvsWSahUJe48L2ITcU4ixv/Mu?=
 =?iso-8859-1?Q?hF1FN9ZJhJ/vbcsk+jZntIaLUQXazKi8iHB64++SrAWRVOy08JIa1q6yzy?=
 =?iso-8859-1?Q?NKF4XVAh/fiafaXe1R2EUfLswrLoDnI=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: 6a44f200-6f08-44df-310f-08da53c74bdc
X-MS-Exchange-CrossTenant-originalarrivaltime: 21 Jun 2022 20:47:05.0661
 (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: 9u5gqllZnGqSNWiCpzwKFbweYfuTFJQ8mDQQiMWapcCUcdwiE2iUIIEkFMOs6kQY55+PiZi7YLsWb63YNeFW6g==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR10MB4025
X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.517,18.0.883
 definitions=2022-06-21_09:2022-06-21,2022-06-21 signatures=0
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 malwarescore=0 mlxscore=0
 phishscore=0 adultscore=0 suspectscore=0 mlxlogscore=949 bulkscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2204290000
 definitions=main-2206210087
X-Proofpoint-GUID: -J_iVh57jPlhuMUvH8bMM3NB4dCG59ux
X-Proofpoint-ORIG-GUID: -J_iVh57jPlhuMUvH8bMM3NB4dCG59ux
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,T_SCC_BODY_TEXT_LINE
        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
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